https://bugs.webkit.org/show_bug.cgi?id=82083
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 21:02:51 +0000 (21:02 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 21:02:51 +0000 (21:02 +0000)
Rubber-stamped by Simon Fraser.

This patch is just a name change. getExistingScrollAnimator() (which was
added earlier today) is now existingScrollAnimator().
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::transitionToCommitted):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleGestureTapDown):
* page/FrameView.cpp:
(WebCore::FrameView::setAnimatorsAreActive):
* platform/ScrollView.cpp:
(WebCore::ScrollView::updateScrollbars):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::willStartLiveResize):
(WebCore::ScrollableArea::willEndLiveResize):
(WebCore::ScrollableArea::contentAreaWillPaint):
(WebCore::ScrollableArea::mouseEnteredContentArea):
(WebCore::ScrollableArea::mouseExitedContentArea):
(WebCore::ScrollableArea::mouseMovedInContentArea):
(WebCore::ScrollableArea::contentAreaDidShow):
(WebCore::ScrollableArea::contentAreaDidHide):
(WebCore::ScrollableArea::contentsResized):
(WebCore::ScrollableArea::serviceScrollAnimations):
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::existingScrollAnimator):

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

Source/WebCore/ChangeLog
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/page/EventHandler.cpp
Source/WebCore/page/FrameView.cpp
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollableArea.cpp
Source/WebCore/platform/ScrollableArea.h

index 0820de8f8f263daa5f13fd363f7a724d4bfc5918..aa1a8f50718b2f4fd9d33b0a3d1da8e8b142a9f5 100644 (file)
@@ -1,3 +1,33 @@
+2012-03-23  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=82083
+
+        Rubber-stamped by Simon Fraser.
+
+        This patch is just a name change. getExistingScrollAnimator() (which was 
+        added earlier today) is now existingScrollAnimator().
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::transitionToCommitted):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleGestureTapDown):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setAnimatorsAreActive):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::willStartLiveResize):
+        (WebCore::ScrollableArea::willEndLiveResize):
+        (WebCore::ScrollableArea::contentAreaWillPaint):
+        (WebCore::ScrollableArea::mouseEnteredContentArea):
+        (WebCore::ScrollableArea::mouseExitedContentArea):
+        (WebCore::ScrollableArea::mouseMovedInContentArea):
+        (WebCore::ScrollableArea::contentAreaDidShow):
+        (WebCore::ScrollableArea::contentAreaDidHide):
+        (WebCore::ScrollableArea::contentsResized):
+        (WebCore::ScrollableArea::serviceScrollAnimations):
+        * platform/ScrollableArea.h:
+        (WebCore::ScrollableArea::existingScrollAnimator):
+
 2012-03-23  Abhishek Arya  <inferno@chromium.org>
 
         Crash due to accessing removed parent lineboxes when clearing selection.
index c230c04461a0078541268dce0f4880bb426f0a0b..85ec57126c0e39a832de03803c95ce736f9eb7d2 100644 (file)
@@ -1826,7 +1826,7 @@ void FrameLoader::transitionToCommitted(PassRefPtr<CachedPage> cachedPage)
         return;
 
     if (FrameView* view = m_frame->view()) {
-        if (ScrollAnimator* scrollAnimator = view->getExistingScrollAnimator())
+        if (ScrollAnimator* scrollAnimator = view->existingScrollAnimator())
             scrollAnimator->cancelAnimations();
     }
 
index 47bdc7d2a91b52a3155023f09b2281f63182c429..a71e851546fc20ab87ca7720556174fc6662ee7c 100644 (file)
@@ -2379,7 +2379,7 @@ bool EventHandler::handleGestureTapDown()
     FrameView* view = m_frame->view();
     if (!view)
         return false;
-    if (ScrollAnimator* scrollAnimator = view->getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = view->existingScrollAnimator())
         scrollAnimator->cancelAnimations();
     const FrameView::ScrollableAreaSet* areas = view->scrollableAreas();
     if (!areas)
index a2a1490866f7f0fd6267c430b50b0e6e99a8b054..f56c343d95313538669f897b9dac39953b9a43f4 100644 (file)
@@ -2644,7 +2644,7 @@ void FrameView::setAnimatorsAreActive()
     if (!page)
         return;
 
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->setIsActive();
 
     if (!m_scrollableAreas)
index a2577051354e48409ad29b53193628863daf4139..c4b7347abd09c148d96e27bdc3c5cbebf7a67e48 100644 (file)
@@ -593,7 +593,7 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
 
     IntPoint adjustedScrollPosition = IntPoint(desiredOffset);
 
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator()) {
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) {
         if (!scrollAnimator->isRubberBandInProgress())
             adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
     }
index 85cfe4cbfd6c7f57ee182cb403293d4a59815ed4..8d359bf9c90d45eaf3cb2637095e20ec6382b4ba 100644 (file)
@@ -185,7 +185,7 @@ void ScrollableArea::willStartLiveResize()
     if (m_inLiveResize)
         return;
     m_inLiveResize = true;
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->willStartLiveResize();
 }
 
@@ -194,31 +194,31 @@ void ScrollableArea::willEndLiveResize()
     if (!m_inLiveResize)
         return;
     m_inLiveResize = false;
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->willEndLiveResize();
 }    
 
 void ScrollableArea::contentAreaWillPaint() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->contentAreaWillPaint();
 }
 
 void ScrollableArea::mouseEnteredContentArea() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->mouseEnteredContentArea();
 }
 
 void ScrollableArea::mouseExitedContentArea() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->mouseEnteredContentArea();
 }
 
 void ScrollableArea::mouseMovedInContentArea() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->mouseMovedInContentArea();
 }
 
@@ -234,13 +234,13 @@ void ScrollableArea::mouseExitedScrollbar(Scrollbar* scrollbar) const
 
 void ScrollableArea::contentAreaDidShow() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->contentAreaDidShow();
 }
 
 void ScrollableArea::contentAreaDidHide() const
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->contentAreaDidHide();
 }
 
@@ -272,7 +272,7 @@ void ScrollableArea::willRemoveHorizontalScrollbar(Scrollbar* scrollbar)
 
 void ScrollableArea::contentsResized()
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->contentsResized();
 }
 
@@ -357,7 +357,7 @@ bool ScrollableArea::hasLayerForScrollCorner() const
 
 void ScrollableArea::serviceScrollAnimations()
 {
-    if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+    if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
         scrollAnimator->serviceScrollAnimations();
 }
 
index 5d8b15cfcb6d8a747834cb698721911ef1b2c17b..70ef5408ec8fde8bc4ff13b23851f32ad2c54f8e 100644 (file)
@@ -96,7 +96,7 @@ public:
     ScrollAnimator* scrollAnimator() const;
 
     // This getter will return null if the ScrollAnimator hasn't been created yet.
-    ScrollAnimator* getExistingScrollAnimator() const { return m_scrollAnimator.get(); }
+    ScrollAnimator* existingScrollAnimator() const { return m_scrollAnimator.get(); }
 
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
     bool scrollOriginChanged() const { return m_scrollOriginChanged; }