Bug 1259674 Part 2 rename InternalFocusEvent::isRefocus to InternalFocusEvent::mIsRefocus r=masayuki
authorTakeshi Kurosawa <taken.spc@gmail.com>
Sun, 27 Mar 2016 14:46:07 +0900
changeset 290694 945ae999da2d4ba8c1b99ed1a507fe80dab62196
parent 290693 9ea30db3cc3ad403f9463daa33c12db524760088
child 290695 abdfb47efd9a5252fce5566fc4dc152e501ee49a
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1259674
milestone48.0a1
Bug 1259674 Part 2 rename InternalFocusEvent::isRefocus to InternalFocusEvent::mIsRefocus r=masayuki MozReview-Commit-ID: 5SjH8PERQVW
dom/base/Element.cpp
dom/base/nsFocusManager.cpp
widget/ContentEvents.h
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -2918,17 +2918,17 @@ Element::PreHandleEventForLinks(EventCha
   // updated even if the event is consumed before we have a chance to set it.
   switch (aVisitor.mEvent->mMessage) {
   // Set the status bar similarly for mouseover and focus
   case eMouseOver:
     aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
     MOZ_FALLTHROUGH;
   case eFocus: {
     InternalFocusEvent* focusEvent = aVisitor.mEvent->AsFocusEvent();
-    if (!focusEvent || !focusEvent->isRefocus) {
+    if (!focusEvent || !focusEvent->mIsRefocus) {
       nsAutoString target;
       GetLinkTarget(target);
       nsContentUtils::TriggerLink(this, aVisitor.mPresContext, absURI, target,
                                   false, true, true);
       // Make sure any ancestor links don't also TriggerLink
       aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
     }
     break;
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1961,17 +1961,17 @@ public:
   }
 
   NS_IMETHOD Run()
   {
     InternalFocusEvent event(true, mEventMessage);
     event.mFlags.mBubbles = false;
     event.mFlags.mCancelable = false;
     event.mFromRaise = mWindowRaised;
-    event.isRefocus = mIsRefocus;
+    event.mIsRefocus = mIsRefocus;
     return EventDispatcher::Dispatch(mTarget, mContext, &event);
   }
 
   nsCOMPtr<nsISupports>   mTarget;
   RefPtr<nsPresContext> mContext;
   EventMessage            mEventMessage;
   bool                    mWindowRaised;
   bool                    mIsRefocus;
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -193,17 +193,17 @@ public:
 class InternalFocusEvent : public InternalUIEvent
 {
 public:
   virtual InternalFocusEvent* AsFocusEvent() override { return this; }
 
   InternalFocusEvent(bool aIsTrusted, EventMessage aMessage)
     : InternalUIEvent(aIsTrusted, aMessage, eFocusEventClass)
     , mFromRaise(false)
-    , isRefocus(false)
+    , mIsRefocus(false)
   {
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     MOZ_ASSERT(mClass == eFocusEventClass,
                "Duplicate() must be overridden by sub class");
     InternalFocusEvent* result = new InternalFocusEvent(false, mMessage);
@@ -211,25 +211,25 @@ public:
     result->mFlags = mFlags;
     return result;
   }
 
   /// The possible related target
   nsCOMPtr<dom::EventTarget> relatedTarget;
 
   bool mFromRaise;
-  bool isRefocus;
+  bool mIsRefocus;
 
   void AssignFocusEventData(const InternalFocusEvent& aEvent, bool aCopyTargets)
   {
     AssignUIEventData(aEvent, aCopyTargets);
 
     relatedTarget = aCopyTargets ? aEvent.relatedTarget : nullptr;
     mFromRaise = aEvent.mFromRaise;
-    isRefocus = aEvent.isRefocus;
+    mIsRefocus = aEvent.mIsRefocus;
   }
 };
 
 /******************************************************************************
  * mozilla::InternalTransitionEvent
  ******************************************************************************/
 
 class InternalTransitionEvent : public WidgetEvent