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

Bug 1129774. Part 3: Remove aContext parameter from BaseCreate and make it nonvirtual. r=jmathies

Browse Source
This commit is contained in:
Robert O'Callahan
2015-02-05 18:18:30 +13:00
parent 85f2b99239
commit b45a5aee79
12 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
widget/PluginWidgetProxy.cpp
View File

@@ -63,7 +63,7 @@ PluginWidgetProxy::Create(nsIWidget* aParent,
return rv; return rv;
} }
BaseCreate(aParent, aRect, aContext, aInitData); BaseCreate(aParent, aRect, aInitData);
mBounds = aRect; mBounds = aRect;
mEnabled = true; mEnabled = true;

2
widget/PuppetWidget.cpp
View File

@@ -101,7 +101,7 @@ PuppetWidget::Create(nsIWidget *aParent,
{ {
MOZ_ASSERT(!aNativeParent, "got a non-Puppet native parent"); MOZ_ASSERT(!aNativeParent, "got a non-Puppet native parent");
BaseCreate(nullptr, aRect, aContext, aInitData); BaseCreate(nullptr, aRect, aInitData);
mBounds = aRect; mBounds = aRect;
mEnabled = true; mEnabled = true;

2
widget/android/nsWindow.cpp
View File

@@ -234,7 +234,7 @@ nsWindow::Create(nsIWidget *aParent,
mBounds.height = gAndroidBounds.height; mBounds.height = gAndroidBounds.height;
} }
BaseCreate(nullptr, mBounds, aContext, aInitData); BaseCreate(nullptr, mBounds, aInitData);
NS_ASSERTION(IsTopLevel() || parent, "non top level windowdoesn't have a parent!"); NS_ASSERTION(IsTopLevel() || parent, "non top level windowdoesn't have a parent!");

2
widget/cocoa/nsChildView.mm
View File

@@ -496,7 +496,7 @@ nsresult nsChildView::Create(nsIWidget *aParent,
// Ensure that the toolkit is created. // Ensure that the toolkit is created.
nsToolkit::GetToolkit(); nsToolkit::GetToolkit();
BaseCreate(aParent, aRect, aContext, aInitData); BaseCreate(aParent, aRect, aInitData);
// inherit things from the parent view and create our parallel // inherit things from the parent view and create our parallel
// NSView in the Cocoa display system // NSView in the Cocoa display system

2
widget/cocoa/nsCocoaWindow.mm
View File

@@ -276,7 +276,7 @@ nsresult nsCocoaWindow::Create(nsIWidget *aParent,
// fortunately, BaseCreate doesn't actually use it so we don't // fortunately, BaseCreate doesn't actually use it so we don't
// need to worry about trying to convert it to device pixels // need to worry about trying to convert it to device pixels
// when we don't have a window (or dev context, perhaps) yet // when we don't have a window (or dev context, perhaps) yet
Inherited::BaseCreate(aParent, newBounds, aContext, aInitData); Inherited::BaseCreate(aParent, newBounds, aInitData);
mParent = aParent; mParent = aParent;

2
widget/gonk/nsWindow.cpp
View File

@@ -356,7 +356,7 @@ nsWindow::Create(nsIWidget *aParent,
nsWidgetInitData *aInitData) nsWidgetInitData *aInitData)
{ {
BaseCreate(aParent, IS_TOPLEVEL() ? sVirtualBounds : aRect, BaseCreate(aParent, IS_TOPLEVEL() ? sVirtualBounds : aRect,
aContext, aInitData); aInitData);
mBounds = aRect; mBounds = aRect;

2
widget/gtk/nsWindow.cpp
View File

@@ -3461,7 +3461,7 @@ nsWindow::Create(nsIWidget *aParent,
nsGTKToolkit::GetToolkit(); nsGTKToolkit::GetToolkit();
// initialize all the common bits of this class // initialize all the common bits of this class
BaseCreate(baseParent, aRect, aContext, aInitData); BaseCreate(baseParent, aRect, aInitData);
// Do we need to listen for resizes? // Do we need to listen for resizes?
bool listenForResizes = false;; bool listenForResizes = false;;

1
widget/nsBaseWidget.cpp
View File

@@ -260,7 +260,6 @@ nsBaseWidget::~nsBaseWidget()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void nsBaseWidget::BaseCreate(nsIWidget *aParent, void nsBaseWidget::BaseCreate(nsIWidget *aParent,
const nsIntRect &aRect, const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData) nsWidgetInitData *aInitData)
{ {
static bool gDisableNativeThemeCached = false; static bool gDisableNativeThemeCached = false;

3
widget/nsBaseWidget.h
View File

@@ -310,9 +310,8 @@ protected:
const nsAString &aIconSuffix, const nsAString &aIconSuffix,
nsIFile **aResult); nsIFile **aResult);
virtual void OnDestroy(); virtual void OnDestroy();
virtual void BaseCreate(nsIWidget *aParent, void BaseCreate(nsIWidget *aParent,
const nsIntRect &aRect, const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData); nsWidgetInitData *aInitData);
virtual void ConfigureAPZCTreeManager(); virtual void ConfigureAPZCTreeManager();

2
widget/qt/nsWindow.cpp
View File

@@ -142,7 +142,7 @@ nsWindow::Create(nsIWidget *aParent,
nsIWidget *baseParent = aParent; nsIWidget *baseParent = aParent;
// initialize all the common bits of this class // initialize all the common bits of this class
BaseCreate(baseParent, aRect, aContext, aInitData); BaseCreate(baseParent, aRect, aInitData);
mVisible = true; mVisible = true;

2
widget/windows/nsWindow.cpp
View File

@@ -485,7 +485,7 @@ nsWindow::Create(nsIWidget *aParent,
// Ensure that the toolkit is created. // Ensure that the toolkit is created.
nsToolkit::GetToolkit(); nsToolkit::GetToolkit();
BaseCreate(baseParent, aRect, aContext, aInitData); BaseCreate(baseParent, aRect, aInitData);
HWND parent; HWND parent;
if (aParent) { // has a nsIWidget parent if (aParent) { // has a nsIWidget parent

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

@@ -219,7 +219,7 @@ MetroWidget::Create(nsIWidget *aParent,
// Ensure that the toolkit is created. // Ensure that the toolkit is created.
nsToolkit::GetToolkit(); nsToolkit::GetToolkit();
BaseCreate(aParent, aRect, aContext, aInitData); BaseCreate(aParent, aRect, aInitData);
if (mWindowType != eWindowType_toplevel) { if (mWindowType != eWindowType_toplevel) {
switch(mWindowType) { switch(mWindowType) {