Changeset 150653 in webkit

Timestamp:

May 24, 2013 12:41:37 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Add more lines to the context during Dictionary lookups
​https://bugs.webkit.org/show_bug.cgi?id=115256

Patch by Thomas Deniau <​deniau@apple.com> on 2013-05-24
Reviewed by Ryosuke Niwa.

Source/WebCore:

No new tests - no new functionality.

• WebCore.exp.in: Export a few methods in VisibleUnits needed to be able

to call previousLinePosition(), nextLinePosition(), startOfLine() and
endOfLine() in WebPageMac.mm when determining the context while looking
up a dictionary definition. These symbols used to be exported for iOS
only, export them on the desktop too.

Source/WebKit2:

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::performDictionaryLookupAtLocation):
Instead of using the current paragraph as the context (which stops at
line breaks), get a few lines before and after the point, so that the
context contains at least four lines in each direction.
This way the Dictionary will be able to look up things that extend past
the current line.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (12 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-24  Thomas Deniau  <deniau@apple.com>
+
+        Add more lines to the context during Dictionary lookups
+        https://bugs.webkit.org/show_bug.cgi?id=115256
+
+        Reviewed by Ryosuke Niwa.
+
+        No new tests - no new functionality.
+
+        * WebCore.exp.in: Export a few methods in VisibleUnits needed to be able
+        to call previousLinePosition(), nextLinePosition(), startOfLine() and
+        endOfLine() in WebPageMac.mm when determining the context while looking
+        up a dictionary definition. These symbols used to be exported for iOS
+        only, export them on the desktop too.
+
 2013-05-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -169 +169 @@
 __ZN7WebCore11iBeamCursorEv
 __ZN7WebCore11memoryCacheEv
+__ZN7WebCore11startOfLineERKNS_15VisiblePositionE
 __ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
 __ZN7WebCore11writeToFileEiPKci
@@ -567 +568 @@
 __ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore16isUserVisibleURLEP8NSString
+__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
 __ZN7WebCore16scriptNameToCodeERKN3WTF6StringE
 __ZN7WebCore16startOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
@@ -687 +689 @@
 __ZN7WebCore20deleteEmptyDirectoryERKN3WTF6StringE
 __ZN7WebCore20makeRGBA32FromFloatsEffff
+__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
 __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
 __ZN7WebCore20toUInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
@@ -1265 +1268 @@
 __ZN7WebCore9TimerBaseD2Ev
 __ZN7WebCore9closeFileERi
+__ZN7WebCore9endOfLineERKNS_15VisiblePositionE
 __ZN7WebCore9endOfWordERKNS_15VisiblePositionENS_9EWordSideE
 __ZN7WebCore9fontCacheEv
@@ -1450 +1454 @@
 __ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
 __ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv
+__ZNK7WebCore15VisiblePosition45lineDirectionPointForBlockDirectionNavigationEv
 __ZNK7WebCore15VisiblePosition4nextENS_27EditingBoundaryCrossingRuleE
 __ZNK7WebCore15VisiblePosition8previousENS_27EditingBoundaryCrossingRuleE
@@ -1639 +1644 @@
 __ZNK7WebCore8Position25leadingWhitespacePositionENS_9EAffinityEb
 __ZNK7WebCore8Position26trailingWhitespacePositionENS_9EAffinityEb
+__ZNK7WebCore8Position28offsetForPositionAfterAnchorEv
 __ZNK7WebCore8Position8upstreamENS_27EditingBoundaryCrossingRuleE
 __ZNK7WebCore9DOMWindow27pendingUnloadEventListenersEv
@@ -2071 +2077 @@
 __ZN7WebCore11MemoryCache20removeImageFromCacheERKNS_4KURLE
 __ZN7WebCore11isEndOfLineERKNS_15VisiblePositionE
-__ZN7WebCore11startOfLineERKNS_15VisiblePositionE
 __ZN7WebCore12EventHandler10mouseMovedEP8WebEvent
 __ZN7WebCore12EventHandler10wheelEventEP8WebEvent
@@ -2120 +2125 @@
 __ZN7WebCore16VisibleSelectionC1Ev
 __ZN7WebCore16jsStringWithCacheSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_EEEES6_
-__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
 __ZN7WebCore16nextWordPositionERKNS_15VisiblePositionE
 __ZN7WebCore17CredentialStorage16clearCredentialsEv
@@ -2135 +2139 @@
 __ZN7WebCore20networkStateNotifierEv
 __ZN7WebCore20nextSentencePositionERKNS_15VisiblePositionE
-__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
 __ZN7WebCore20previousWordPositionERKNS_15VisiblePositionE
 __ZN7WebCore21MemoryPressureHandler19clearMemoryPressureEv
@@ -2215 +2218 @@
 __ZN7WebCore9TileCache14drainLayerPoolEv
 __ZN7WebCore9TileCache20setLayerPoolCapacityEj
-__ZN7WebCore9endOfLineERKNS_15VisiblePositionE
 __ZNK7WebCore10FloatPointcv7CGPointEv
 __ZNK7WebCore14FrameSelection17wordOffsetInRangeEPKNS_5RangeE
@@ -2229 +2231 @@
 __ZNK7WebCore14FrameSelection36elementRangeContainingCaretSelectionEv
 __ZNK7WebCore14SecurityOrigin8toStringEv
-__ZNK7WebCore15VisiblePosition45lineDirectionPointForBlockDirectionNavigationEv
 __ZNK7WebCore15VisiblePosition4leftEb
 __ZNK7WebCore15VisiblePosition5rightEb
@@ -2257 +2258 @@
 __ZNK7WebCore7IntSizecv6CGSizeEv
 __ZNK7WebCore8Document31isTelephoneNumberParsingEnabledEv
-__ZNK7WebCore8Position28offsetForPositionAfterAnchorEv
 __ZNK7WebCore9FloatRectcv6CGRectEv
 __ZNK7WebCore9FloatSizecv6CGSizeEv

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-24  Thomas Deniau  <deniau@apple.com>
+
+        Add more lines to the context during Dictionary lookups
+        https://bugs.webkit.org/show_bug.cgi?id=115256
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::performDictionaryLookupAtLocation):
+        Instead of using the current paragraph as the context (which stops at
+        line breaks), get a few lines before and after the point, so that the
+        context contains at least four lines in each direction.
+        This way the Dictionary will be able to look up things that extend past
+        the current line.
+
 2013-05-24  Anders Carlsson  <andersca@apple.com>
 

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

@@ -508 +508 @@
     NSDictionary *options = nil;
 
-    // As context, we are going to use the surrounding paragraph of text.
-    VisiblePosition paragraphStart = startOfParagraph(position);
-    VisiblePosition paragraphEnd = endOfParagraph(position);
-
-    NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(paragraphStart, position).get()), 0);
-
-    RefPtr<Range> fullCharacterRange = makeRange(paragraphStart, paragraphEnd);
+    // As context, we are going to use four lines of text before and after the point. (Dictionary can sometimes look up things that are four lines long)
+    const int numberOfLinesOfContext = 4;
+    VisiblePosition contextStart = position;
+    VisiblePosition contextEnd = position;
+    for (int i = 0; i < numberOfLinesOfContext; i++) {
+        VisiblePosition n = previousLinePosition(contextStart, contextStart.lineDirectionPointForBlockDirectionNavigation());
+        if (n.isNull() || n == contextStart)
+            break;
+        contextStart = n;
+    }
+    for (int i = 0; i < numberOfLinesOfContext; i++) {
+        VisiblePosition n = nextLinePosition(contextEnd, contextEnd.lineDirectionPointForBlockDirectionNavigation());
+        if (n.isNull() || n == contextEnd)
+            break;
+        contextEnd = n;
+    }
+    contextStart = startOfLine(contextStart);
+    contextEnd = endOfLine(contextEnd);
+    
+    NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(contextStart, position).get()), 0);
+
+    RefPtr<Range> fullCharacterRange = makeRange(contextStart, contextEnd);
     String fullPlainTextString = plainText(fullCharacterRange.get());