Diff
Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (150983 => 150984)
--- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:08:22 UTC (rev 150983)
+++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-30 21:11:50 UTC (rev 150984)
@@ -1,5 +1,9 @@
2013-05-30 Lucas Forschler <[email protected]>
+ Rollout r150819
+
+2013-05-30 Lucas Forschler <[email protected]>
+
Merge r150950
2013-05-29 Tim Horton <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in (150983 => 150984)
--- branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-30 21:08:22 UTC (rev 150983)
+++ branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-30 21:11:50 UTC (rev 150984)
@@ -168,7 +168,6 @@
__ZN7WebCore11URLWithDataEP6NSDataP5NSURL
__ZN7WebCore11iBeamCursorEv
__ZN7WebCore11memoryCacheEv
-__ZN7WebCore11startOfLineERKNS_15VisiblePositionE
__ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
__ZN7WebCore11writeToFileEiPKci
__ZN7WebCore12ChromeClient23paintCustomOverhangAreaEPNS_15GraphicsContextERKNS_7IntRectES5_S5_
@@ -569,7 +568,6 @@
__ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
__ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
__ZN7WebCore16isUserVisibleURLEP8NSString
-__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
__ZN7WebCore16scriptNameToCodeERKN3WTF6StringE
__ZN7WebCore16startOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
__ZN7WebCore17CredentialStorage24getFromPersistentStorageERKNS_15ProtectionSpaceE
@@ -690,7 +688,6 @@
__ZN7WebCore20UserGestureIndicatorD1Ev
__ZN7WebCore20deleteEmptyDirectoryERKN3WTF6StringE
__ZN7WebCore20makeRGBA32FromFloatsEffff
-__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
__ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
__ZN7WebCore20toUInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
__ZN7WebCore21BackForwardController11itemAtIndexEi
@@ -1268,7 +1265,6 @@
__ZN7WebCore9TimerBaseC2Ev
__ZN7WebCore9TimerBaseD2Ev
__ZN7WebCore9closeFileERi
-__ZN7WebCore9endOfLineERKNS_15VisiblePositionE
__ZN7WebCore9endOfWordERKNS_15VisiblePositionENS_9EWordSideE
__ZN7WebCore9fontCacheEv
__ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
@@ -1456,7 +1452,6 @@
__ZNK7WebCore15VisiblePosition14characterAfterEv
__ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
__ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv
-__ZNK7WebCore15VisiblePosition45lineDirectionPointForBlockDirectionNavigationEv
__ZNK7WebCore15VisiblePosition4nextENS_27EditingBoundaryCrossingRuleE
__ZNK7WebCore15VisiblePosition8previousENS_27EditingBoundaryCrossingRuleE
__ZNK7WebCore16EventListenerMap8containsERKN3WTF12AtomicStringE
@@ -1646,7 +1641,6 @@
__ZNK7WebCore8Position24parentAnchoredEquivalentEv
__ZNK7WebCore8Position25leadingWhitespacePositionENS_9EAffinityEb
__ZNK7WebCore8Position26trailingWhitespacePositionENS_9EAffinityEb
-__ZNK7WebCore8Position28offsetForPositionAfterAnchorEv
__ZNK7WebCore8Position8upstreamENS_27EditingBoundaryCrossingRuleE
__ZNK7WebCore9DOMWindow27pendingUnloadEventListenersEv
__ZNK7WebCore9FloatQuad11boundingBoxEv
@@ -2079,6 +2073,7 @@
__ZN7WebCore11MemoryCache18pruneLiveResourcesEb
__ZN7WebCore11MemoryCache20removeImageFromCacheERKNS_4KURLE
__ZN7WebCore11isEndOfLineERKNS_15VisiblePositionE
+__ZN7WebCore11startOfLineERKNS_15VisiblePositionE
__ZN7WebCore12EventHandler10mouseMovedEP8WebEvent
__ZN7WebCore12EventHandler10wheelEventEP8WebEvent
__ZN7WebCore12EventHandler15sendScrollEventEv
@@ -2127,6 +2122,7 @@
__ZN7WebCore16VisibleSelection27selectionFromContentsOfNodeEPNS_4NodeE
__ZN7WebCore16VisibleSelectionC1Ev
__ZN7WebCore16jsStringWithCacheSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_EEEES6_
+__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
__ZN7WebCore16nextWordPositionERKNS_15VisiblePositionE
__ZN7WebCore17CredentialStorage16clearCredentialsEv
__ZN7WebCore17isStartOfDocumentERKNS_15VisiblePositionE
@@ -2141,6 +2137,7 @@
__ZN7WebCore20lastOffsetForEditingEPKNS_4NodeE
__ZN7WebCore20networkStateNotifierEv
__ZN7WebCore20nextSentencePositionERKNS_15VisiblePositionE
+__ZN7WebCore20previousLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
__ZN7WebCore20previousWordPositionERKNS_15VisiblePositionE
__ZN7WebCore21MemoryPressureHandler19clearMemoryPressureEv
__ZN7WebCore21MemoryPressureHandler25hasReceivedMemoryPressureEv
@@ -2220,6 +2217,7 @@
__ZN7WebCore9PageGroup24addUserStyleSheetToWorldEPNS_15DOMWrapperWorldERKN3WTF6StringERKNS_4KURLERKNS3_6VectorIS4_Lm0ENS3_15CrashOnOverflowEEESE_NS_25UserContentInjectedFramesENS_14UserStyleLevelENS_22UserStyleInjectionTimeE
__ZN7WebCore9TileCache14drainLayerPoolEv
__ZN7WebCore9TileCache20setLayerPoolCapacityEj
+__ZN7WebCore9endOfLineERKNS_15VisiblePositionE
__ZNK7WebCore10FloatPointcv7CGPointEv
__ZNK7WebCore14FrameSelection17wordOffsetInRangeEPKNS_5RangeE
__ZNK7WebCore14FrameSelection20selectionAtWordStartEv
@@ -2233,6 +2231,7 @@
__ZNK7WebCore14FrameSelection35characterInRelationToCaretSelectionEi
__ZNK7WebCore14FrameSelection36elementRangeContainingCaretSelectionEv
__ZNK7WebCore14SecurityOrigin8toStringEv
+__ZNK7WebCore15VisiblePosition45lineDirectionPointForBlockDirectionNavigationEv
__ZNK7WebCore15VisiblePosition4leftEb
__ZNK7WebCore15VisiblePosition5rightEb
__ZNK7WebCore17RenderTextControl22textFormControlElementEv
@@ -2260,6 +2259,7 @@
__ZNK7WebCore6Editor6clientEv
__ZNK7WebCore7IntSizecv6CGSizeEv
__ZNK7WebCore8Document31isTelephoneNumberParsingEnabledEv
+__ZNK7WebCore8Position28offsetForPositionAfterAnchorEv
__ZNK7WebCore9FloatRectcv6CGRectEv
__ZNK7WebCore9FloatSizecv6CGSizeEv
_webThreadShouldYield
Modified: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (150983 => 150984)
--- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 21:08:22 UTC (rev 150983)
+++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-30 21:11:50 UTC (rev 150984)
@@ -1,5 +1,9 @@
2013-05-30 Lucas Forschler <[email protected]>
+ Rollout r150819
+
+2013-05-30 Lucas Forschler <[email protected]>
+
Merge r150950
2013-05-29 Tim Horton <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (150983 => 150984)
--- branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-05-30 21:08:22 UTC (rev 150983)
+++ branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-05-30 21:11:50 UTC (rev 150984)
@@ -519,28 +519,13 @@
NSDictionary *options = nil;
- // 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);
+ // As context, we are going to use the surrounding paragraph of text.
+ VisiblePosition paragraphStart = startOfParagraph(position);
+ VisiblePosition paragraphEnd = endOfParagraph(position);
- RefPtr<Range> fullCharacterRange = makeRange(contextStart, contextEnd);
+ NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(paragraphStart, position).get()), 0);
+
+ RefPtr<Range> fullCharacterRange = makeRange(paragraphStart, paragraphEnd);
String fullPlainTextString = plainText(fullCharacterRange.get());
NSRange extractedRange = WKExtractWordDefinitionTokenRangeFromContextualString(fullPlainTextString, rangeToPass, &options);
