Changeset 90119 in webkit

Timestamp:

Jun 30, 2011, 7:45:21 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2011-06-30 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Kent Tamura.

[Chromium] Autofill suggestions appear in upper left corner after input change
​https://bugs.webkit.org/show_bug.cgi?id=63702

This change fixes a few popup layout issues, some of which have existed for quite a while:

• the absence of the ChromeClientImpl::screenToWindow() implementation (the method used to always return (0, 0));
• the confusion of window and screen coordinates passed into the autofill popup client's setWindowRect() method;
• the use of the current frameRect() width as the target element's width (which was wrong when refreshing a popup resized during the initial layout (e.g. made wider than the target element)).

No new tests, as this is a change to platform-specific widget code. The test case is provided in the bug description.

• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::layoutAndGetRTLOffset): Use original target element width, not frameRect().width(), since the latter gets updated if the popup is not the same width as the target element. (WebCore::PopupContainer::refresh): Restore only the popup bounds rather than its original rectangle, since it sometimes breaks the invalidation region and layout.

2011-06-30 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Kent Tamura.

[Chromium] Autofill suggestions appear in upper left corner after input change
​https://bugs.webkit.org/show_bug.cgi?id=63702

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::screenToWindow): Implemented.
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::refreshAutoFillPopup): Pass screen (not window) coordinates into setWindowRect().

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-30  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Autofill suggestions appear in upper left corner after input change
+        https://bugs.webkit.org/show_bug.cgi?id=63702
+
+        This change fixes a few popup layout issues, some of which have existed for quite a while:
+        - the absence of the ChromeClientImpl::screenToWindow() implementation (the method used to always return (0, 0));
+        - the confusion of window and screen coordinates passed into the autofill popup client's setWindowRect() method;
+        - the use of the current frameRect() width as the target element's width (which was wrong when refreshing
+          a popup resized during the initial layout (e.g. made wider than the target element)).
+
+        No new tests, as this is a change to platform-specific widget code. The test case is provided in the bug description.
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupContainer::layoutAndGetRTLOffset): Use original target element width, not frameRect().width(),
+        since the latter gets updated if the popup is not the same width as the target element.
+        (WebCore::PopupContainer::refresh): Restore only the popup bounds rather than its original rectangle,
+        since it sometimes breaks the invalidation region and layout.
+
 2011-06-30  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -469 +469 @@
     m_listBox->move(kBorderSize, kBorderSize);
 
-    // popupWidth is the width of <select> element. Record it before resize frame.
-    int popupWidth = frameRect().width();
     // Size ourselves to contain listbox + border.
     int listBoxWidth = m_listBox->width() + kBorderSize * 2;
@@ -477 +475 @@
 
     // Compute the starting x-axis for a normal RTL or right-aligned LTR dropdown. For those,
-    // the right edge of dropdown box should be aligned with the right edge of <select> element box,
+    // the right edge of dropdown box should be aligned with the right edge of <select>/<input> element box,
     // and the dropdown box should be expanded to the left if more space is needed.
-    return popupWidth - listBoxWidth;
+    // m_originalFrameRect.width() is the width of the target <select>/<input> element.
+    return m_originalFrameRect.width() - listBoxWidth;
 }
 
@@ -597 +596 @@
 
     listBox()->setBaseWidth(max(m_originalFrameRect.width() - kBorderSize * 2, 0));
-    setFrameRect(m_originalFrameRect);
+    setBoundsSize(m_originalFrameRect.size());
 
     listBox()->updateFromElement();

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-30  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Autofill suggestions appear in upper left corner after input change
+        https://bugs.webkit.org/show_bug.cgi?id=63702
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::screenToWindow): Implemented.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::refreshAutoFillPopup): Pass screen (not window) coordinates into setWindowRect().
+
 2011-06-30  Kentaro Hara  <haraken@google.com>
 

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -566 +566 @@
 }
 
-IntPoint ChromeClientImpl::screenToWindow(const IntPoint&) const
-{
-    notImplemented();
-    return IntPoint();
+IntPoint ChromeClientImpl::screenToWindow(const IntPoint& point) const
+{
+    IntPoint windowPoint(point);
+
+    if (m_webView->client()) {
+        WebRect windowRect = m_webView->client()->windowRect();
+        windowPoint.move(-windowRect.x, -windowRect.y);
+    }
+
+    return windowPoint;
 }
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -2362 +2362 @@
             static_cast<WebPopupMenuImpl*>(m_autoFillPopup->client());
         if (popupMenu)
-            popupMenu->client()->setWindowRect(newBounds);
+            popupMenu->client()->setWindowRect(m_chromeClientImpl.windowToScreen(newBounds));
     }
 }