wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 858524 - Rename nsBarProp to BarProp, r=ms2ger

Browse Source 
--HG--
rename : dom/base/nsBarProps.cpp => dom/base/BarProps.cpp
rename : dom/base/nsBarProps.h => dom/base/BarProps.h
This commit is contained in:
Andrea Marchesini 2013-05-31 03:30:00 -07:00
parent 5bdec2c55d
commit 42942f5604
5 changed files with 114 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
dom/base/nsBarProps.cpp → dom/base/BarProps.cpp
View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsBarProps.h"
#include "mozilla/dom/BarProps.h"
#include "nsCOMPtr.h"
#include "nscore.h"
@ -17,36 +17,38 @@
#include "nsDOMClassInfoID.h"
#include "nsContentUtils.h"
DOMCI_DATA(BarProp, mozilla::dom::BarProp)
namespace mozilla {
namespace dom {
//
// Basic (virtual) BarProp class implementation
//
nsBarProp::nsBarProp(nsGlobalWindow *aWindow)
BarProp::BarProp(nsGlobalWindow *aWindow)
{
mDOMWindow = aWindow;
nsISupports *supwin = static_cast<nsIScriptGlobalObject *>(aWindow);
mDOMWindowWeakref = do_GetWeakReference(supwin);
}
nsBarProp::~nsBarProp()
BarProp::~BarProp()
{
}
DOMCI_DATA(BarProp, nsBarProp)
// QueryInterface implementation for BarProp
NS_INTERFACE_MAP_BEGIN(nsBarProp)
NS_INTERFACE_MAP_BEGIN(BarProp)
NS_INTERFACE_MAP_ENTRY(nsIDOMBarProp)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BarProp)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(nsBarProp)
NS_IMPL_RELEASE(nsBarProp)
NS_IMPL_ADDREF(BarProp)
NS_IMPL_RELEASE(BarProp)
NS_IMETHODIMP
nsBarProp::GetVisibleByFlag(bool *aVisible, uint32_t aChromeFlag)
BarProp::GetVisibleByFlag(bool *aVisible, uint32_t aChromeFlag)
{
*aVisible = false;
@ -64,7 +66,7 @@ nsBarProp::GetVisibleByFlag(bool *aVisible, uint32_t aChromeFlag)
}
NS_IMETHODIMP
nsBarProp::SetVisibleByFlag(bool aVisible, uint32_t aChromeFlag)
BarProp::SetVisibleByFlag(bool aVisible, uint32_t aChromeFlag)
{
nsCOMPtr<nsIWebBrowserChrome> browserChrome = GetBrowserChrome();
NS_ENSURE_TRUE(browserChrome, NS_OK);
@ -87,7 +89,7 @@ nsBarProp::SetVisibleByFlag(bool aVisible, uint32_t aChromeFlag)
}
already_AddRefed<nsIWebBrowserChrome>
nsBarProp::GetBrowserChrome()
BarProp::GetBrowserChrome()
{
// Check that the window is still alive.
nsCOMPtr<nsIDOMWindow> domwin(do_QueryReferent(mDOMWindowWeakref));
@ -101,26 +103,26 @@ nsBarProp::GetBrowserChrome()
// MenubarProp class implementation
//
nsMenubarProp::nsMenubarProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
MenubarProp::MenubarProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsMenubarProp::~nsMenubarProp()
MenubarProp::~MenubarProp()
{
}
NS_IMETHODIMP
nsMenubarProp::GetVisible(bool *aVisible)
MenubarProp::GetVisible(bool *aVisible)
{
return nsBarProp::GetVisibleByFlag(aVisible,
return BarProp::GetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_MENUBAR);
}
NS_IMETHODIMP
nsMenubarProp::SetVisible(bool aVisible)
MenubarProp::SetVisible(bool aVisible)
{
return nsBarProp::SetVisibleByFlag(aVisible,
return BarProp::SetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_MENUBAR);
}
@ -128,26 +130,26 @@ nsMenubarProp::SetVisible(bool aVisible)
// ToolbarProp class implementation
//
nsToolbarProp::nsToolbarProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
ToolbarProp::ToolbarProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsToolbarProp::~nsToolbarProp()
ToolbarProp::~ToolbarProp()
{
}
NS_IMETHODIMP
nsToolbarProp::GetVisible(bool *aVisible)
ToolbarProp::GetVisible(bool *aVisible)
{
return nsBarProp::GetVisibleByFlag(aVisible,
return BarProp::GetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_TOOLBAR);
}
NS_IMETHODIMP
nsToolbarProp::SetVisible(bool aVisible)
ToolbarProp::SetVisible(bool aVisible)
{
return nsBarProp::SetVisibleByFlag(aVisible,
return BarProp::SetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_TOOLBAR);
}
@ -155,28 +157,28 @@ nsToolbarProp::SetVisible(bool aVisible)
// LocationbarProp class implementation
//
nsLocationbarProp::nsLocationbarProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
LocationbarProp::LocationbarProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsLocationbarProp::~nsLocationbarProp()
LocationbarProp::~LocationbarProp()
{
}
NS_IMETHODIMP
nsLocationbarProp::GetVisible(bool *aVisible)
LocationbarProp::GetVisible(bool *aVisible)
{
return
nsBarProp::GetVisibleByFlag(aVisible,
BarProp::GetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_LOCATIONBAR);
}
NS_IMETHODIMP
nsLocationbarProp::SetVisible(bool aVisible)
LocationbarProp::SetVisible(bool aVisible)
{
return
nsBarProp::SetVisibleByFlag(aVisible,
BarProp::SetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_LOCATIONBAR);
}
@ -184,28 +186,28 @@ nsLocationbarProp::SetVisible(bool aVisible)
// PersonalbarProp class implementation
//
nsPersonalbarProp::nsPersonalbarProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
PersonalbarProp::PersonalbarProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsPersonalbarProp::~nsPersonalbarProp()
PersonalbarProp::~PersonalbarProp()
{
}
NS_IMETHODIMP
nsPersonalbarProp::GetVisible(bool *aVisible)
PersonalbarProp::GetVisible(bool *aVisible)
{
return
nsBarProp::GetVisibleByFlag(aVisible,
BarProp::GetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_PERSONAL_TOOLBAR);
}
NS_IMETHODIMP
nsPersonalbarProp::SetVisible(bool aVisible)
PersonalbarProp::SetVisible(bool aVisible)
{
return
nsBarProp::SetVisibleByFlag(aVisible,
BarProp::SetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_PERSONAL_TOOLBAR);
}
@ -213,26 +215,26 @@ nsPersonalbarProp::SetVisible(bool aVisible)
// StatusbarProp class implementation
//
nsStatusbarProp::nsStatusbarProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
StatusbarProp::StatusbarProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsStatusbarProp::~nsStatusbarProp()
StatusbarProp::~StatusbarProp()
{
}
NS_IMETHODIMP
nsStatusbarProp::GetVisible(bool *aVisible)
StatusbarProp::GetVisible(bool *aVisible)
{
return nsBarProp::GetVisibleByFlag(aVisible,
return BarProp::GetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_STATUSBAR);
}
NS_IMETHODIMP
nsStatusbarProp::SetVisible(bool aVisible)
StatusbarProp::SetVisible(bool aVisible)
{
return nsBarProp::SetVisibleByFlag(aVisible,
return BarProp::SetVisibleByFlag(aVisible,
nsIWebBrowserChrome::CHROME_STATUSBAR);
}
@ -240,17 +242,17 @@ nsStatusbarProp::SetVisible(bool aVisible)
// ScrollbarsProp class implementation
//
nsScrollbarsProp::nsScrollbarsProp(nsGlobalWindow *aWindow)
: nsBarProp(aWindow)
ScrollbarsProp::ScrollbarsProp(nsGlobalWindow *aWindow)
: BarProp(aWindow)
{
}
nsScrollbarsProp::~nsScrollbarsProp()
ScrollbarsProp::~ScrollbarsProp()
{
}
NS_IMETHODIMP
nsScrollbarsProp::GetVisible(bool *aVisible)
ScrollbarsProp::GetVisible(bool *aVisible)
{
*aVisible = true; // one assumes
@ -276,7 +278,7 @@ nsScrollbarsProp::GetVisible(bool *aVisible)
}
NS_IMETHODIMP
nsScrollbarsProp::SetVisible(bool aVisible)
ScrollbarsProp::SetVisible(bool aVisible)
{
if (!nsContentUtils::IsCallerChrome())
return NS_OK;
@ -326,3 +328,6 @@ nsScrollbarsProp::SetVisible(bool aVisible)
return NS_OK;
}
} // namespace dom
} // namespace mozilla

54
dom/base/nsBarProps.h → dom/base/BarProps.h
View File

@ -9,8 +9,8 @@
the appropriate property (window.menubar.visible)
*/
#ifndef nsBarProps_h___
#define nsBarProps_h___
#ifndef mozilla_dom_BarProps_h
#define mozilla_dom_BarProps_h
#include "nscore.h"
#include "nsIScriptContext.h"
@ -20,12 +20,15 @@
class nsGlobalWindow;
class nsIWebBrowserChrome;
namespace mozilla {
namespace dom {
// Script "BarProp" object
class nsBarProp : public nsIDOMBarProp
class BarProp : public nsIDOMBarProp
{
public:
explicit nsBarProp(nsGlobalWindow *aWindow);
virtual ~nsBarProp();
explicit BarProp(nsGlobalWindow *aWindow);
virtual ~BarProp();
NS_DECL_ISUPPORTS
@ -48,64 +51,67 @@ protected:
};
// Script "menubar" object
class nsMenubarProp : public nsBarProp
class MenubarProp : public BarProp
{
public:
explicit nsMenubarProp(nsGlobalWindow *aWindow);
virtual ~nsMenubarProp();
explicit MenubarProp(nsGlobalWindow *aWindow);
virtual ~MenubarProp();
NS_DECL_NSIDOMBARPROP
};
// Script "toolbar" object
class nsToolbarProp : public nsBarProp
class ToolbarProp : public BarProp
{
public:
explicit nsToolbarProp(nsGlobalWindow *aWindow);
virtual ~nsToolbarProp();
explicit ToolbarProp(nsGlobalWindow *aWindow);
virtual ~ToolbarProp();
NS_DECL_NSIDOMBARPROP
};
// Script "locationbar" object
class nsLocationbarProp : public nsBarProp
class LocationbarProp : public BarProp
{
public:
explicit nsLocationbarProp(nsGlobalWindow *aWindow);
virtual ~nsLocationbarProp();
explicit LocationbarProp(nsGlobalWindow *aWindow);
virtual ~LocationbarProp();
NS_DECL_NSIDOMBARPROP
};
// Script "personalbar" object
class nsPersonalbarProp : public nsBarProp
class PersonalbarProp : public BarProp
{
public:
explicit nsPersonalbarProp(nsGlobalWindow *aWindow);
virtual ~nsPersonalbarProp();
explicit PersonalbarProp(nsGlobalWindow *aWindow);
virtual ~PersonalbarProp();
NS_DECL_NSIDOMBARPROP
};
// Script "statusbar" object
class nsStatusbarProp : public nsBarProp
class StatusbarProp : public BarProp
{
public:
explicit nsStatusbarProp(nsGlobalWindow *aWindow);
virtual ~nsStatusbarProp();
explicit StatusbarProp(nsGlobalWindow *aWindow);
virtual ~StatusbarProp();
NS_DECL_NSIDOMBARPROP
};
// Script "scrollbars" object
class nsScrollbarsProp : public nsBarProp
class ScrollbarsProp : public BarProp
{
public:
explicit nsScrollbarsProp(nsGlobalWindow *aWindow);
virtual ~nsScrollbarsProp();
explicit ScrollbarsProp(nsGlobalWindow *aWindow);
virtual ~ScrollbarsProp();
NS_DECL_NSIDOMBARPROP
};
#endif /* nsBarProps_h___ */
} // namespace dom
} // namespace mozilla
#endif /* mozilla_dom_BarProps_h */

3
dom/base/moz.build
View File

@ -54,6 +54,7 @@ EXPORTS += [
]
EXPORTS.mozilla.dom += [
'BarProps.h',
'DOMCursor.h',
'DOMError.h',
'DOMRequest.h',
@ -63,13 +64,13 @@ EXPORTS.mozilla.dom += [
]
CPP_SOURCES += [
'BarProps.cpp',
'Crypto.cpp',
'DOMCursor.cpp',
'DOMError.cpp',
'DOMRequest.cpp',
'Navigator.cpp',
'URL.cpp',
'nsBarProps.cpp',
'nsContentPermissionHelper.cpp',
'nsDOMClassInfo.cpp',
'nsDOMException.cpp',

14
dom/base/nsGlobalWindow.cpp
View File

@ -17,7 +17,6 @@
#include "nsHistory.h"
#include "nsPerformance.h"
#include "nsDOMNavigationTiming.h"
#include "nsBarProps.h"
#include "nsIDOMStorage.h"
#include "nsIDOMStorageManager.h"
#include "DOMStorage.h"
@ -61,6 +60,7 @@
#include "nsPluginHost.h"
#include "nsIPluginInstanceOwner.h"
#include "nsGeolocation.h"
#include "mozilla/dom/BarProps.h"
#include "mozilla/dom/DesktopNotification.h"
#include "nsContentCID.h"
#include "nsLayoutStatics.h"
@ -3593,7 +3593,7 @@ nsGlobalWindow::GetMenubar(nsIDOMBarProp** aMenubar)
*aMenubar = nullptr;
if (!mMenubar) {
mMenubar = new nsMenubarProp(this);
mMenubar = new MenubarProp(this);
if (!mMenubar) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -3612,7 +3612,7 @@ nsGlobalWindow::GetToolbar(nsIDOMBarProp** aToolbar)
*aToolbar = nullptr;
if (!mToolbar) {
mToolbar = new nsToolbarProp(this);
mToolbar = new ToolbarProp(this);
if (!mToolbar) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -3631,7 +3631,7 @@ nsGlobalWindow::GetLocationbar(nsIDOMBarProp** aLocationbar)
*aLocationbar = nullptr;
if (!mLocationbar) {
mLocationbar = new nsLocationbarProp(this);
mLocationbar = new LocationbarProp(this);
if (!mLocationbar) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -3650,7 +3650,7 @@ nsGlobalWindow::GetPersonalbar(nsIDOMBarProp** aPersonalbar)
*aPersonalbar = nullptr;
if (!mPersonalbar) {
mPersonalbar = new nsPersonalbarProp(this);
mPersonalbar = new PersonalbarProp(this);
if (!mPersonalbar) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -3669,7 +3669,7 @@ nsGlobalWindow::GetStatusbar(nsIDOMBarProp** aStatusbar)
*aStatusbar = nullptr;
if (!mStatusbar) {
mStatusbar = new nsStatusbarProp(this);
mStatusbar = new StatusbarProp(this);
if (!mStatusbar) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -3688,7 +3688,7 @@ nsGlobalWindow::GetScrollbars(nsIDOMBarProp** aScrollbars)
*aScrollbars = nullptr;
if (!mScrollbars) {
mScrollbars = new nsScrollbarsProp(this);
mScrollbars = new ScrollbarsProp(this);
if (!mScrollbars) {
return NS_ERROR_OUT_OF_MEMORY;
}

16
dom/base/nsGlobalWindow.h
View File

@ -102,7 +102,6 @@ class nsIDOMEvent;
class nsIScrollableFrame;
class nsIControllers;
class nsBarProp;
class nsLocation;
class nsScreen;
class nsHistory;
@ -121,6 +120,7 @@ class nsWindowSizes;
namespace mozilla {
namespace dom {
class BarProp;
class Navigator;
class URL;
class SpeechSynthesis;
@ -797,7 +797,7 @@ protected:
static bool sIdleObserversAPIFuzzTimeDisabled;
friend class HashchangeCallback;
friend class nsBarProp;
friend class mozilla::dom::BarProp;
// Object Management
virtual ~nsGlobalWindow();
@ -1177,12 +1177,12 @@ protected:
nsRefPtr<Navigator> mNavigator;
nsRefPtr<nsScreen> mScreen;
nsRefPtr<nsDOMWindowList> mFrames;
nsRefPtr<nsBarProp> mMenubar;
nsRefPtr<nsBarProp> mToolbar;
nsRefPtr<nsBarProp> mLocationbar;
nsRefPtr<nsBarProp> mPersonalbar;
nsRefPtr<nsBarProp> mStatusbar;
nsRefPtr<nsBarProp> mScrollbars;
nsRefPtr<mozilla::dom::BarProp> mMenubar;
nsRefPtr<mozilla::dom::BarProp> mToolbar;
nsRefPtr<mozilla::dom::BarProp> mLocationbar;
nsRefPtr<mozilla::dom::BarProp> mPersonalbar;
nsRefPtr<mozilla::dom::BarProp> mStatusbar;
nsRefPtr<mozilla::dom::BarProp> mScrollbars;
nsRefPtr<nsDOMWindowUtils> mWindowUtils;
nsString mStatus;
nsString mDefaultStatus;