Changeset 100083 in webkit

Timestamp:

Nov 12, 2011, 2:13:00 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10294191> REGRESSION (WebKit2): Lookup bubble sized and positioned incorrectly (vertically off)
​https://bugs.webkit.org/show_bug.cgi?id=72217

Reviewed by Dave Hyatt.

• UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::didPerformDictionaryLookup): Rather than adding the NSFont’s ascender
to the top of the text rect to establish the baseline here...

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::performDictionaryLookupForRange): ...do it here, using the WebCore::Font’s
ascender, which is what’s actually used when drawing the text.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (1 diff)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-12  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10294191> REGRESSION (WebKit2): Lookup bubble sized and positioned incorrectly (vertically off)
+        https://bugs.webkit.org/show_bug.cgi?id=72217
+
+        Reviewed by Dave Hyatt.
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::didPerformDictionaryLookup): Rather than adding the NSFont’s ascender
+        to the top of the text rect to establish the baseline here...
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::performDictionaryLookupForRange): ...do it here, using the WebCore::Font’s
+        ascender, which is what’s actually used when drawing the text.
+
 2011-11-11  Nayan Kumar K  <nayankk@motorola.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -407 +407 @@
 
     NSPoint textBaselineOrigin = dictionaryPopupInfo.origin;
-    textBaselineOrigin.y += [font ascender];
-    
+
 #if !defined(BUILDING_ON_SNOW_LEOPARD)
     // Convert to screen coordinates.

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -540 +540 @@
     DictionaryPopupInfo dictionaryPopupInfo;
     dictionaryPopupInfo.type = type;
-    dictionaryPopupInfo.origin = FloatPoint(rangeRect.x(), rangeRect.y());
+    dictionaryPopupInfo.origin = FloatPoint(rangeRect.x(), rangeRect.y() + style->fontMetrics().ascent());
     dictionaryPopupInfo.fontInfo.fontAttributeDictionary = fontDescriptorAttributes;
 #if !defined(BUILDING_ON_SNOW_LEOPARD)