Title: [154604] trunk/Source/WebCore
- Revision
- 154604
- Author
- [email protected]
- Date
- 2013-08-26 08:53:22 -0700 (Mon, 26 Aug 2013)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154603 => 154604)
--- trunk/Source/WebCore/ChangeLog 2013-08-26 15:09:22 UTC (rev 154603)
+++ trunk/Source/WebCore/ChangeLog 2013-08-26 15:53:22 UTC (rev 154604)
@@ -1,3 +1,13 @@
+2013-08-26 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
Move DocumentTiming inside ENABLE(WEB_TIMING) guards.
Modified: trunk/Source/WebCore/page/AutoscrollController.cpp (154603 => 154604)
--- trunk/Source/WebCore/page/AutoscrollController.cpp 2013-08-26 15:09:22 UTC (rev 154603)
+++ trunk/Source/WebCore/page/AutoscrollController.cpp 2013-08-26 15:53:22 UTC (rev 154604)
@@ -117,8 +117,8 @@
#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 @@
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 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
