Bug 895274 part.19 Rename NS_PLUGIN_FOCUS to ePluginFocus r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Sat, 29 Aug 2015 08:58:28 +0900
changeset 259932 4a2099a81968ec3a5f5a60a682170ceb28ae8dd4
parent 259931 da3eb3291c32042466fcc13813d85b6b758413d7
child 259933 b409cf40a9f3b785427eaf3b387cc0b240f9c619
push id29296
push userryanvm@gmail.com
push dateSun, 30 Aug 2015 19:45:10 +0000
treeherdermozilla-central@2ad5077d86ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895274 part.19 Rename NS_PLUGIN_FOCUS to ePluginFocus r=smaug
layout/generic/nsPluginFrame.cpp
widget/EventMessageList.h
widget/WidgetEventImpl.cpp
--- a/layout/generic/nsPluginFrame.cpp
+++ b/layout/generic/nsPluginFrame.cpp
@@ -1762,17 +1762,17 @@ nsPluginFrame::HandleEvent(nsPresContext
   mInstanceOwner->ConsiderNewEventloopNestingLevel();
 
   if (anEvent->mMessage == ePluginActivate) {
     nsIFocusManager* fm = nsFocusManager::GetFocusManager();
     nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(GetContent());
     if (fm && elem)
       return fm->SetFocus(elem, 0);
   }
-  else if (anEvent->mMessage == NS_PLUGIN_FOCUS) {
+  else if (anEvent->mMessage == ePluginFocus) {
     nsIFocusManager* fm = nsFocusManager::GetFocusManager();
     if (fm)
       return fm->FocusPlugin(GetContent());
   }
 
   if (mInstanceOwner->SendNativeEvents() &&
       anEvent->IsNativeEventDelivererForPlugin()) {
     *anEventStatus = mInstanceOwner->ProcessEvent(*anEvent);
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -27,21 +27,21 @@ NS_EVENT_MESSAGE(eBeforeKeyDown,        
 NS_EVENT_MESSAGE(eAfterKeyDown,         eWindowEventFirst + 35)
 NS_EVENT_MESSAGE(eBeforeKeyUp,          eWindowEventFirst + 36)
 NS_EVENT_MESSAGE(eAfterKeyUp,           eWindowEventFirst + 37)
 
 NS_EVENT_MESSAGE(eResize,               eWindowEventFirst + 60)
 NS_EVENT_MESSAGE(eScroll,               eWindowEventFirst + 61)
 
 // A plugin was clicked or otherwise focused. ePluginActivate should be
-// used when the window is not active. NS_PLUGIN_FOCUS should be used when
+// used when the window is not active. ePluginFocus should be used when
 // the window is active. In the latter case, the dispatcher of the event
 // is expected to ensure that the plugin's widget is focused beforehand.
 NS_EVENT_MESSAGE(ePluginActivate,       eWindowEventFirst + 62)
-NS_EVENT_MESSAGE(NS_PLUGIN_FOCUS,       eWindowEventFirst + 63)
+NS_EVENT_MESSAGE(ePluginFocus,          eWindowEventFirst + 63)
 
 NS_EVENT_MESSAGE(NS_OFFLINE,            eWindowEventFirst + 64)
 NS_EVENT_MESSAGE(NS_ONLINE,             eWindowEventFirst + 65)
 
 // NS_BEFORERESIZE_EVENT used to be here (eWindowEventFirst + 66)
 
 // Indicates that the user is either idle or active
 NS_EVENT_MESSAGE(NS_MOZ_USER_IDLE,      eWindowEventFirst + 67)
--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -147,17 +147,17 @@ WidgetEvent::HasIMEEventMessage() const
       return false;
   }
 }
 
 bool
 WidgetEvent::HasPluginActivationEventMessage() const
 {
   return mMessage == ePluginActivate ||
-         mMessage == NS_PLUGIN_FOCUS;
+         mMessage == ePluginFocus;
 }
 
 /******************************************************************************
  * mozilla::WidgetEvent
  *
  * Specific event checking methods.
  ******************************************************************************/