Changeset 190796 in webkit

Timestamp:

Oct 9, 2015 7:22:04 AM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r190512. rdar://problem/22974818

Location:

branches/safari-601.1.46-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r190512. rdar://problem/22974818
+
+    2015-10-02  Enrica Casucci  <enrica@apple.com>
+
+            Text selection is inaccurate in Wikipedia pages when starting navigation from wikipedia.org.
+            https://bugs.webkit.org/show_bug.cgi?id=149756
+            rdar://problem/22332409
+
+            Reviewed by Tim Horton.
+
+            When loading a new document into the same WebPage object, we need
+            to clear the assisted node, since there is no guarantee that the
+            node will be blurred. The bug is caused by the use of a stale
+            assisted node to constrain the point where the gesture occurs.
+            A fix for this problem was landed in http://trac.webkit.org/changeset/179885
+            where the cleanup was added when FrameLoaderClient::detach2 was called.
+            This method doesn't seem to be called any longer for the main frame,
+            so the correct solution is to add the cleanup to didCommitLoad in WebPage.
+            I've also added some checks to webSelectionsRects and selectedTextRange to avoid
+            the use of postLayoutData when the selection is none.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView webSelectionRects]):
+            (-[WKContentView selectedTextRange]):
+            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+            (WebKit::WebFrameLoaderClient::detachedFromParent2): Removed call to resetAssistedNodeForFrame.
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::didCommitLoad): Added call to resetAssistedNodeForFrame.
+
 2015-10-08  Andy Estes  <aestes@apple.com>
 

branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -1034 +1034 @@
 - (NSArray *)webSelectionRects
 {
+    if (_page->editorState().selectionIsNone)
+        return nil;
     const auto& selectionRects = _page->editorState().postLayoutData().selectionRects;
     unsigned size = selectionRects.size();
@@ -2306 +2308 @@
 - (UITextRange *)selectedTextRange
 {
+    if (_page->editorState().selectionIsNone)
+        return nil;
     auto& postLayoutEditorStateData = _page->editorState().postLayoutData();
     FloatRect startRect = postLayoutEditorStateData.caretRectAtStart;

branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -141 +141 @@
         return;
 
-#if PLATFORM(IOS)
-    webPage->resetAssistedNodeForFrame(m_frame);
-#endif
     RefPtr<API::Object> userData;
 

branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4619 +4619 @@
     frame->setFirstLayerTreeTransactionIDAfterDidCommitLoad(downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID());
     cancelPotentialTapInFrame(*frame);
+    resetAssistedNodeForFrame(frame);
 #endif