Changeset 96672 in webkit

Timestamp:

Oct 4, 2011 6:32:19 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Fix FrameView::scrollElementToRect to take already scrolled amount into consideration.
​https://bugs.webkit.org/show_bug.cgi?id=69220

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2011-10-04
Reviewed by Simon Fraser.

Source/WebCore:

• page/FrameView.cpp:

(WebCore::FrameView::scrollElementToRect):

LayoutTests:

• fast/dom/scroll-element-to-rect.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/scroll-element-to-rect.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-04  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        Fix FrameView::scrollElementToRect to take already scrolled amount into consideration.
+        https://bugs.webkit.org/show_bug.cgi?id=69220
+
+        Reviewed by Simon Fraser.
+
+        * fast/dom/scroll-element-to-rect.html:
+
 2011-10-04  David Barr  <davidbarr@chromium.org>
 

trunk/LayoutTests/fast/dom/scroll-element-to-rect.html

@@ -10 +10 @@
     <script>
           var box = document.getElementById('textbox');
-      if (window.internals)
+      if (window.internals) {
+        window.internals.scrollElementToRect(box, 0, 100, 300, 300);
         window.internals.scrollElementToRect(box, 0, 0, 300, 300);
+      }
 
       var rect = box.getBoundingClientRect();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-04  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        Fix FrameView::scrollElementToRect to take already scrolled amount into consideration.
+        https://bugs.webkit.org/show_bug.cgi?id=69220
+
+        Reviewed by Simon Fraser.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollElementToRect):
+
 2011-10-04  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1642 +1642 @@
     int centeringOffsetX = (rect.width() - bounds.width()) / 2;
     int centeringOffsetY = (rect.height() - bounds.height()) / 2;
-    scrollBy(IntSize(bounds.x() - centeringOffsetX - rect.x(), bounds.y() - centeringOffsetY - rect.y()));
+    setScrollPosition(LayoutPoint(bounds.x() - centeringOffsetX - rect.x(), bounds.y() - centeringOffsetY - rect.y()));
 }