Bug 1259671 part.4 Rename InternalScrollPortEvent::both to InternalScrollPortEvent::eBoth r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 30 Mar 2016 17:39:56 +0900
changeset 291135 dd54d4836c8ed419963db51a30b006ab7335f4e1
parent 291134 2f906943b5721eaec8091140ec87c6dc88ee66ef
child 291136 dfa1afae978e276a21c9e3dbc2009bd3387ed3b9
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.4 Rename InternalScrollPortEvent::both to InternalScrollPortEvent::eBoth r=smaug MozReview-Commit-ID: HL5phKZVYin
layout/generic/nsGfxScrollFrame.cpp
widget/ContentEvents.h
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -4116,17 +4116,17 @@ ScrollFrameHelper::FireScrollPortEvent()
   }
 
   // If both either overflowed or underflowed then we dispatch only one
   // DOM event.
   bool both = vertChanged && horizChanged &&
                 newVerticalOverflow == newHorizontalOverflow;
   InternalScrollPortEvent::OrientType orient;
   if (both) {
-    orient = InternalScrollPortEvent::both;
+    orient = InternalScrollPortEvent::eBoth;
     mHorizontalOverflow = newHorizontalOverflow;
     mVerticalOverflow = newVerticalOverflow;
   }
   else if (vertChanged) {
     orient = InternalScrollPortEvent::eVertical;
     mVerticalOverflow = newVerticalOverflow;
     if (horizChanged) {
       // We need to dispatch a separate horizontal DOM event. Do that the next
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -30,17 +30,17 @@ public:
   {
     return this;
   }
 
   enum OrientType
   {
     eVertical,
     eHorizontal,
-    both       = 2
+    eBoth
   };
 
   InternalScrollPortEvent(bool aIsTrusted, EventMessage aMessage,
                           nsIWidget* aWidget)
     : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eScrollPortEventClass)
     , orient(eVertical)
   {
   }