Bug 1259671 part.3 Rename InternalScrollPortEvent::horizontal to InternalScrollPortEvent::eHorizontal r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 30 Mar 2016 17:33:16 +0900
changeset 291134 2f906943b5721eaec8091140ec87c6dc88ee66ef
parent 291133 e7bc2f2b3f4bf109db4de11d4533ed9433f2b66c
child 291135 dd54d4836c8ed419963db51a30b006ab7335f4e1
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)
reviewerssmaug
bugs1259671
milestone48.0a1
Bug 1259671 part.3 Rename InternalScrollPortEvent::horizontal to InternalScrollPortEvent::eHorizontal r=smaug MozReview-Commit-ID: JkT44G2FpUH
layout/generic/nsGfxScrollFrame.cpp
layout/xul/tree/nsTreeBodyFrame.cpp
widget/ContentEvents.h
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -4131,23 +4131,23 @@ ScrollFrameHelper::FireScrollPortEvent()
     if (horizChanged) {
       // We need to dispatch a separate horizontal DOM event. Do that the next
       // time around since dispatching the vertical DOM event might destroy
       // the frame.
       PostOverflowEvent();
     }
   }
   else {
-    orient = InternalScrollPortEvent::horizontal;
+    orient = InternalScrollPortEvent::eHorizontal;
     mHorizontalOverflow = newHorizontalOverflow;
   }
 
   InternalScrollPortEvent event(true,
-    (orient == InternalScrollPortEvent::horizontal ? mHorizontalOverflow :
-                                                     mVerticalOverflow) ?
+    (orient == InternalScrollPortEvent::eHorizontal ? mHorizontalOverflow :
+                                                      mVerticalOverflow) ?
     eScrollPortOverflow : eScrollPortUnderflow, nullptr);
   event.orient = orient;
   return EventDispatcher::Dispatch(mOuter->GetContent(),
                                    mOuter->PresContext(), &event);
 }
 
 void
 ScrollFrameHelper::ReloadChildFrames()
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -922,17 +922,17 @@ nsTreeBodyFrame::CheckOverflow(const Scr
     event.orient = InternalScrollPortEvent::eVertical;
     EventDispatcher::Dispatch(content, presContext, &event);
   }
 
   if (horizontalOverflowChanged) {
     InternalScrollPortEvent event(true,
       mHorizontalOverflow ? eScrollPortOverflow : eScrollPortUnderflow,
       nullptr);
-    event.orient = InternalScrollPortEvent::horizontal;
+    event.orient = InternalScrollPortEvent::eHorizontal;
     EventDispatcher::Dispatch(content, presContext, &event);
   }
 
   // The synchronous event dispatch above can trigger reflow notifications.
   // Flush those explicitly now, so that we can guard against potential infinite
   // recursion. See bug 905909.
   if (!weakFrame.IsAlive()) {
     return;
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -29,17 +29,17 @@ public:
   virtual InternalScrollPortEvent* AsScrollPortEvent() override
   {
     return this;
   }
 
   enum OrientType
   {
     eVertical,
-    horizontal = 1,
+    eHorizontal,
     both       = 2
   };
 
   InternalScrollPortEvent(bool aIsTrusted, EventMessage aMessage,
                           nsIWidget* aWidget)
     : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eScrollPortEventClass)
     , orient(eVertical)
   {