Bug 1259671 part.2 Rename InternalScrollPortEvent::vertical to InternalScrollPortEvent::eVertical r?smaug draft
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 30 Mar 2016 17:24:57 +0900
changeset 346175 589960063b62c39d7c5afe39434e95476bc3e00b
parent 346174 b474f5ad958cbb6a14040cb4d889a848d9bcd5d6
child 346176 d200e9972499079e630cac6de5e52a744dadfc23
push id14266
push usermasayuki@d-toybox.com
push dateThu, 31 Mar 2016 06:03:50 +0000
reviewerssmaug
bugs1259671
milestone48.0a1
Bug 1259671 part.2 Rename InternalScrollPortEvent::vertical to InternalScrollPortEvent::eVertical r?smaug MozReview-Commit-ID: 6OxTYqgZVUD
layout/generic/nsGfxScrollFrame.cpp
layout/xul/tree/nsTreeBodyFrame.cpp
widget/ContentEvents.h
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -4121,17 +4121,17 @@ ScrollFrameHelper::FireScrollPortEvent()
                 newVerticalOverflow == newHorizontalOverflow;
   InternalScrollPortEvent::OrientType orient;
   if (both) {
     orient = InternalScrollPortEvent::both;
     mHorizontalOverflow = newHorizontalOverflow;
     mVerticalOverflow = newVerticalOverflow;
   }
   else if (vertChanged) {
-    orient = InternalScrollPortEvent::vertical;
+    orient = InternalScrollPortEvent::eVertical;
     mVerticalOverflow = newVerticalOverflow;
     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();
     }
   }
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -914,17 +914,17 @@ nsTreeBodyFrame::CheckOverflow(const Scr
   RefPtr<nsPresContext> presContext = PresContext();
   nsCOMPtr<nsIPresShell> presShell = presContext->GetPresShell();
   nsCOMPtr<nsIContent> content = mContent;
 
   if (verticalOverflowChanged) {
     InternalScrollPortEvent event(true,
       mVerticalOverflow ? eScrollPortOverflow : eScrollPortUnderflow,
       nullptr);
-    event.orient = InternalScrollPortEvent::vertical;
+    event.orient = InternalScrollPortEvent::eVertical;
     EventDispatcher::Dispatch(content, presContext, &event);
   }
 
   if (horizontalOverflowChanged) {
     InternalScrollPortEvent event(true,
       mHorizontalOverflow ? eScrollPortOverflow : eScrollPortUnderflow,
       nullptr);
     event.orient = InternalScrollPortEvent::horizontal;
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -28,25 +28,25 @@ class InternalScrollPortEvent : public W
 public:
   virtual InternalScrollPortEvent* AsScrollPortEvent() override
   {
     return this;
   }
 
   enum OrientType
   {
-    vertical   = 0,
+    eVertical,
     horizontal = 1,
     both       = 2
   };
 
   InternalScrollPortEvent(bool aIsTrusted, EventMessage aMessage,
                           nsIWidget* aWidget)
     : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eScrollPortEventClass)
-    , orient(vertical)
+    , orient(eVertical)
   {
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     MOZ_ASSERT(mClass == eScrollPortEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.