Changeset 53556 in webkit

Timestamp:

Jan 20, 2010 11:09:32 AM (14 years ago)

Author:

timothy@apple.com

Message:

Fix erroneous page scrolls when trying to select text or use form elements
with the Web Inspector docked.

​http://webkit.org/b/24403
rdar://problem/6753925

Reviewed by John Sullivan and Darin Adler.

• WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::scrollRectIntoView): The scrollRect.move() call was
incorrectly converting the rect under the assumption that the frame view
is the same size as the WebView. Using convertRect:fromView: instead
is enough to fix the bug, but that code isn't needed since WebCore
already takes care of scrolling the main frame's document view, so it
was redundant to do it here too.

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebChromeClient.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-01-19  Timothy Hatcher  <timothy@apple.com>
+
+        Fix erroneous page scrolls when trying to select text or use form elements
+        with the Web Inspector docked.
+
+        http://webkit.org/b/24403
+        rdar://problem/6753925
+
+        Reviewed by John Sullivan and Darin Adler.
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::scrollRectIntoView): The scrollRect.move() call was
+        incorrectly converting the rect under the assumption that the frame view
+        is the same size as the WebView. Using convertRect:fromView: instead
+        is enough to fix the bug, but that code isn't needed since WebCore
+        already takes care of scrolling the main frame's document view, so it
+        was redundant to do it here too.
+
 2010-01-20  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm

@@ -491 +491 @@
     // FIXME: This scrolling behavior should be under the control of the embedding client (rather than something
     // we just do ourselves).
-    
-    IntRect scrollRect = r;
-    NSView *startView = m_webView;
-    if ([m_webView _usesDocumentViews]) {
-        // We have to convert back to document view coordinates.
-        // It doesn't make sense for the scrollRectIntoView API to take document view coordinates.
-        scrollRect.move(scrollView->scrollOffset());
-        startView = [[[m_webView mainFrame] frameView] documentView];
-    }
-    NSRect rect = scrollRect;
-    for (NSView *view = startView; view; view = [view superview]) { 
-        if ([view isKindOfClass:[NSClipView class]]) { 
-            NSClipView *clipView = (NSClipView *)view; 
-            NSView *documentView = [clipView documentView]; 
-            [documentView scrollRectToVisible:[documentView convertRect:rect fromView:startView]]; 
-        } 
+
+    NSRect rect = r;
+    for (NSView *view = m_webView; view; view = [view superview]) {
+        if ([view isKindOfClass:[NSClipView class]]) {
+            NSClipView *clipView = (NSClipView *)view;
+            NSView *documentView = [clipView documentView];
+            [documentView scrollRectToVisible:[documentView convertRect:rect fromView:m_webView]];
+        }
     }
 }