Changeset 85826 in webkit

Timestamp:

May 4, 2011 8:07:02 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-05-04 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Make more member functions in EventHandler private
​https://bugs.webkit.org/show_bug.cgi?id=60200

Reduced the number of public member functions in EventHandler.

• WebCore.exp.in:
• page/EventHandler.cpp: (WebCore::EventHandler::handleAutoscroll): (WebCore::EventHandler::autoscrollTimerFired): (WebCore::EventHandler::stopAutoscrollTimer): (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::keyEvent): (WebCore::EventHandler::eventInvertsTabsToLinksClientCallResult):
• page/EventHandler.h: (WebCore::EventHandler::mouseDownMayStartSelect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (2 diffs)
• page/EventHandler.cpp (modified) (7 diffs)
• page/EventHandler.h (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Make more member functions in EventHandler private
+        https://bugs.webkit.org/show_bug.cgi?id=60200
+
+        Reduced the number of public member functions in EventHandler.
+
+        * WebCore.exp.in:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleAutoscroll):
+        (WebCore::EventHandler::autoscrollTimerFired):
+        (WebCore::EventHandler::stopAutoscrollTimer):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::keyEvent):
+        (WebCore::EventHandler::eventInvertsTabsToLinksClientCallResult):
+        * page/EventHandler.h:
+        (WebCore::EventHandler::mouseDownMayStartSelect):
+
 2011-05-04  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -233 +233 @@
 __ZN7WebCore12EventHandler14scrollOverflowENS_15ScrollDirectionENS_17ScrollGranularityEPNS_4NodeE
 __ZN7WebCore12EventHandler15handleAccessKeyERKNS_21PlatformKeyboardEventE
-__ZN7WebCore12EventHandler15sendScrollEventEv
 __ZN7WebCore12EventHandler16handleWheelEventERNS_18PlatformWheelEventE
 __ZN7WebCore12EventHandler17scrollRecursivelyENS_15ScrollDirectionENS_17ScrollGranularityEPNS_4NodeE
@@ -240 +239 @@
 __ZN7WebCore12EventHandler23handleMouseReleaseEventERKNS_18PlatformMouseEventE
 __ZN7WebCore12EventHandler24logicalScrollRecursivelyENS_22ScrollLogicalDirectionENS_17ScrollGranularityEPNS_4NodeE
-__ZN7WebCore12EventHandler27capsLockStateMayHaveChangedEv
 __ZN7WebCore12EventHandler7mouseUpEP7NSEvent
 __ZN7WebCore12EventHandler8keyEventEP7NSEvent

trunk/Source/WebCore/page/EventHandler.cpp

@@ -775 +775 @@
             Frame* mainFrame = page->mainFrame();
             if (m_frame != mainFrame)
-                mainFrame->eventHandler()->setPanScrollInProgress(true);
+                mainFrame->eventHandler()->m_panScrollInProgress = true;
         }
     }
@@ -800 +800 @@
         // we verify that the main frame hasn't received the order to stop the panScroll
         if (Page* page = m_frame->page()) {
-            if (!page->mainFrame()->eventHandler()->panScrollInProgress()) {
+            if (!page->mainFrame()->eventHandler()->m_panScrollInProgress) {
                 stopAutoscrollTimer();
                 return;
@@ -1005 +1005 @@
         Frame* mainFrame = page->mainFrame();
         if (m_frame != mainFrame)
-            mainFrame->eventHandler()->setPanScrollInProgress(false);
+            mainFrame->eventHandler()->m_panScrollInProgress = false;
     }
 
@@ -1394 +1394 @@
     // We store whether pan scrolling is in progress before calling stopAutoscrollTimer()
     // because it will set m_panScrollInProgress to false on return.
-    bool isPanScrollInProgress = m_frame->page() && m_frame->page()->mainFrame()->eventHandler()->panScrollInProgress();
+    bool isPanScrollInProgress = m_frame->page() && m_frame->page()->mainFrame()->eventHandler()->m_panScrollInProgress;
     if (isPanScrollInProgress || m_autoscrollInProgress)
         stopAutoscrollTimer();
@@ -1627 +1627 @@
             scrollbar->mouseMoved(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
         if (Page* page = m_frame->page()) {
-            if ((!m_resizeLayer || !m_resizeLayer->inResizeMode()) && !page->mainFrame()->eventHandler()->panScrollInProgress()) {
+            if ((!m_resizeLayer || !m_resizeLayer->inResizeMode()) && !page->mainFrame()->eventHandler()->m_panScrollInProgress) {
                 // Plugins set cursor on their own. The only case WebKit intervenes is resetting cursor to arrow on mouse enter,
                 // in case the particular plugin doesn't manipulate cursor at all. Thus,  even a CSS cursor set on body has no
@@ -2429 +2429 @@
 #if ENABLE(PAN_SCROLLING)
     if (Page* page = m_frame->page()) {
-        if (page->mainFrame()->eventHandler()->panScrollInProgress() || m_autoscrollInProgress) {
+        if (page->mainFrame()->eventHandler()->m_panScrollInProgress || m_autoscrollInProgress) {
             // If a key is pressed while the autoscroll/panScroll is in progress then we want to stop
             if (initialKeyEvent.type() == PlatformKeyboardEvent::KeyDown || initialKeyEvent.type() == PlatformKeyboardEvent::RawKeyDown) 
@@ -2842 +2842 @@
 }
 
-static bool eventInvertsTabsToLinksClientCallResult(KeyboardEvent* event)
+bool EventHandler::eventInvertsTabsToLinksClientCallResult(KeyboardEvent* event)
 {
 #if PLATFORM(MAC) || PLATFORM(QT) || PLATFORM(HAIKU) || PLATFORM(EFL)

trunk/Source/WebCore/page/EventHandler.h

@@ -107 +107 @@
 
     void startPanScrolling(RenderObject*);
-    bool panScrollInProgress() { return m_panScrollInProgress; }
-    void setPanScrollInProgress(bool inProgress) { m_panScrollInProgress = inProgress; }
 
     void stopAutoscrollTimer(bool rendererIsBeingDestroyed = false);
@@ -141 +139 @@
     IntPoint currentMousePosition() const;
 
-    void setIgnoreWheelEvents(bool);
-
     static Frame* subframeForTargetNode(Node*);
     static Frame* subframeForHitTestResult(const MouseEventWithHitTestResults&);
 
     bool scrollOverflow(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
-    bool logicalScrollOverflow(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0);
-
     bool scrollRecursively(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
     bool logicalScrollRecursively(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0);
@@ -156 +150 @@
 #endif
 
-    bool shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const;
-
     bool tabsToLinks(KeyboardEvent*) const;
     bool tabsToAllFormControls(KeyboardEvent*) const;
-
-    bool mouseDownMayStartSelect() const { return m_mouseDownMayStartSelect; }
 
     bool mouseMoved(const PlatformMouseEvent&);
@@ -202 +192 @@
     void focusDocumentView();
 
-    void capsLockStateMayHaveChanged();
-    
-    void sendResizeEvent();
-    void sendScrollEvent();
-    
+    void capsLockStateMayHaveChanged(); // Only called by SelectionController
+    
+    void sendResizeEvent(); // Only called in FrameView
+    void sendScrollEvent(); // Ditto
+
 #if PLATFORM(MAC) && defined(__OBJC__)
     void mouseDown(NSEvent *);
@@ -225 +215 @@
     bool handleTouchEvent(const PlatformTouchEvent&);
 #endif
-
-    static bool isKeyboardOptionTab(KeyboardEvent*);
 
 private:
@@ -293 +281 @@
     void setAutoscrollRenderer(RenderObject*);
     void autoscrollTimerFired(Timer<EventHandler>*);
+    bool logicalScrollOverflow(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0);
+    
+    bool shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const;
+    bool mouseDownMayStartSelect() const { return m_mouseDownMayStartSelect; }
+
+    static bool isKeyboardOptionTab(KeyboardEvent*);
+    static bool eventInvertsTabsToLinksClientCallResult(KeyboardEvent*);
 
     void fakeMouseMoveEventTimerFired(Timer<EventHandler>*);