[Windows] Build fix after r154554.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Aug 2013 15:53:22 +0000 (15:53 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Aug 2013 15:53:22 +0000 (15:53 +0000)
* page/AutoscrollController.cpp: Correct various places where pointers are now
references.
(WebCore::AutoscrollController::stopAutoscrollTimer):
(WebCore::AutoscrollController::startPanScrolling):
(WebCore::AutoscrollController::autoscrollTimerFired):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/AutoscrollController.cpp

index 1be3bae..8648336 100644 (file)
@@ -1,3 +1,13 @@
+2013-08-26  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] Build fix after r154554.
+
+        * page/AutoscrollController.cpp: Correct various places where pointers are now
+        references.
+        (WebCore::AutoscrollController::stopAutoscrollTimer):
+        (WebCore::AutoscrollController::startPanScrolling):
+        (WebCore::AutoscrollController::autoscrollTimerFired):
+
 2013-08-26  Andreas Kling  <akling@apple.com>
 
         Move DocumentTiming inside ENABLE(WEB_TIMING) guards.
index 0a38e40..4e49854 100644 (file)
@@ -117,8 +117,8 @@ void AutoscrollController::stopAutoscrollTimer(bool rendererIsBeingDestroyed)
 
 #if ENABLE(PAN_SCROLLING)
     // If we're not in the top frame we notify it that we are not doing a panScroll any more.
-    if (Frame* mainFrame = getMainFrame(frame)) {
-        if (frame != mainFrame)
+    if (Frame* mainFrame = getMainFrame(&frame)) {
+        if (&frame != mainFrame)
             mainFrame->eventHandler().didPanScrollStop();
     }
 #endif
@@ -222,9 +222,9 @@ void AutoscrollController::startPanScrolling(RenderBox* scrollable, const IntPoi
     m_autoscrollRenderer = scrollable;
     m_panScrollStartPos = lastKnownMousePosition;
 
-    if (FrameView* view = scrollable->frame()->view())
+    if (FrameView* view = scrollable->frame().view())
         view->addPanScrollIcon(lastKnownMousePosition);
-    scrollable->frame()->eventHandler().didPanScrollStart();
+    scrollable->frame().eventHandler().didPanScrollStart();
     startAutoscrollTimer();
 }
 #else
@@ -264,14 +264,14 @@ void AutoscrollController::autoscrollTimerFired(Timer<AutoscrollController>*)
     case AutoscrollForPanCanStop:
     case AutoscrollForPan:
         // we verify that the main frame hasn't received the order to stop the panScroll
-        if (Frame* mainFrame = getMainFrame(frame)) {
+        if (Frame* mainFrame = getMainFrame(&frame)) {
             if (!mainFrame->eventHandler().panScrollInProgress()) {
                 stopAutoscrollTimer();
                 return;
             }
         }
-        if (FrameView* view = frame->view())
-            updatePanScrollState(view, frame->eventHandler().lastKnownMousePosition());
+        if (FrameView* view = frame.view())
+            updatePanScrollState(view, frame.eventHandler().lastKnownMousePosition());
         m_autoscrollRenderer->panScroll(m_panScrollStartPos);
         break;
 #endif