Title: [111901] trunk/Source/WebCore
- Revision
- 111901
- Author
- [email protected]
- Date
- 2012-03-23 14:02:51 -0700 (Fri, 23 Mar 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111900 => 111901)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 21:02:51 UTC (rev 111901)
@@ -1,3 +1,33 @@
+2012-03-23 Beth Dakin <[email protected]>
+
+ 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 <[email protected]>
Crash due to accessing removed parent lineboxes when clearing selection.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (111900 => 111901)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-23 21:02:51 UTC (rev 111901)
@@ -1826,7 +1826,7 @@
return;
if (FrameView* view = m_frame->view()) {
- if (ScrollAnimator* scrollAnimator = view->getExistingScrollAnimator())
+ if (ScrollAnimator* scrollAnimator = view->existingScrollAnimator())
scrollAnimator->cancelAnimations();
}
Modified: trunk/Source/WebCore/page/EventHandler.cpp (111900 => 111901)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-03-23 21:02:51 UTC (rev 111901)
@@ -2379,7 +2379,7 @@
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)
Modified: trunk/Source/WebCore/page/FrameView.cpp (111900 => 111901)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-03-23 21:02:51 UTC (rev 111901)
@@ -2644,7 +2644,7 @@
if (!page)
return;
- if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
scrollAnimator->setIsActive();
if (!m_scrollableAreas)
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (111900 => 111901)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2012-03-23 21:02:51 UTC (rev 111901)
@@ -593,7 +593,7 @@
IntPoint adjustedScrollPosition = IntPoint(desiredOffset);
- if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator()) {
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) {
if (!scrollAnimator->isRubberBandInProgress())
adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
}
Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (111900 => 111901)
--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-03-23 21:02:51 UTC (rev 111901)
@@ -185,7 +185,7 @@
if (m_inLiveResize)
return;
m_inLiveResize = true;
- if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
scrollAnimator->willStartLiveResize();
}
@@ -194,31 +194,31 @@
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::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::contentsResized()
{
- if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
scrollAnimator->contentsResized();
}
@@ -357,7 +357,7 @@
void ScrollableArea::serviceScrollAnimations()
{
- if (ScrollAnimator* scrollAnimator = getExistingScrollAnimator())
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
scrollAnimator->serviceScrollAnimations();
}
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (111900 => 111901)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2012-03-23 21:00:25 UTC (rev 111900)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2012-03-23 21:02:51 UTC (rev 111901)
@@ -96,7 +96,7 @@
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; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
