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

Bug 1299335 (part 5) - Streamline nsIWidget::StartPluginIME. r=mstange.

Browse Source 
This patch changes it from |NS_IMETHOD| to |virtual MOZ_MUST_USE nsresult|.
This commit is contained in:
Nicholas Nethercote
2016-12-16 10:55:18 +11:00
parent effeac0413
commit 09f07e09c7
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/TabParent.cpp
View File

@@ -2148,7 +2148,7 @@ TabParent::RecvStartPluginIME(const WidgetKeyboardEvent& aKeyboardEvent,
if (!widget) { if (!widget) {
return IPC_OK(); return IPC_OK();
} }
widget->StartPluginIME(aKeyboardEvent, Unused << widget->StartPluginIME(aKeyboardEvent,
(int32_t&)aPanelX, (int32_t&)aPanelX,
(int32_t&)aPanelY, (int32_t&)aPanelY,
*aCommitted); *aCommitted);

2
widget/PuppetWidget.cpp
View File

@@ -681,7 +681,7 @@ PuppetWidget::NotifyIMEInternal(const IMENotification& aIMENotification)
} }
} }
NS_IMETHODIMP nsresult
PuppetWidget::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, PuppetWidget::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) nsString& aCommitted)

3
widget/PuppetWidget.h
View File

@@ -221,7 +221,8 @@ public:
virtual LayoutDeviceIntRect GetScreenBounds() override; virtual LayoutDeviceIntRect GetScreenBounds() override;
NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, virtual MOZ_MUST_USE nsresult
StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override; nsString& aCommitted) override;

3
widget/cocoa/nsChildView.h
View File

@@ -508,7 +508,8 @@ public:
IAPZCTreeManager* APZCTM() { return mAPZC ; } IAPZCTreeManager* APZCTM() { return mAPZC ; }
NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, virtual MOZ_MUST_USE nsresult
StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override; nsString& aCommitted) override;

2
widget/cocoa/nsChildView.mm
View File

@@ -1679,7 +1679,7 @@ bool nsChildView::HasPendingInputEvent()
#pragma mark - #pragma mark -
NS_IMETHODIMP nsresult
nsChildView::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, nsChildView::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) nsString& aCommitted)

3
widget/nsBaseWidget.h
View File

@@ -264,7 +264,8 @@ public:
virtual nsresult ActivateNativeMenuItemAt(const nsAString& indexString) override { return NS_ERROR_NOT_IMPLEMENTED; } virtual nsresult ActivateNativeMenuItemAt(const nsAString& indexString) override { return NS_ERROR_NOT_IMPLEMENTED; }
virtual nsresult ForceUpdateNativeMenuAt(const nsAString& indexString) override { return NS_ERROR_NOT_IMPLEMENTED; } virtual nsresult ForceUpdateNativeMenuAt(const nsAString& indexString) override { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) override final; NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) override final;
NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, virtual MOZ_MUST_USE nsresult
StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override nsString& aCommitted) override
{ return NS_ERROR_NOT_IMPLEMENTED; } { return NS_ERROR_NOT_IMPLEMENTED; }

3
widget/nsIWidget.h
View File

@@ -1754,7 +1754,8 @@ public:
* (should be just under the plugin) * (should be just under the plugin)
* aCommitted The string committed during IME -- otherwise empty * aCommitted The string committed during IME -- otherwise empty
*/ */
NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent, virtual MOZ_MUST_USE nsresult
StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
int32_t aPanelX, int32_t aPanelY, int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) = 0; nsString& aCommitted) = 0;