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

Bug 1296993 (part 6) - Streamline nsIWidget::SetPluginFocused. r=mstange.

Browse Source 
This patch removes the return value, because none of the call sites check it.
This commit is contained in:
Nicholas Nethercote
2016-08-25 13:43:27 +10:00
parent 0b90da4f50
commit d28f792e7a
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
widget/PuppetWidget.cpp
View File

@@ -667,13 +667,12 @@ PuppetWidget::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
return NS_OK;
}
NS_IMETHODIMP
void
PuppetWidget::SetPluginFocused(bool& aFocused)
{
if (!mTabChild || !mTabChild->SendSetPluginFocused(aFocused)) {
return NS_ERROR_FAILURE;
if (mTabChild) {
mTabChild->SendSetPluginFocused(aFocused);
}
return NS_OK;
}
void

2
widget/PuppetWidget.h
View File

@@ -220,7 +220,7 @@ public:
int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override;
NS_IMETHOD SetPluginFocused(bool& aFocused) override;
virtual void SetPluginFocused(bool& aFocused) override;
virtual void DefaultProcOfPluginEvent(
const mozilla::WidgetPluginEvent& aEvent) override;

2
widget/cocoa/nsChildView.h
View File

@@ -511,7 +511,7 @@ public:
int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override;
NS_IMETHOD SetPluginFocused(bool& aFocused) override;
virtual void SetPluginFocused(bool& aFocused) override;
bool IsPluginFocused() { return mPluginFocused; }

5
widget/cocoa/nsChildView.mm
View File

@@ -1712,11 +1712,11 @@ nsChildView::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
return NS_OK;
}
NS_IMETHODIMP
void
nsChildView::SetPluginFocused(bool& aFocused)
{
if (aFocused == mPluginFocused) {
return NS_OK;
return;
}
if (!aFocused) {
ComplexTextInputPanel* ctiPanel =
@@ -1726,7 +1726,6 @@ nsChildView::SetPluginFocused(bool& aFocused)
}
}
mPluginFocused = aFocused;
return NS_OK;
}
NS_IMETHODIMP_(void)

3
widget/nsBaseWidget.h
View File

@@ -248,8 +248,7 @@ public:
int32_t aPanelX, int32_t aPanelY,
nsString& aCommitted) override
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD SetPluginFocused(bool& aFocused) override
{ return NS_ERROR_NOT_IMPLEMENTED; }
virtual void SetPluginFocused(bool& aFocused) override {}
virtual void SetCandidateWindowForPlugin(
const mozilla::widget::CandidateWindowPosition&
aPosition) override

2
widget/nsIWidget.h
View File

@@ -1756,7 +1756,7 @@ public:
*
* aFocused Whether or not a plugin is focused
*/
NS_IMETHOD SetPluginFocused(bool& aFocused) = 0;
virtual void SetPluginFocused(bool& aFocused) = 0;
/*
* Tell the plugin has focus. It is unnecessary to use IPC