Title: [110889] trunk/Source/WebCore
- Revision
- 110889
- Author
- jam...@google.com
- Date
- 2012-03-15 14:39:18 -0700 (Thu, 15 Mar 2012)
Log Message
Fix crbug 117957 - get settings scrolling with the wheel again.
https://bugs.webkit.org/show_bug.cgi?id=81247
Patch by Scott Byer <scottb...@chromium.org> on 2012-03-15
Reviewed by James Robinson.
Tests to follow.
* page/FrameView.cpp:
(WebCore::FrameView::serviceScriptedAnimations):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110888 => 110889)
--- trunk/Source/WebCore/ChangeLog 2012-03-15 21:33:44 UTC (rev 110888)
+++ trunk/Source/WebCore/ChangeLog 2012-03-15 21:39:18 UTC (rev 110889)
@@ -1,3 +1,15 @@
+2012-03-15 Scott Byer <scottb...@chromium.org>
+
+ Fix crbug 117957 - get settings scrolling with the wheel again.
+ https://bugs.webkit.org/show_bug.cgi?id=81247
+
+ Reviewed by James Robinson.
+
+ Tests to follow.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::serviceScriptedAnimations):
+
2012-03-15 David Hyatt <hy...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=81258
Modified: trunk/Source/WebCore/page/FrameView.cpp (110888 => 110889)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-03-15 21:33:44 UTC (rev 110888)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-03-15 21:39:18 UTC (rev 110889)
@@ -2082,11 +2082,10 @@
#if ENABLE(REQUEST_ANIMATION_FRAME)
void FrameView::serviceScriptedAnimations(DOMTimeStamp time)
{
- serviceScrollAnimations();
-
- Vector<AnimationController*> animations;
- for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
+ for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext()) {
+ frame->view()->serviceScrollAnimations();
frame->animation()->serviceAnimations();
+ }
Vector<RefPtr<Document> > documents;
for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
