corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1129774. Part 5: Remove aContext parameter from nsIWidget::Create. r=jmathies

Browse Source
This commit is contained in:
Robert O'Callahan
2015-02-05 20:35:25 +13:00
parent 5511614551
commit 0021805640
29 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dom/ipc/TabChild.cpp
View File

@@ -1096,8 +1096,7 @@ TabChild::Init()
mWidget->Create(
nullptr, 0, // no parents
nsIntRect(nsIntPoint(0, 0), nsIntSize(0, 0)),
nullptr, // HandleWidgetEvent
nullptr // nsDeviceContext
nullptr // HandleWidgetEvent
);
baseWindow->InitWindow(0, mWidget, 0, 0, 0, 0);
@@ -3503,7 +3502,7 @@ TabChild::CreatePluginWidget(nsIWidget* aParent, nsIWidget** aOut)
initData.clipChildren = true;
initData.clipSiblings = true;
nsresult rv = pluginWidget->Create(aParent, nullptr, nsIntRect(nsIntPoint(0, 0),
nsIntSize(0, 0)), nullptr, &initData);
nsIntSize(0, 0)), &initData);
if (NS_FAILED(rv)) {
NS_WARNING("Creating native plugin widget on the chrome side failed.");
}

2
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@@ -2891,7 +2891,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)
initData.clipChildren = true;
initData.clipSiblings = true;
rv = mWidget->Create(parentWidget.get(), nullptr, nsIntRect(0,0,0,0),
nullptr, &initData);
&initData);
if (NS_FAILED(rv)) {
mWidget->Destroy();
mWidget = nullptr;

2
dom/plugins/ipc/PluginWidgetParent.cpp
View File

@@ -133,7 +133,7 @@ PluginWidgetParent::RecvCreate(nsresult* aResult)
initData.clipChildren = true;
initData.clipSiblings = true;
*aResult = mWidget->Create(parentWidget.get(), nullptr, nsIntRect(0,0,0,0),
nullptr, &initData);
&initData);
if (NS_FAILED(*aResult)) {
mWidget->Destroy();
mWidget = nullptr;

2
embedding/browser/nsWebBrowser.cpp
View File

@@ -1112,7 +1112,7 @@ NS_IMETHODIMP nsWebBrowser::Create()
nsIntRect bounds(mInitInfo->x, mInitInfo->y, mInitInfo->cx, mInitInfo->cy);
mInternalWidget->SetWidgetListener(this);
mInternalWidget->Create(nullptr, mParentNativeWindow, bounds, nullptr, &widgetInit);
mInternalWidget->Create(nullptr, mParentNativeWindow, bounds, &widgetInit);
}
nsCOMPtr<nsIDocShell> docShell(do_CreateInstance("@mozilla.org/docshell;1", &rv));

1
gfx/tests/gtest/TestCompositor.cpp
View File

@@ -54,7 +54,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD Show(bool aState) MOZ_OVERRIDE { return NS_OK; }
virtual bool IsVisible() const MOZ_OVERRIDE { return true; }

1
widget/PluginWidgetProxy.cpp
View File

@@ -50,7 +50,6 @@ NS_IMETHODIMP
PluginWidgetProxy::Create(nsIWidget* aParent,
nsNativeWidget aNativeParent,
const nsIntRect& aRect,
nsDeviceContext* aContext,
nsWidgetInitData* aInitData)
{
ENSURE_CHANNEL;

2
widget/PluginWidgetProxy.h
View File

@@ -35,7 +35,7 @@ public:
// nsIWidget
NS_IMETHOD Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
const nsIntRect& aRect, nsDeviceContext* aContext,
const nsIntRect& aRect,
nsWidgetInitData* aInitData = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Destroy() MOZ_OVERRIDE;
NS_IMETHOD SetFocus(bool aRaise = false) MOZ_OVERRIDE;

3
widget/PuppetWidget.cpp
View File

@@ -96,7 +96,6 @@ NS_IMETHODIMP
PuppetWidget::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
MOZ_ASSERT(!aNativeParent, "got a non-Puppet native parent");
@@ -147,7 +146,7 @@ PuppetWidget::CreateChild(const nsIntRect &aRect,
nsCOMPtr<nsIWidget> widget = nsIWidget::CreatePuppetWidget(mTabChild);
return ((widget &&
NS_SUCCEEDED(widget->Create(isPopup ? nullptr: this, nullptr, aRect,
aContext, aInitData))) ?
aInitData))) ?
widget.forget() : nullptr);
}

1
widget/PuppetWidget.h
View File

@@ -59,7 +59,6 @@ public:
NS_IMETHOD Create(nsIWidget* aParent,
nsNativeWidget aNativeParent,
const nsIntRect& aRect,
nsDeviceContext* aContext,
nsWidgetInitData* aInitData = nullptr) MOZ_OVERRIDE;
void InitIMEState();

1
widget/android/nsWindow.cpp
View File

@@ -211,7 +211,6 @@ NS_IMETHODIMP
nsWindow::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
ALOG("nsWindow[%p]::Create %p [%d %d %d %d]", (void*)this, (void*)aParent, aRect.x, aRect.y, aRect.width, aRect.height);

1
widget/android/nsWindow.h
View File

@@ -66,7 +66,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData);
NS_IMETHOD Destroy(void);
NS_IMETHOD ConfigureChildren(const nsTArray<nsIWidget::Configuration>&);

1
widget/cocoa/nsChildView.h
View File

@@ -355,7 +355,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Destroy() MOZ_OVERRIDE;

1
widget/cocoa/nsChildView.mm
View File

@@ -465,7 +465,6 @@ nsChildView::ReleaseTitlebarCGContext()
nsresult nsChildView::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;

4
widget/cocoa/nsCocoaWindow.h
View File

@@ -258,7 +258,6 @@ public:
NS_IMETHOD Create(nsIWidget* aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Destroy() MOZ_OVERRIDE;
@@ -372,8 +371,7 @@ protected:
nsresult CreateNativeWindow(const NSRect &aRect,
nsBorderStyle aBorderStyle,
bool aRectIsFrameRect);
nsresult CreatePopupContentView(const nsIntRect &aRect,
nsDeviceContext *aContext);
nsresult CreatePopupContentView(const nsIntRect &aRect);
void DestroyNativeWindow();
void AdjustWindowShadow();
void SetWindowBackgroundBlur();

8
widget/cocoa/nsCocoaWindow.mm
View File

@@ -253,7 +253,6 @@ static bool UseNativePopupWindows()
nsresult nsCocoaWindow::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@@ -300,7 +299,7 @@ nsresult nsCocoaWindow::Create(nsIWidget *aParent,
newBounds.y *= scale;
newBounds.width *= scale;
newBounds.height *= scale;
return CreatePopupContentView(newBounds, aContext);
return CreatePopupContentView(newBounds);
}
mIsAnimationSuppressed = aInitData->mIsAnimationSuppressed;
@@ -486,8 +485,7 @@ nsresult nsCocoaWindow::CreateNativeWindow(const NSRect &aRect,
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
}
NS_IMETHODIMP nsCocoaWindow::CreatePopupContentView(const nsIntRect &aRect,
nsDeviceContext *aContext)
NS_IMETHODIMP nsCocoaWindow::CreatePopupContentView(const nsIntRect &aRect)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@@ -499,7 +497,7 @@ NS_IMETHODIMP nsCocoaWindow::CreatePopupContentView(const nsIntRect &aRect,
NS_ADDREF(mPopupContentView);
nsIWidget* thisAsWidget = static_cast<nsIWidget*>(this);
mPopupContentView->Create(thisAsWidget, nullptr, aRect, aContext, nullptr);
mPopupContentView->Create(thisAsWidget, nullptr, aRect, nullptr);
ChildView* newContentView = (ChildView*)mPopupContentView->GetNativeData(NS_NATIVE_WIDGET);
[mWindow setContentView:newContentView];

1
widget/gonk/nsWindow.cpp
View File

@@ -352,7 +352,6 @@ NS_IMETHODIMP
nsWindow::Create(nsIWidget *aParent,
void *aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
BaseCreate(aParent, IS_TOPLEVEL() ? sVirtualBounds : aRect,

1
widget/gonk/nsWindow.h
View File

@@ -57,7 +57,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
void *aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData);
NS_IMETHOD Destroy(void);

1
widget/gtk/nsWindow.cpp
View File

@@ -3441,7 +3441,6 @@ nsresult
nsWindow::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
// only set the base parent if we're going to be a dialog or a

1
widget/gtk/nsWindow.h
View File

@@ -92,7 +92,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData) MOZ_OVERRIDE;
NS_IMETHOD Destroy(void) MOZ_OVERRIDE;
virtual nsIWidget *GetParent() MOZ_OVERRIDE;

3
widget/nsBaseWidget.cpp
View File

@@ -332,8 +332,7 @@ nsBaseWidget::CreateChild(const nsIntRect &aRect,
}
if (widget &&
NS_SUCCEEDED(widget->Create(parent, nativeParent, aRect,
aContext, aInitData))) {
NS_SUCCEEDED(widget->Create(parent, nativeParent, aRect, aInitData))) {
return widget.forget();
}

2
widget/nsIWidget.h
View File

@@ -793,14 +793,12 @@ class nsIWidget : public nsISupports {
* @param aParent parent nsIWidget
* @param aNativeParent native parent widget
* @param aRect the widget dimension
* @param aContext
* @param aInitData data that is used for widget initialization
*
*/
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr) = 0;
/**

1
widget/qt/nsWindow.cpp
View File

@@ -134,7 +134,6 @@ nsresult
nsWindow::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
// only set the base parent if we're not going to be a dialog or a

1
widget/qt/nsWindow.h
View File

@@ -91,7 +91,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData);
NS_IMETHOD Destroy(void);

1
widget/windows/nsWindow.cpp
View File

@@ -465,7 +465,6 @@ nsresult
nsWindow::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
nsWidgetInitData defaultInitData;

1
widget/windows/nsWindow.h
View File

@@ -94,7 +94,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr);
NS_IMETHOD Destroy();
NS_IMETHOD SetParent(nsIWidget *aNewParent);

1
widget/windows/winrt/MetroWidget.cpp
View File

@@ -205,7 +205,6 @@ NS_IMETHODIMP
MetroWidget::Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData)
{
LogFunction();

1
widget/windows/winrt/MetroWidget.h
View File

@@ -95,7 +95,6 @@ public:
NS_IMETHOD Create(nsIWidget *aParent,
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr);
NS_IMETHOD Destroy();
NS_IMETHOD EnableDragDrop(bool aEnable);

2
xpfe/appshell/nsAppShellService.cpp
View File

@@ -393,7 +393,7 @@ nsAppShellService::CreateWindowlessBrowser(bool aIsChrome, nsIWebNavigation **aR
return NS_ERROR_FAILURE;
}
widget->Create(nullptr, 0, nsIntRect(nsIntPoint(0, 0), nsIntSize(0, 0)),
nullptr, nullptr);
nullptr);
nsCOMPtr<nsIBaseWindow> window = do_QueryInterface(navigation);
window->InitWindow(0, widget, 0, 0, 0, 0);
window->Create();

1
xpfe/appshell/nsWebShellWindow.cpp
View File

@@ -172,7 +172,6 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
mWindow->Create((nsIWidget *)parentWidget, // Parent nsIWidget
nullptr, // Native parent widget
r, // Widget dimensions
nullptr, // Device context
&widgetInitData); // Widget initialization data
mWindow->GetClientBounds(r);
// Match the default background color of content. Important on windows