mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1117044 - Mark virtual overridden functions as MOZ_OVERRIDE in widget; r=roc

This commit is contained in:
Ehsan Akhgari 2015-01-02 01:25:48 -05:00
Родитель 5f97b938f2
Коммит 390eaebf41
24 изменённых файлов: 322 добавлений и 323 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
widget/GfxInfoBase.cpp
Просмотреть файл

@ -51,7 +51,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD Observe(nsISupports *subject, const char *aTopic,
const char16_t *aData)
const char16_t *aData) MOZ_OVERRIDE
{
MOZ_ASSERT(strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0);

14
widget/GfxInfoBase.h
Просмотреть файл

@ -50,13 +50,13 @@ public:
// using GfxInfoBase::GetFeatureSuggestedDriverVersion;
// using GfxInfoBase::GetWebGLParameter;
// to import the relevant methods into their namespace.
NS_IMETHOD GetFeatureStatus(int32_t aFeature, int32_t *_retval);
NS_IMETHOD GetFeatureSuggestedDriverVersion(int32_t aFeature, nsAString & _retval);
NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval);
NS_IMETHOD GetFeatureStatus(int32_t aFeature, int32_t *_retval) MOZ_OVERRIDE;
NS_IMETHOD GetFeatureSuggestedDriverVersion(int32_t aFeature, nsAString & _retval) MOZ_OVERRIDE;
NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval) MOZ_OVERRIDE;
NS_IMETHOD GetFailures(uint32_t *failureCount, char ***failures);
NS_IMETHOD_(void) LogFailure(const nsACString &failure);
NS_IMETHOD GetInfo(JSContext*, JS::MutableHandle<JS::Value>);
NS_IMETHOD GetFailures(uint32_t *failureCount, char ***failures) MOZ_OVERRIDE;
NS_IMETHOD_(void) LogFailure(const nsACString &failure) MOZ_OVERRIDE;
NS_IMETHOD GetInfo(JSContext*, JS::MutableHandle<JS::Value>) MOZ_OVERRIDE;
// Initialization function. If you override this, you must call this class's
// version of Init first.
@ -68,7 +68,7 @@ public:
virtual nsresult Init();
// only useful on X11
NS_IMETHOD_(void) GetData() { }
NS_IMETHOD_(void) GetData() MOZ_OVERRIDE { }
static void AddCollector(GfxInfoCollectorBase* collector);
static void RemoveCollector(GfxInfoCollectorBase* collector);

54
widget/PuppetWidget.h
Просмотреть файл

@ -60,7 +60,7 @@ public:
nsNativeWidget aNativeParent,
const nsIntRect& aRect,
nsDeviceContext* aContext,
nsWidgetInitData* aInitData = nullptr);
nsWidgetInitData* aInitData = nullptr) MOZ_OVERRIDE;
void InitIMEState();
@ -68,47 +68,47 @@ public:
CreateChild(const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr,
bool aForceUseIWidgetParent = false);
bool aForceUseIWidgetParent = false) MOZ_OVERRIDE;
NS_IMETHOD Destroy();
NS_IMETHOD Destroy() MOZ_OVERRIDE;
NS_IMETHOD Show(bool aState);
NS_IMETHOD Show(bool aState) MOZ_OVERRIDE;
virtual bool IsVisible() const
virtual bool IsVisible() const MOZ_OVERRIDE
{ return mVisible; }
NS_IMETHOD ConstrainPosition(bool /*ignored aAllowSlop*/,
int32_t* aX,
int32_t* aY)
int32_t* aY) MOZ_OVERRIDE
{ *aX = kMaxDimension; *aY = kMaxDimension; return NS_OK; }
// We're always at <0, 0>, and so ignore move requests.
NS_IMETHOD Move(double aX, double aY)
NS_IMETHOD Move(double aX, double aY) MOZ_OVERRIDE
{ return NS_OK; }
NS_IMETHOD Resize(double aWidth,
double aHeight,
bool aRepaint);
bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD Resize(double aX,
double aY,
double aWidth,
double aHeight,
bool aRepaint)
bool aRepaint) MOZ_OVERRIDE
// (we're always at <0, 0>)
{ return Resize(aWidth, aHeight, aRepaint); }
// XXX/cjones: copying gtk behavior here; unclear what disabling a
// widget is supposed to entail
NS_IMETHOD Enable(bool aState)
NS_IMETHOD Enable(bool aState) MOZ_OVERRIDE
{ mEnabled = aState; return NS_OK; }
virtual bool IsEnabled() const
virtual bool IsEnabled() const MOZ_OVERRIDE
{ return mEnabled; }
NS_IMETHOD SetFocus(bool aRaise = false);
NS_IMETHOD SetFocus(bool aRaise = false) MOZ_OVERRIDE;
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) MOZ_OVERRIDE;
NS_IMETHOD Invalidate(const nsIntRect& aRect);
NS_IMETHOD Invalidate(const nsIntRect& aRect) MOZ_OVERRIDE;
// This API is going away, steer clear.
virtual void Scroll(const nsIntPoint& aDelta,
@ -117,24 +117,24 @@ public:
{ /* dead man walking */ }
// PuppetWidgets don't have native data, as they're purely nonnative.
virtual void* GetNativeData(uint32_t aDataType);
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent)
virtual void* GetNativeData(uint32_t aDataType) MOZ_OVERRIDE;
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
// PuppetWidgets don't have any concept of titles.
NS_IMETHOD SetTitle(const nsAString& aTitle)
NS_IMETHOD SetTitle(const nsAString& aTitle) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
// PuppetWidgets are always at <0, 0>.
virtual nsIntPoint WidgetToScreenOffset()
virtual nsIntPoint WidgetToScreenOffset() MOZ_OVERRIDE
{ return nsIntPoint(0, 0); }
void InitEvent(WidgetGUIEvent& aEvent, nsIntPoint* aPoint = nullptr);
NS_IMETHOD DispatchEvent(WidgetGUIEvent* aEvent, nsEventStatus& aStatus);
NS_IMETHOD DispatchEvent(WidgetGUIEvent* aEvent, nsEventStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD CaptureRollupEvents(nsIRollupListener* aListener,
bool aDoCapture)
bool aDoCapture) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
NS_IMETHOD_(bool)
@ -162,17 +162,17 @@ public:
GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);
bool* aAllowRetaining = nullptr) MOZ_OVERRIDE;
NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) MOZ_OVERRIDE;
NS_IMETHOD_(void) SetInputContext(const InputContext& aContext,
const InputContextAction& aAction);
NS_IMETHOD_(InputContext) GetInputContext();
const InputContextAction& aAction) MOZ_OVERRIDE;
NS_IMETHOD_(InputContext) GetInputContext() MOZ_OVERRIDE;
virtual nsIMEUpdatePreference GetIMEUpdatePreference() MOZ_OVERRIDE;
NS_IMETHOD SetCursor(nsCursor aCursor);
NS_IMETHOD SetCursor(nsCursor aCursor) MOZ_OVERRIDE;
NS_IMETHOD SetCursor(imgIContainer* aCursor,
uint32_t aHotspotX, uint32_t aHotspotY)
uint32_t aHotspotX, uint32_t aHotspotY) MOZ_OVERRIDE
{
return nsBaseWidget::SetCursor(aCursor, aHotspotX, aHotspotY);
}
@ -181,8 +181,8 @@ public:
// Contacts the parent process which gets the DPI from the
// proper widget there. TODO: Handle DPI changes that happen
// later on.
virtual float GetDPI();
virtual double GetDefaultScaleInternal();
virtual float GetDPI() MOZ_OVERRIDE;
virtual double GetDefaultScaleInternal() MOZ_OVERRIDE;
virtual bool NeedsPaint() MOZ_OVERRIDE;

48
widget/cocoa/GfxInfo.h
Просмотреть файл

@ -23,33 +23,33 @@ public:
GfxInfo();
// We only declare the subset of nsIGfxInfo that we actually implement. The
// rest is brought forward from GfxInfoBase.
NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled);
NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled);
NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID);
NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID);
NS_IMETHOD GetAdapterSubsysID(nsAString & aAdapterSubsysID);
NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription);
NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver);
NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID);
NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID);
NS_IMETHOD GetAdapterSubsysID2(nsAString & aAdapterSubsysID);
NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled) MOZ_OVERRIDE;
NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled) MOZ_OVERRIDE;
NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion) MOZ_OVERRIDE;
NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterSubsysID(nsAString & aAdapterSubsysID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterSubsysID2(nsAString & aAdapterSubsysID) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) MOZ_OVERRIDE;
NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate) MOZ_OVERRIDE;
NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active) MOZ_OVERRIDE;
using GfxInfoBase::GetFeatureStatus;
using GfxInfoBase::GetFeatureSuggestedDriverVersion;
using GfxInfoBase::GetWebGLParameter;
virtual nsresult Init();
virtual nsresult Init() MOZ_OVERRIDE;
NS_DECL_ISUPPORTS_INHERITED
#ifdef DEBUG
@ -67,8 +67,8 @@ protected:
int32_t *aStatus,
nsAString & aSuggestedDriverVersion,
const nsTArray<GfxDriverInfo>& aDriverInfo,
OperatingSystem* aOS = nullptr);
virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo();
OperatingSystem* aOS = nullptr) MOZ_OVERRIDE;
virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo() MOZ_OVERRIDE;
private:

2
widget/cocoa/nsAppShell.mm
Просмотреть файл

@ -53,7 +53,7 @@ private:
IOPMAssertionID mAssertionID = kIOPMNullAssertionID;
NS_IMETHOD Callback(const nsAString& aTopic, const nsAString& aState) {
NS_IMETHOD Callback(const nsAString& aTopic, const nsAString& aState) MOZ_OVERRIDE {
if (!aTopic.EqualsASCII("screen")) {
return NS_OK;
}

6
widget/cocoa/nsChangeObserver.h
Просмотреть файл

@ -12,9 +12,9 @@ class nsIDocument;
class nsIAtom;
#define NS_DECL_CHANGEOBSERVER \
void ObserveAttributeChanged(nsIDocument *aDocument, nsIContent *aContent, nsIAtom *aAttribute); \
void ObserveContentRemoved(nsIDocument *aDocument, nsIContent *aChild, int32_t aIndexInContainer); \
void ObserveContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsIContent *aChild);
void ObserveAttributeChanged(nsIDocument *aDocument, nsIContent *aContent, nsIAtom *aAttribute) MOZ_OVERRIDE; \
void ObserveContentRemoved(nsIDocument *aDocument, nsIContent *aChild, int32_t aIndexInContainer) MOZ_OVERRIDE; \
void ObserveContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsIContent *aChild) MOZ_OVERRIDE;
// Something that wants to be alerted to changes in attributes or changes in
// its corresponding content object.

92
widget/cocoa/nsChildView.h
Просмотреть файл

@ -356,30 +356,30 @@ public:
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr);
nsWidgetInitData *aInitData = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Destroy();
NS_IMETHOD Destroy() MOZ_OVERRIDE;
NS_IMETHOD Show(bool aState);
virtual bool IsVisible() const;
NS_IMETHOD Show(bool aState) MOZ_OVERRIDE;
virtual bool IsVisible() const MOZ_OVERRIDE;
NS_IMETHOD SetParent(nsIWidget* aNewParent);
virtual nsIWidget* GetParent(void);
virtual float GetDPI();
NS_IMETHOD SetParent(nsIWidget* aNewParent) MOZ_OVERRIDE;
virtual nsIWidget* GetParent(void) MOZ_OVERRIDE;
virtual float GetDPI() MOZ_OVERRIDE;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
int32_t *aX, int32_t *aY);
NS_IMETHOD Move(double aX, double aY);
NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint);
int32_t *aX, int32_t *aY) MOZ_OVERRIDE;
NS_IMETHOD Move(double aX, double aY) MOZ_OVERRIDE;
NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD Resize(double aX, double aY,
double aWidth, double aHeight, bool aRepaint);
double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD Enable(bool aState);
virtual bool IsEnabled() const;
NS_IMETHOD SetFocus(bool aRaise);
NS_IMETHOD GetBounds(nsIntRect &aRect);
NS_IMETHOD GetClientBounds(nsIntRect &aRect);
NS_IMETHOD GetScreenBounds(nsIntRect &aRect);
NS_IMETHOD Enable(bool aState) MOZ_OVERRIDE;
virtual bool IsEnabled() const MOZ_OVERRIDE;
NS_IMETHOD SetFocus(bool aRaise) MOZ_OVERRIDE;
NS_IMETHOD GetBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetClientBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetScreenBounds(nsIntRect &aRect) MOZ_OVERRIDE;
// Returns the "backing scale factor" of the view's window, which is the
// ratio of pixels in the window's backing store to Cocoa points. Prior to
@ -393,43 +393,43 @@ public:
// between HiDPI and non-HiDPI screens
void BackingScaleFactorChanged();
virtual double GetDefaultScaleInternal();
virtual double GetDefaultScaleInternal() MOZ_OVERRIDE;
virtual int32_t RoundsWidgetCoordinatesTo() MOZ_OVERRIDE;
NS_IMETHOD Invalidate(const nsIntRect &aRect);
NS_IMETHOD Invalidate(const nsIntRect &aRect) MOZ_OVERRIDE;
virtual void* GetNativeData(uint32_t aDataType);
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
virtual nsIntPoint WidgetToScreenOffset();
virtual bool ShowsResizeIndicator(nsIntRect* aResizerRect);
virtual void* GetNativeData(uint32_t aDataType) MOZ_OVERRIDE;
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) MOZ_OVERRIDE;
virtual nsIntPoint WidgetToScreenOffset() MOZ_OVERRIDE;
virtual bool ShowsResizeIndicator(nsIntRect* aResizerRect) MOZ_OVERRIDE;
static bool ConvertStatus(nsEventStatus aStatus)
{ return aStatus == nsEventStatus_eConsumeNoDefault; }
NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
nsEventStatus& aStatus);
nsEventStatus& aStatus) MOZ_OVERRIDE;
virtual bool ComputeShouldAccelerate(bool aDefault);
virtual bool ComputeShouldAccelerate(bool aDefault) MOZ_OVERRIDE;
virtual bool ShouldUseOffMainThreadCompositing() MOZ_OVERRIDE;
NS_IMETHOD SetCursor(nsCursor aCursor);
NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY);
NS_IMETHOD SetCursor(nsCursor aCursor) MOZ_OVERRIDE;
NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY) MOZ_OVERRIDE;
NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, bool aDoCapture);
NS_IMETHOD SetTitle(const nsAString& title);
NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, bool aDoCapture) MOZ_OVERRIDE;
NS_IMETHOD SetTitle(const nsAString& title) MOZ_OVERRIDE;
NS_IMETHOD GetAttention(int32_t aCycleCount);
NS_IMETHOD GetAttention(int32_t aCycleCount) MOZ_OVERRIDE;
virtual bool HasPendingInputEvent();
virtual bool HasPendingInputEvent() MOZ_OVERRIDE;
NS_IMETHOD ActivateNativeMenuItemAt(const nsAString& indexString);
NS_IMETHOD ForceUpdateNativeMenuAt(const nsAString& indexString);
NS_IMETHOD ActivateNativeMenuItemAt(const nsAString& indexString) MOZ_OVERRIDE;
NS_IMETHOD ForceUpdateNativeMenuAt(const nsAString& indexString) MOZ_OVERRIDE;
NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) MOZ_OVERRIDE;
NS_IMETHOD_(void) SetInputContext(const InputContext& aContext,
const InputContextAction& aAction);
NS_IMETHOD_(InputContext) GetInputContext();
NS_IMETHOD AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent);
const InputContextAction& aAction) MOZ_OVERRIDE;
NS_IMETHOD_(InputContext) GetInputContext() MOZ_OVERRIDE;
NS_IMETHOD AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent) MOZ_OVERRIDE;
NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
NativeKeyBindingsType aType,
const mozilla::WidgetKeyboardEvent& aEvent,
@ -444,22 +444,22 @@ public:
uint32_t aCocoaKeyCode);
virtual nsIMEUpdatePreference GetIMEUpdatePreference() MOZ_OVERRIDE;
NS_IMETHOD GetToggledKeyState(uint32_t aKeyCode,
bool* aLEDState);
bool* aLEDState) MOZ_OVERRIDE;
virtual nsTransparencyMode GetTransparencyMode();
virtual void SetTransparencyMode(nsTransparencyMode aMode);
virtual nsTransparencyMode GetTransparencyMode() MOZ_OVERRIDE;
virtual void SetTransparencyMode(nsTransparencyMode aMode) MOZ_OVERRIDE;
virtual nsresult SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
int32_t aNativeKeyCode,
uint32_t aModifierFlags,
const nsAString& aCharacters,
const nsAString& aUnmodifiedCharacters);
const nsAString& aUnmodifiedCharacters) MOZ_OVERRIDE;
virtual nsresult SynthesizeNativeMouseEvent(nsIntPoint aPoint,
uint32_t aNativeMessage,
uint32_t aModifierFlags);
uint32_t aModifierFlags) MOZ_OVERRIDE;
virtual nsresult SynthesizeNativeMouseMove(nsIntPoint aPoint)
virtual nsresult SynthesizeNativeMouseMove(nsIntPoint aPoint) MOZ_OVERRIDE
{ return SynthesizeNativeMouseEvent(aPoint, NSMouseMoved, 0); }
// Mac specific methods
@ -473,14 +473,14 @@ public:
already_AddRefed<mozilla::a11y::Accessible> GetDocumentAccessible();
#endif
virtual void CreateCompositor();
virtual void CreateCompositor() MOZ_OVERRIDE;
virtual void PrepareWindowEffects() MOZ_OVERRIDE;
virtual void CleanupWindowEffects() MOZ_OVERRIDE;
virtual bool PreRender(LayerManagerComposite* aManager) MOZ_OVERRIDE;
virtual void PostRender(LayerManagerComposite* aManager) MOZ_OVERRIDE;
virtual void DrawWindowOverlay(LayerManagerComposite* aManager, nsIntRect aRect) MOZ_OVERRIDE;
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries);
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) MOZ_OVERRIDE;
virtual void UpdateWindowDraggingRegion(const nsIntRegion& aRegion) MOZ_OVERRIDE;
const nsIntRegion& GetDraggableRegion() { return mDraggableRegion; }
@ -495,7 +495,7 @@ public:
nsCocoaWindow* GetXULWindowWidget();
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent);
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) MOZ_OVERRIDE;
mozilla::widget::TextInputHandler* GetTextInputHandler()
{
@ -541,7 +541,7 @@ protected:
void TearDownView();
virtual already_AddRefed<nsIWidget>
AllocateChildPopupWidget()
AllocateChildPopupWidget() MOZ_OVERRIDE
{
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
nsCOMPtr<nsIWidget> widget = do_CreateInstance(kCPopUpCID);

100
widget/cocoa/nsCocoaWindow.h
Просмотреть файл

@ -249,75 +249,75 @@ public:
nsNativeWidget aNativeParent,
const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr);
nsWidgetInitData *aInitData = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Destroy();
NS_IMETHOD Destroy() MOZ_OVERRIDE;
NS_IMETHOD Show(bool aState);
virtual nsIWidget* GetSheetWindowParent(void);
NS_IMETHOD Enable(bool aState);
virtual bool IsEnabled() const;
NS_IMETHOD SetModal(bool aState);
virtual bool IsVisible() const;
NS_IMETHOD SetFocus(bool aState=false);
virtual nsIntPoint WidgetToScreenOffset();
virtual nsIntPoint GetClientOffset();
virtual nsIntSize ClientToWindowSize(const nsIntSize& aClientSize);
NS_IMETHOD Show(bool aState) MOZ_OVERRIDE;
virtual nsIWidget* GetSheetWindowParent(void) MOZ_OVERRIDE;
NS_IMETHOD Enable(bool aState) MOZ_OVERRIDE;
virtual bool IsEnabled() const MOZ_OVERRIDE;
NS_IMETHOD SetModal(bool aState) MOZ_OVERRIDE;
virtual bool IsVisible() const MOZ_OVERRIDE;
NS_IMETHOD SetFocus(bool aState=false) MOZ_OVERRIDE;
virtual nsIntPoint WidgetToScreenOffset() MOZ_OVERRIDE;
virtual nsIntPoint GetClientOffset() MOZ_OVERRIDE;
virtual nsIntSize ClientToWindowSize(const nsIntSize& aClientSize) MOZ_OVERRIDE;
virtual void* GetNativeData(uint32_t aDataType) ;
virtual void* GetNativeData(uint32_t aDataType) MOZ_OVERRIDE;
NS_IMETHOD ConstrainPosition(bool aAllowSlop,
int32_t *aX, int32_t *aY);
virtual void SetSizeConstraints(const SizeConstraints& aConstraints);
NS_IMETHOD Move(double aX, double aY);
int32_t *aX, int32_t *aY) MOZ_OVERRIDE;
virtual void SetSizeConstraints(const SizeConstraints& aConstraints) MOZ_OVERRIDE;
NS_IMETHOD Move(double aX, double aY) MOZ_OVERRIDE;
NS_IMETHOD PlaceBehind(nsTopLevelWidgetZPlacement aPlacement,
nsIWidget *aWidget, bool aActivate);
NS_IMETHOD SetSizeMode(int32_t aMode);
NS_IMETHOD HideWindowChrome(bool aShouldHide);
nsIWidget *aWidget, bool aActivate) MOZ_OVERRIDE;
NS_IMETHOD SetSizeMode(int32_t aMode) MOZ_OVERRIDE;
NS_IMETHOD HideWindowChrome(bool aShouldHide) MOZ_OVERRIDE;
void EnteredFullScreen(bool aFullScreen);
NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint);
NS_IMETHOD Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint);
NS_IMETHOD GetClientBounds(nsIntRect &aRect);
NS_IMETHOD GetScreenBounds(nsIntRect &aRect);
NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr) MOZ_OVERRIDE;
NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD GetClientBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetScreenBounds(nsIntRect &aRect) MOZ_OVERRIDE;
void ReportMoveEvent();
void ReportSizeEvent();
NS_IMETHOD SetCursor(nsCursor aCursor);
NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY);
NS_IMETHOD SetCursor(nsCursor aCursor) MOZ_OVERRIDE;
NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY) MOZ_OVERRIDE;
CGFloat BackingScaleFactor();
void BackingScaleFactorChanged();
virtual double GetDefaultScaleInternal();
virtual double GetDefaultScaleInternal() MOZ_OVERRIDE;
virtual int32_t RoundsWidgetCoordinatesTo() MOZ_OVERRIDE;
NS_IMETHOD SetTitle(const nsAString& aTitle);
NS_IMETHOD SetTitle(const nsAString& aTitle) MOZ_OVERRIDE;
NS_IMETHOD Invalidate(const nsIntRect &aRect);
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
NS_IMETHOD Invalidate(const nsIntRect &aRect) MOZ_OVERRIDE;
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) MOZ_OVERRIDE;
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);
bool* aAllowRetaining = nullptr) MOZ_OVERRIDE;
NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
nsEventStatus& aStatus);
NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, bool aDoCapture);
NS_IMETHOD GetAttention(int32_t aCycleCount);
virtual bool HasPendingInputEvent();
virtual nsTransparencyMode GetTransparencyMode();
virtual void SetTransparencyMode(nsTransparencyMode aMode);
NS_IMETHOD SetWindowShadowStyle(int32_t aStyle);
virtual void SetShowsToolbarButton(bool aShow);
virtual void SetShowsFullScreenButton(bool aShow);
virtual void SetWindowAnimationType(WindowAnimationType aType);
virtual void SetDrawsTitle(bool aDrawTitle);
nsEventStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, bool aDoCapture) MOZ_OVERRIDE;
NS_IMETHOD GetAttention(int32_t aCycleCount) MOZ_OVERRIDE;
virtual bool HasPendingInputEvent() MOZ_OVERRIDE;
virtual nsTransparencyMode GetTransparencyMode() MOZ_OVERRIDE;
virtual void SetTransparencyMode(nsTransparencyMode aMode) MOZ_OVERRIDE;
NS_IMETHOD SetWindowShadowStyle(int32_t aStyle) MOZ_OVERRIDE;
virtual void SetShowsToolbarButton(bool aShow) MOZ_OVERRIDE;
virtual void SetShowsFullScreenButton(bool aShow) MOZ_OVERRIDE;
virtual void SetWindowAnimationType(WindowAnimationType aType) MOZ_OVERRIDE;
virtual void SetDrawsTitle(bool aDrawTitle) MOZ_OVERRIDE;
virtual void SetUseBrightTitlebarForeground(bool aBrightForeground) MOZ_OVERRIDE;
NS_IMETHOD SetNonClientMargins(nsIntMargin &margins);
NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive);
virtual void SetDrawsInTitlebar(bool aState);
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries);
NS_IMETHOD SetNonClientMargins(nsIntMargin &margins) MOZ_OVERRIDE;
NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive) MOZ_OVERRIDE;
virtual void SetDrawsInTitlebar(bool aState) MOZ_OVERRIDE;
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) MOZ_OVERRIDE;
virtual nsresult SynthesizeNativeMouseEvent(nsIntPoint aPoint,
uint32_t aNativeMessage,
uint32_t aModifierFlags);
uint32_t aModifierFlags) MOZ_OVERRIDE;
void DispatchSizeModeEvent();
@ -334,7 +334,7 @@ public:
NS_IMETHOD_(void) SetInputContext(
const InputContext& aContext,
const InputContextAction& aAction) MOZ_OVERRIDE;
NS_IMETHOD_(InputContext) GetInputContext()
NS_IMETHOD_(InputContext) GetInputContext() MOZ_OVERRIDE
{
NSView* view = mWindow ? [mWindow contentView] : nil;
if (view) {
@ -356,7 +356,7 @@ public:
void SetPopupWindowLevel();
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent);
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) MOZ_OVERRIDE;
protected:
virtual ~nsCocoaWindow();
@ -374,7 +374,7 @@ protected:
bool aRepaint, bool aConstrainToCurrentScreen);
virtual already_AddRefed<nsIWidget>
AllocateChildPopupWidget()
AllocateChildPopupWidget() MOZ_OVERRIDE
{
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
nsCOMPtr<nsIWidget> widget = do_CreateInstance(kCPopUpCID);

4
widget/cocoa/nsColorPicker.h
Просмотреть файл

@ -22,8 +22,8 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD Init(nsIDOMWindow* aParent, const nsAString& aTitle,
const nsAString& aInitialColor);
NS_IMETHOD Open(nsIColorPickerShownCallback* aCallback);
const nsAString& aInitialColor) MOZ_OVERRIDE;
NS_IMETHOD Open(nsIColorPickerShownCallback* aCallback) MOZ_OVERRIDE;
// For NSColorPanelWrapper.
void Update(NSColor* aColor);

12
widget/cocoa/nsDeviceContextSpecX.h
Просмотреть файл

@ -17,15 +17,15 @@ public:
nsDeviceContextSpecX();
NS_IMETHOD Init(nsIWidget *aWidget, nsIPrintSettings* aPS, bool aIsPrintPreview);
NS_IMETHOD GetSurfaceForPrinter(gfxASurface **surface);
NS_IMETHOD Init(nsIWidget *aWidget, nsIPrintSettings* aPS, bool aIsPrintPreview) MOZ_OVERRIDE;
NS_IMETHOD GetSurfaceForPrinter(gfxASurface **surface) MOZ_OVERRIDE;
NS_IMETHOD BeginDocument(const nsAString& aTitle,
char16_t* aPrintToFileName,
int32_t aStartPage,
int32_t aEndPage);
NS_IMETHOD EndDocument();
NS_IMETHOD BeginPage();
NS_IMETHOD EndPage();
int32_t aEndPage) MOZ_OVERRIDE;
NS_IMETHOD EndDocument() MOZ_OVERRIDE;
NS_IMETHOD BeginPage() MOZ_OVERRIDE;
NS_IMETHOD EndPage() MOZ_OVERRIDE;
void GetPaperRect(double* aTop, double* aLeft, double* aBottom, double* aRight);

24
widget/cocoa/nsFilePicker.h
Просмотреть файл

@ -25,17 +25,17 @@ public:
NS_DECL_ISUPPORTS
// nsIFilePicker (less what's in nsBaseFilePicker)
NS_IMETHOD GetDefaultString(nsAString& aDefaultString);
NS_IMETHOD SetDefaultString(const nsAString& aDefaultString);
NS_IMETHOD GetDefaultExtension(nsAString& aDefaultExtension);
NS_IMETHOD GetFilterIndex(int32_t *aFilterIndex);
NS_IMETHOD SetFilterIndex(int32_t aFilterIndex);
NS_IMETHOD SetDefaultExtension(const nsAString& aDefaultExtension);
NS_IMETHOD GetFile(nsIFile * *aFile);
NS_IMETHOD GetFileURL(nsIURI * *aFileURL);
NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles);
NS_IMETHOD Show(int16_t *_retval);
NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
NS_IMETHOD GetDefaultString(nsAString& aDefaultString) MOZ_OVERRIDE;
NS_IMETHOD SetDefaultString(const nsAString& aDefaultString) MOZ_OVERRIDE;
NS_IMETHOD GetDefaultExtension(nsAString& aDefaultExtension) MOZ_OVERRIDE;
NS_IMETHOD GetFilterIndex(int32_t *aFilterIndex) MOZ_OVERRIDE;
NS_IMETHOD SetFilterIndex(int32_t aFilterIndex) MOZ_OVERRIDE;
NS_IMETHOD SetDefaultExtension(const nsAString& aDefaultExtension) MOZ_OVERRIDE;
NS_IMETHOD GetFile(nsIFile * *aFile) MOZ_OVERRIDE;
NS_IMETHOD GetFileURL(nsIURI * *aFileURL) MOZ_OVERRIDE;
NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles) MOZ_OVERRIDE;
NS_IMETHOD Show(int16_t *_retval) MOZ_OVERRIDE;
NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter) MOZ_OVERRIDE;
/**
* Returns the current filter list in the format used by Cocoa's NSSavePanel
@ -47,7 +47,7 @@ public:
protected:
virtual ~nsFilePicker();
virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle);
virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle) MOZ_OVERRIDE;
// actual implementations of get/put dialogs using NSOpenPanel & NSSavePanel
// aFile is an existing but unspecified file. These functions must specify it.

4
widget/cocoa/nsIdleServiceX.h
Просмотреть файл

@ -12,7 +12,7 @@ class nsIdleServiceX : public nsIdleService
public:
NS_DECL_ISUPPORTS_INHERITED
bool PollIdleTime(uint32_t* aIdleTime);
bool PollIdleTime(uint32_t* aIdleTime) MOZ_OVERRIDE;
static already_AddRefed<nsIdleServiceX> GetInstance()
{
@ -27,7 +27,7 @@ public:
protected:
nsIdleServiceX() { }
virtual ~nsIdleServiceX() { }
bool UsePollMode();
bool UsePollMode() MOZ_OVERRIDE;
};
#endif // nsIdleServiceX_h_

6
widget/cocoa/nsMenuBarX.h
Просмотреть файл

@ -29,7 +29,7 @@ public:
nsNativeMenuServiceX() {}
NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode);
NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode) MOZ_OVERRIDE;
protected:
virtual ~nsNativeMenuServiceX() {}
@ -110,8 +110,8 @@ public:
NS_DECL_CHANGEOBSERVER
// nsMenuObjectX
void* NativeData() {return (void*)mNativeMenu;}
nsMenuObjectTypeX MenuObjectType() {return eMenuBarObjectType;}
void* NativeData() MOZ_OVERRIDE {return (void*)mNativeMenu;}
nsMenuObjectTypeX MenuObjectType() MOZ_OVERRIDE {return eMenuBarObjectType;}
// nsMenuBarX
nsresult Create(nsIWidget* aParent, nsIContent* aContent);

4
widget/cocoa/nsMenuItemX.h
Просмотреть файл

@ -45,8 +45,8 @@ public:
NS_DECL_CHANGEOBSERVER
// nsMenuObjectX
void* NativeData() {return (void*)mNativeMenuItem;}
nsMenuObjectTypeX MenuObjectType() {return eMenuItemObjectType;}
void* NativeData() MOZ_OVERRIDE {return (void*)mNativeMenuItem;}
nsMenuObjectTypeX MenuObjectType() MOZ_OVERRIDE {return eMenuItemObjectType;}
// nsMenuItemX
nsresult Create(nsMenuX* aParent, const nsString& aLabel, EMenuItemType aItemType,

4
widget/cocoa/nsMenuX.h
Просмотреть файл

@ -50,8 +50,8 @@ public:
NS_DECL_CHANGEOBSERVER
// nsMenuObjectX
void* NativeData() {return (void*)mNativeMenu;}
nsMenuObjectTypeX MenuObjectType() {return eSubmenuObjectType;}
void* NativeData() MOZ_OVERRIDE {return (void*)mNativeMenu;}
nsMenuObjectTypeX MenuObjectType() MOZ_OVERRIDE {return eSubmenuObjectType;}
void IconUpdated() MOZ_OVERRIDE { mParent->IconUpdated(); }
// nsMenuX

24
widget/cocoa/nsNativeThemeCocoa.h
Просмотреть файл

@ -37,35 +37,35 @@ public:
nsIFrame* aFrame,
uint8_t aWidgetType,
const nsRect& aRect,
const nsRect& aDirtyRect);
const nsRect& aDirtyRect) MOZ_OVERRIDE;
NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext,
nsIFrame* aFrame,
uint8_t aWidgetType,
nsIntMargin* aResult);
nsIntMargin* aResult) MOZ_OVERRIDE;
virtual bool GetWidgetPadding(nsDeviceContext* aContext,
nsIFrame* aFrame,
uint8_t aWidgetType,
nsIntMargin* aResult);
nsIntMargin* aResult) MOZ_OVERRIDE;
virtual bool GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
uint8_t aWidgetType, nsRect* aOverflowRect);
uint8_t aWidgetType, nsRect* aOverflowRect) MOZ_OVERRIDE;
NS_IMETHOD GetMinimumWidgetSize(nsPresContext* aPresContext, nsIFrame* aFrame,
uint8_t aWidgetType,
nsIntSize* aResult, bool* aIsOverridable);
nsIntSize* aResult, bool* aIsOverridable) MOZ_OVERRIDE;
NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, uint8_t aWidgetType,
nsIAtom* aAttribute, bool* aShouldRepaint);
NS_IMETHOD ThemeChanged();
bool ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame, uint8_t aWidgetType);
bool WidgetIsContainer(uint8_t aWidgetType);
nsIAtom* aAttribute, bool* aShouldRepaint) MOZ_OVERRIDE;
NS_IMETHOD ThemeChanged() MOZ_OVERRIDE;
bool ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame, uint8_t aWidgetType) MOZ_OVERRIDE;
bool WidgetIsContainer(uint8_t aWidgetType) MOZ_OVERRIDE;
bool ThemeDrawsFocusForWidget(uint8_t aWidgetType) MOZ_OVERRIDE;
bool ThemeNeedsComboboxDropmarker();
bool ThemeNeedsComboboxDropmarker() MOZ_OVERRIDE;
virtual bool WidgetAppearanceDependsOnWindowFocus(uint8_t aWidgetType) MOZ_OVERRIDE;
virtual bool NeedToClearBackgroundBehindWidget(uint8_t aWidgetType) MOZ_OVERRIDE;
virtual bool WidgetProvidesFontSmoothingBackgroundColor(nsIFrame* aFrame, uint8_t aWidgetType,
nscolor* aColor);
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType);
nscolor* aColor) MOZ_OVERRIDE;
virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType) MOZ_OVERRIDE;
void DrawProgress(CGContextRef context, const HIRect& inBoxRect,
bool inIsIndeterminate, bool inIsHorizontal,

6
widget/cocoa/nsPrintDialogX.h
Просмотреть файл

@ -22,11 +22,11 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Init();
NS_IMETHODIMP Init() MOZ_OVERRIDE;
NS_IMETHODIMP Show(nsIDOMWindow *aParent, nsIPrintSettings *aSettings,
nsIWebBrowserPrint *aWebBrowserPrint);
nsIWebBrowserPrint *aWebBrowserPrint) MOZ_OVERRIDE;
NS_IMETHODIMP ShowPageSetup(nsIDOMWindow *aParent,
nsIPrintSettings *aSettings);
nsIPrintSettings *aSettings) MOZ_OVERRIDE;
protected:
virtual ~nsPrintDialogServiceX();

4
widget/cocoa/nsPrintSettingsX.h
Просмотреть файл

@ -37,8 +37,8 @@ protected:
nsPrintSettingsX(const nsPrintSettingsX& src);
nsPrintSettingsX& operator=(const nsPrintSettingsX& rhs);
nsresult _Clone(nsIPrintSettings **_retval);
nsresult _Assign(nsIPrintSettings *aPS);
nsresult _Clone(nsIPrintSettings **_retval) MOZ_OVERRIDE;
nsresult _Assign(nsIPrintSettings *aPS) MOZ_OVERRIDE;
// Re-initialize mUnwriteableMargin with values from mPageFormat.
// Should be called whenever mPageFormat is initialized or overwritten.

4
widget/cocoa/nsStandaloneNativeMenu.h
Просмотреть файл

@ -19,8 +19,8 @@ public:
NS_DECL_NSISTANDALONENATIVEMENU
// nsMenuObjectX
nsMenuObjectTypeX MenuObjectType() { return eStandaloneNativeMenuObjectType; }
void * NativeData() { return mMenu != nullptr ? mMenu->NativeData() : nullptr; }
nsMenuObjectTypeX MenuObjectType() MOZ_OVERRIDE { return eStandaloneNativeMenuObjectType; }
void * NativeData() MOZ_OVERRIDE { return mMenu != nullptr ? mMenu->NativeData() : nullptr; }
virtual void IconUpdated() MOZ_OVERRIDE;
nsMenuX * GetMenuXObject() { return mMenu; }

4
widget/nsBaseFilePicker.cpp
Просмотреть файл

@ -81,7 +81,7 @@ public:
{}
NS_IMETHOD
GetNext(nsISupports** aResult)
GetNext(nsISupports** aResult) MOZ_OVERRIDE
{
nsCOMPtr<nsISupports> tmp;
nsresult rv = mIterator->GetNext(getter_AddRefs(tmp));
@ -102,7 +102,7 @@ public:
}
NS_IMETHOD
HasMoreElements(bool* aResult)
HasMoreElements(bool* aResult) MOZ_OVERRIDE
{
return mIterator->HasMoreElements(aResult);
}

14
widget/nsBaseScreen.h
Просмотреть файл

@ -24,24 +24,24 @@ public:
// implementations where global display pixels may not correspond
// to per-screen device pixels must override.
NS_IMETHOD GetRectDisplayPix(int32_t *outLeft, int32_t *outTop,
int32_t *outWidth, int32_t *outHeight);
int32_t *outWidth, int32_t *outHeight) MOZ_OVERRIDE;
NS_IMETHOD GetAvailRectDisplayPix(int32_t *outLeft, int32_t *outTop,
int32_t *outWidth, int32_t *outHeight);
int32_t *outWidth, int32_t *outHeight) MOZ_OVERRIDE;
/**
* Simple management of screen brightness locks. This abstract base class
* allows all widget implementations to share brightness locking code.
*/
NS_IMETHOD LockMinimumBrightness(uint32_t aBrightness);
NS_IMETHOD UnlockMinimumBrightness(uint32_t aBrightness);
NS_IMETHOD LockMinimumBrightness(uint32_t aBrightness) MOZ_OVERRIDE;
NS_IMETHOD UnlockMinimumBrightness(uint32_t aBrightness) MOZ_OVERRIDE;
NS_IMETHOD GetRotation(uint32_t* aRotation) {
NS_IMETHOD GetRotation(uint32_t* aRotation) MOZ_OVERRIDE {
*aRotation = nsIScreen::ROTATION_0_DEG;
return NS_OK;
}
NS_IMETHOD SetRotation(uint32_t aRotation) { return NS_ERROR_NOT_AVAILABLE; }
NS_IMETHOD SetRotation(uint32_t aRotation) MOZ_OVERRIDE { return NS_ERROR_NOT_AVAILABLE; }
NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor);
NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor) MOZ_OVERRIDE;
protected:
virtual ~nsBaseScreen();

177
widget/nsBaseWidget.h
Просмотреть файл

@ -100,67 +100,67 @@ public:
NS_DECL_ISUPPORTS
// nsIWidget interface
NS_IMETHOD CaptureMouse(bool aCapture);
virtual nsIWidgetListener* GetWidgetListener();
virtual void SetWidgetListener(nsIWidgetListener* alistener);
NS_IMETHOD Destroy();
NS_IMETHOD SetParent(nsIWidget* aNewParent);
virtual nsIWidget* GetParent(void);
virtual nsIWidget* GetTopLevelWidget();
virtual nsIWidget* GetSheetWindowParent(void);
virtual float GetDPI();
virtual void AddChild(nsIWidget* aChild);
virtual void RemoveChild(nsIWidget* aChild);
NS_IMETHOD CaptureMouse(bool aCapture) MOZ_OVERRIDE;
virtual nsIWidgetListener* GetWidgetListener() MOZ_OVERRIDE;
virtual void SetWidgetListener(nsIWidgetListener* alistener) MOZ_OVERRIDE;
NS_IMETHOD Destroy() MOZ_OVERRIDE;
NS_IMETHOD SetParent(nsIWidget* aNewParent) MOZ_OVERRIDE;
virtual nsIWidget* GetParent(void) MOZ_OVERRIDE;
virtual nsIWidget* GetTopLevelWidget() MOZ_OVERRIDE;
virtual nsIWidget* GetSheetWindowParent(void) MOZ_OVERRIDE;
virtual float GetDPI() MOZ_OVERRIDE;
virtual void AddChild(nsIWidget* aChild) MOZ_OVERRIDE;
virtual void RemoveChild(nsIWidget* aChild) MOZ_OVERRIDE;
void SetZIndex(int32_t aZIndex);
void SetZIndex(int32_t aZIndex) MOZ_OVERRIDE;
NS_IMETHOD PlaceBehind(nsTopLevelWidgetZPlacement aPlacement,
nsIWidget *aWidget, bool aActivate);
nsIWidget *aWidget, bool aActivate) MOZ_OVERRIDE;
NS_IMETHOD SetSizeMode(int32_t aMode);
NS_IMETHOD SetSizeMode(int32_t aMode) MOZ_OVERRIDE;
virtual int32_t SizeMode() MOZ_OVERRIDE
{
return mSizeMode;
}
virtual nsCursor GetCursor();
NS_IMETHOD SetCursor(nsCursor aCursor);
virtual nsCursor GetCursor() MOZ_OVERRIDE;
NS_IMETHOD SetCursor(nsCursor aCursor) MOZ_OVERRIDE;
NS_IMETHOD SetCursor(imgIContainer* aCursor,
uint32_t aHotspotX, uint32_t aHotspotY);
virtual void ClearCachedCursor() { mUpdateCursor = true; }
virtual void SetTransparencyMode(nsTransparencyMode aMode);
virtual nsTransparencyMode GetTransparencyMode();
virtual void GetWindowClipRegion(nsTArray<nsIntRect>* aRects);
NS_IMETHOD SetWindowShadowStyle(int32_t aStyle);
virtual void SetShowsToolbarButton(bool aShow) {}
virtual void SetShowsFullScreenButton(bool aShow) {}
virtual void SetWindowAnimationType(WindowAnimationType aType) {}
NS_IMETHOD HideWindowChrome(bool aShouldHide);
NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr);
virtual nsDeviceContext* GetDeviceContext();
uint32_t aHotspotX, uint32_t aHotspotY) MOZ_OVERRIDE;
virtual void ClearCachedCursor() MOZ_OVERRIDE { mUpdateCursor = true; }
virtual void SetTransparencyMode(nsTransparencyMode aMode) MOZ_OVERRIDE;
virtual nsTransparencyMode GetTransparencyMode() MOZ_OVERRIDE;
virtual void GetWindowClipRegion(nsTArray<nsIntRect>* aRects) MOZ_OVERRIDE;
NS_IMETHOD SetWindowShadowStyle(int32_t aStyle) MOZ_OVERRIDE;
virtual void SetShowsToolbarButton(bool aShow) MOZ_OVERRIDE {}
virtual void SetShowsFullScreenButton(bool aShow) MOZ_OVERRIDE {}
virtual void SetWindowAnimationType(WindowAnimationType aType) MOZ_OVERRIDE {}
NS_IMETHOD HideWindowChrome(bool aShouldHide) MOZ_OVERRIDE;
NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr) MOZ_OVERRIDE;
virtual nsDeviceContext* GetDeviceContext() MOZ_OVERRIDE;
virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
bool* aAllowRetaining = nullptr);
bool* aAllowRetaining = nullptr) MOZ_OVERRIDE;
CompositorVsyncDispatcher* GetCompositorVsyncDispatcher() MOZ_OVERRIDE;
virtual void CreateCompositorVsyncDispatcher();
void CreateCompositorVsyncDispatcher();
virtual CompositorParent* NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight);
virtual void CreateCompositor();
virtual void CreateCompositor(int aWidth, int aHeight);
virtual void PrepareWindowEffects() {}
virtual void CleanupWindowEffects() {}
virtual bool PreRender(LayerManagerComposite* aManager) { return true; }
virtual void PostRender(LayerManagerComposite* aManager) {}
virtual void DrawWindowUnderlay(LayerManagerComposite* aManager, nsIntRect aRect) {}
virtual void DrawWindowOverlay(LayerManagerComposite* aManager, nsIntRect aRect) {}
virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget> StartRemoteDrawing();
virtual void EndRemoteDrawing() { };
virtual void CleanupRemoteDrawing() { };
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) {}
NS_IMETHOD SetModal(bool aModal);
virtual uint32_t GetMaxTouchPoints() const;
NS_IMETHOD SetWindowClass(const nsAString& xulWinType);
virtual nsresult SetWindowClipRegion(const nsTArray<nsIntRect>& aRects, bool aIntersectWithExisting);
virtual void PrepareWindowEffects() MOZ_OVERRIDE {}
virtual void CleanupWindowEffects() MOZ_OVERRIDE {}
virtual bool PreRender(LayerManagerComposite* aManager) MOZ_OVERRIDE { return true; }
virtual void PostRender(LayerManagerComposite* aManager) MOZ_OVERRIDE {}
virtual void DrawWindowUnderlay(LayerManagerComposite* aManager, nsIntRect aRect) MOZ_OVERRIDE {}
virtual void DrawWindowOverlay(LayerManagerComposite* aManager, nsIntRect aRect) MOZ_OVERRIDE {}
virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget> StartRemoteDrawing() MOZ_OVERRIDE;
virtual void EndRemoteDrawing() MOZ_OVERRIDE { };
virtual void CleanupRemoteDrawing() MOZ_OVERRIDE { };
virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) MOZ_OVERRIDE {}
NS_IMETHOD SetModal(bool aModal) MOZ_OVERRIDE;
virtual uint32_t GetMaxTouchPoints() const MOZ_OVERRIDE;
NS_IMETHOD SetWindowClass(const nsAString& xulWinType) MOZ_OVERRIDE;
virtual nsresult SetWindowClipRegion(const nsTArray<nsIntRect>& aRects, bool aIntersectWithExisting) MOZ_OVERRIDE;
// Return whether this widget interprets parameters to Move and Resize APIs
// as "global display pixels" rather than "device pixels", and therefore
// applies its GetDefaultScale() value to them before using them as mBounds
@ -171,30 +171,30 @@ public:
bool BoundsUseDisplayPixels() const {
return mWindowType <= eWindowType_popup;
}
NS_IMETHOD MoveClient(double aX, double aY);
NS_IMETHOD ResizeClient(double aWidth, double aHeight, bool aRepaint);
NS_IMETHOD ResizeClient(double aX, double aY, double aWidth, double aHeight, bool aRepaint);
NS_IMETHOD GetBounds(nsIntRect &aRect);
NS_IMETHOD GetClientBounds(nsIntRect &aRect);
NS_IMETHOD GetScreenBounds(nsIntRect &aRect);
NS_IMETHOD MoveClient(double aX, double aY) MOZ_OVERRIDE;
NS_IMETHOD ResizeClient(double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD ResizeClient(double aX, double aY, double aWidth, double aHeight, bool aRepaint) MOZ_OVERRIDE;
NS_IMETHOD GetBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetClientBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetScreenBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetRestoredBounds(nsIntRect &aRect) MOZ_OVERRIDE;
NS_IMETHOD GetNonClientMargins(nsIntMargin &margins);
NS_IMETHOD SetNonClientMargins(nsIntMargin &margins);
virtual nsIntPoint GetClientOffset();
NS_IMETHOD EnableDragDrop(bool aEnable);
NS_IMETHOD GetAttention(int32_t aCycleCount);
virtual bool HasPendingInputEvent();
NS_IMETHOD SetIcon(const nsAString &anIconSpec);
NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive);
virtual void SetDrawsInTitlebar(bool aState) {}
virtual bool ShowsResizeIndicator(nsIntRect* aResizerRect);
virtual void FreeNativeData(void * data, uint32_t aDataType) {}
NS_IMETHOD GetNonClientMargins(nsIntMargin &margins) MOZ_OVERRIDE;
NS_IMETHOD SetNonClientMargins(nsIntMargin &margins) MOZ_OVERRIDE;
virtual nsIntPoint GetClientOffset() MOZ_OVERRIDE;
NS_IMETHOD EnableDragDrop(bool aEnable) MOZ_OVERRIDE;
NS_IMETHOD GetAttention(int32_t aCycleCount) MOZ_OVERRIDE;
virtual bool HasPendingInputEvent() MOZ_OVERRIDE;
NS_IMETHOD SetIcon(const nsAString &anIconSpec) MOZ_OVERRIDE;
NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive) MOZ_OVERRIDE;
virtual void SetDrawsInTitlebar(bool aState) MOZ_OVERRIDE {}
virtual bool ShowsResizeIndicator(nsIntRect* aResizerRect) MOZ_OVERRIDE;
virtual void FreeNativeData(void * data, uint32_t aDataType) MOZ_OVERRIDE {}
NS_IMETHOD BeginResizeDrag(mozilla::WidgetGUIEvent* aEvent,
int32_t aHorizontal,
int32_t aVertical);
NS_IMETHOD BeginMoveDrag(mozilla::WidgetMouseEvent* aEvent);
virtual nsresult ActivateNativeMenuItemAt(const nsAString& indexString) { return NS_ERROR_NOT_IMPLEMENTED; }
virtual nsresult ForceUpdateNativeMenuAt(const nsAString& indexString) { return NS_ERROR_NOT_IMPLEMENTED; }
int32_t aVertical) MOZ_OVERRIDE;
NS_IMETHOD BeginMoveDrag(mozilla::WidgetMouseEvent* aEvent) MOZ_OVERRIDE;
virtual nsresult ActivateNativeMenuItemAt(const nsAString& indexString) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
virtual nsresult ForceUpdateNativeMenuAt(const nsAString& indexString) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
@ -202,26 +202,25 @@ public:
const mozilla::WidgetKeyboardEvent& aEvent,
DoCommandCallback aCallback,
void* aCallbackData) MOZ_OVERRIDE { return false; }
NS_IMETHOD SetLayersAcceleration(bool aEnabled);
virtual bool GetLayersAcceleration() { return mUseLayersAcceleration; }
NS_IMETHOD SetLayersAcceleration(bool aEnabled) MOZ_OVERRIDE;
virtual bool ComputeShouldAccelerate(bool aDefault);
NS_IMETHOD GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
virtual nsIMEUpdatePreference GetIMEUpdatePreference() MOZ_OVERRIDE { return nsIMEUpdatePreference(); }
NS_IMETHOD OnDefaultButtonLoaded(const nsIntRect &aButtonRect) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD OnDefaultButtonLoaded(const nsIntRect &aButtonRect) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD OverrideSystemMouseScrollSpeed(double aOriginalDeltaX,
double aOriginalDeltaY,
double& aOverriddenDeltaX,
double& aOverriddenDeltaY);
double& aOverriddenDeltaY) MOZ_OVERRIDE;
virtual already_AddRefed<nsIWidget>
CreateChild(const nsIntRect &aRect,
nsDeviceContext *aContext,
nsWidgetInitData *aInitData = nullptr,
bool aForceUseIWidgetParent = false);
NS_IMETHOD AttachViewToTopLevel(bool aUseAttachedEvents, nsDeviceContext *aContext);
virtual nsIWidgetListener* GetAttachedWidgetListener();
virtual void SetAttachedWidgetListener(nsIWidgetListener* aListener);
NS_IMETHOD RegisterTouchWindow();
NS_IMETHOD UnregisterTouchWindow();
bool aForceUseIWidgetParent = false) MOZ_OVERRIDE;
NS_IMETHOD AttachViewToTopLevel(bool aUseAttachedEvents, nsDeviceContext *aContext) MOZ_OVERRIDE;
virtual nsIWidgetListener* GetAttachedWidgetListener() MOZ_OVERRIDE;
virtual void SetAttachedWidgetListener(nsIWidgetListener* aListener) MOZ_OVERRIDE;
NS_IMETHOD RegisterTouchWindow() MOZ_OVERRIDE;
NS_IMETHOD UnregisterTouchWindow() MOZ_OVERRIDE;
void NotifyWindowDestroyed();
void NotifySizeMoveDone();
@ -241,7 +240,7 @@ public:
nsPopupLevel PopupLevel() { return mPopupLevel; }
virtual nsIntSize ClientToWindowSize(const nsIntSize& aClientSize)
virtual nsIntSize ClientToWindowSize(const nsIntSize& aClientSize) MOZ_OVERRIDE
{
return aClientSize;
}
@ -254,12 +253,12 @@ public:
mBorderStyle & eBorderStyle_title);
}
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) = 0;
NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) MOZ_OVERRIDE = 0;
virtual uint32_t GetGLFrameBufferFormat() MOZ_OVERRIDE;
virtual const SizeConstraints& GetSizeConstraints() const;
virtual void SetSizeConstraints(const SizeConstraints& aConstraints);
virtual const SizeConstraints& GetSizeConstraints() const MOZ_OVERRIDE;
virtual void SetSizeConstraints(const SizeConstraints& aConstraints) MOZ_OVERRIDE;
/**
* Use this when GetLayerManager() returns a BasicLayerManager
@ -301,9 +300,9 @@ public:
protected:
virtual void ResolveIconName(const nsAString &aIconName,
const nsAString &aIconSuffix,
nsIFile **aResult);
void ResolveIconName(const nsAString &aIconName,
const nsAString &aIconSuffix,
nsIFile **aResult);
virtual void OnDestroy();
virtual void BaseCreate(nsIWidget *aParent,
const nsIntRect &aRect,
@ -322,7 +321,7 @@ protected:
const nsIntRegion RegionFromArray(const nsTArray<nsIntRect>& aRects);
void ArrayFromRegion(const nsIntRegion& aRegion, nsTArray<nsIntRect>& aRects);
virtual nsIContent* GetLastRollup()
virtual nsIContent* GetLastRollup() MOZ_OVERRIDE
{
return mLastRollup;
}
@ -331,15 +330,15 @@ protected:
int32_t aNativeKeyCode,
uint32_t aModifierFlags,
const nsAString& aCharacters,
const nsAString& aUnmodifiedCharacters)
const nsAString& aUnmodifiedCharacters) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
virtual nsresult SynthesizeNativeMouseEvent(nsIntPoint aPoint,
uint32_t aNativeMessage,
uint32_t aModifierFlags)
uint32_t aModifierFlags) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
virtual nsresult SynthesizeNativeMouseMove(nsIntPoint aPoint)
virtual nsresult SynthesizeNativeMouseMove(nsIntPoint aPoint) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
virtual nsresult SynthesizeNativeMouseScrollEvent(nsIntPoint aPoint,
@ -348,14 +347,14 @@ protected:
double aDeltaY,
double aDeltaZ,
uint32_t aModifierFlags,
uint32_t aAdditionalFlags)
uint32_t aAdditionalFlags) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
virtual nsresult SynthesizeNativeTouchPoint(uint32_t aPointerId,
TouchPointerState aPointerState,
nsIntPoint aPointerScreenPoint,
double aPointerPressure,
uint32_t aPointerOrientation)
uint32_t aPointerOrientation) MOZ_OVERRIDE
{ return NS_ERROR_UNEXPECTED; }
protected:

34
widget/nsFilePickerProxy.h
Просмотреть файл

@ -33,31 +33,31 @@ public:
NS_DECL_ISUPPORTS
// nsIFilePicker (less what's in nsBaseFilePicker)
NS_IMETHODIMP Init(nsIDOMWindow* aParent, const nsAString& aTitle, int16_t aMode);
NS_IMETHODIMP AppendFilter(const nsAString& aTitle, const nsAString& aFilter);
NS_IMETHODIMP GetDefaultString(nsAString& aDefaultString);
NS_IMETHODIMP SetDefaultString(const nsAString& aDefaultString);
NS_IMETHODIMP GetDefaultExtension(nsAString& aDefaultExtension);
NS_IMETHODIMP SetDefaultExtension(const nsAString& aDefaultExtension);
NS_IMETHODIMP GetFilterIndex(int32_t* aFilterIndex);
NS_IMETHODIMP SetFilterIndex(int32_t aFilterIndex);
NS_IMETHODIMP GetFile(nsIFile** aFile);
NS_IMETHODIMP GetFileURL(nsIURI** aFileURL);
NS_IMETHODIMP GetFiles(nsISimpleEnumerator** aFiles);
NS_IMETHODIMP Init(nsIDOMWindow* aParent, const nsAString& aTitle, int16_t aMode) MOZ_OVERRIDE;
NS_IMETHODIMP AppendFilter(const nsAString& aTitle, const nsAString& aFilter) MOZ_OVERRIDE;
NS_IMETHODIMP GetDefaultString(nsAString& aDefaultString) MOZ_OVERRIDE;
NS_IMETHODIMP SetDefaultString(const nsAString& aDefaultString) MOZ_OVERRIDE;
NS_IMETHODIMP GetDefaultExtension(nsAString& aDefaultExtension) MOZ_OVERRIDE;
NS_IMETHODIMP SetDefaultExtension(const nsAString& aDefaultExtension) MOZ_OVERRIDE;
NS_IMETHODIMP GetFilterIndex(int32_t* aFilterIndex) MOZ_OVERRIDE;
NS_IMETHODIMP SetFilterIndex(int32_t aFilterIndex) MOZ_OVERRIDE;
NS_IMETHODIMP GetFile(nsIFile** aFile) MOZ_OVERRIDE;
NS_IMETHODIMP GetFileURL(nsIURI** aFileURL) MOZ_OVERRIDE;
NS_IMETHODIMP GetFiles(nsISimpleEnumerator** aFiles) MOZ_OVERRIDE;
NS_IMETHODIMP GetDomfile(nsIDOMFile** aFile);
NS_IMETHODIMP GetDomfiles(nsISimpleEnumerator** aFiles);
NS_IMETHODIMP GetDomfile(nsIDOMFile** aFile) MOZ_OVERRIDE;
NS_IMETHODIMP GetDomfiles(nsISimpleEnumerator** aFiles) MOZ_OVERRIDE;
NS_IMETHODIMP Show(int16_t* aReturn);
NS_IMETHODIMP Open(nsIFilePickerShownCallback* aCallback);
NS_IMETHODIMP Show(int16_t* aReturn) MOZ_OVERRIDE;
NS_IMETHODIMP Open(nsIFilePickerShownCallback* aCallback) MOZ_OVERRIDE;
// PFilePickerChild
virtual bool
Recv__delete__(const MaybeInputFiles& aFiles, const int16_t& aResult);
Recv__delete__(const MaybeInputFiles& aFiles, const int16_t& aResult) MOZ_OVERRIDE;
private:
~nsFilePickerProxy();
void InitNative(nsIWidget*, const nsAString&);
void InitNative(nsIWidget*, const nsAString&) MOZ_OVERRIDE;
// This is an innerWindow.
nsCOMPtr<nsPIDOMWindow> mParent;

2
widget/tests/TestAppShellSteadyState.cpp
Просмотреть файл

@ -176,7 +176,7 @@ public:
{ }
NS_IMETHOD
HandleEvent(nsIDOMEvent* aEvent)
HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE
{
nsString type;
if (NS_FAILED(aEvent->GetType(type))) {