Changeset 179902 in webkit

Timestamp:

Feb 10, 2015, 4:16:50 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179578. rdar://problem/19709204

Location:

branches/safari-600.1.4.15-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/EditorState.cpp (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (3 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

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

@@ +1 @@
+2015-02-10  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179578.
+
+    2015-02-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+            [iOS] Selection Callout should not immediately disappear on pages with frequent layouts
+            https://bugs.webkit.org/show_bug.cgi?id=141210
+
+            Reviewed by Enrica Casucci.
+
+            In iOS WebKit2 in order to keep caret refreshes in sync with WebCore layouts
+            the selection assistant is told to update whenever WebKit's layer tree
+            commits. Unfortunately, for pages with JavaScript animation that are
+            frequently doing a layout / layer tree update, this would trigger very
+            frequent selection updates that would keep the caret from blinking and
+            dismiss any selection callouts.
+
+            This change tracks the last selection drawing information so that we can
+            avoid informing the assistant of a selection updates unless it has changed
+            visually or needs to redraw (zoom).
+
+            * Shared/EditorState.cpp:
+            Remove include already in header.
+
+            * UIProcess/ios/WKContentViewInteraction.h:
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (WebKit::WKSelectionDrawingInfo::WKSelectionDrawingInfo):
+            (WebKit::operator==):
+            (WebKit::operator!=):
+            (-[WKContentView observeValueForKeyPath:ofObject:change:context:]):
+            When zooming, force the selection update, even though the drawing
+            information hasn't changed, the views will need to be updated.
+
+            (-[WKContentView _updateChangedSelection]):
+            (-[WKContentView _updateChangedSelection:]):
+            Monitor EditorState for changes in selection drawing and avoid
+            informing the selection assistant unless necessary.
+
 2015-01-28  David Kilzer  <ddkilzer@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/EditorState.cpp

@@ -29 +29 @@
 #include "Arguments.h"
 #include "WebCoreArgumentCoders.h"
-
-#if PLATFORM(IOS)
-#include <WebCore/SelectionRect.h>
-#endif
 
 namespace WebKit {

branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

@@ -29 +29 @@
 
 #import "AssistedNodeInformation.h"
+#import "EditorState.h"
 #import "GestureTypes.h"
 #import "InteractionInformationAtPosition.h"
@@ -74 +75 @@
 
 namespace WebKit {
+struct WKSelectionDrawingInfo {
+    enum class SelectionType { None, Plugin, Range };
+    WKSelectionDrawingInfo();
+    explicit WKSelectionDrawingInfo(const EditorState&);
+    SelectionType type;
+    WebCore::IntRect caretRect;
+    Vector<WebCore::SelectionRect> selectionRects;
+};
 struct WKAutoCorrectionData {
     String fontName;
@@ -131 +140 @@
 
     CGPoint _lastInteractionLocation;
+
+    WebKit::WKSelectionDrawingInfo _lastSelectionDrawingInfo;
 
     BOOL _isEditable;

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

@@ -83 +83 @@
 using namespace WebKit;
 
+namespace WebKit {
+
+WKSelectionDrawingInfo::WKSelectionDrawingInfo()
+    : type(SelectionType::None)
+{
+}
+
+WKSelectionDrawingInfo::WKSelectionDrawingInfo(const EditorState& editorState)
+{
+    if (editorState.selectionIsNone) {
+        type = SelectionType::None;
+        return;
+    }
+
+    if (editorState.isInPlugin) {
+        type = SelectionType::Plugin;
+        return;
+    }
+
+    type = SelectionType::Range;
+    caretRect = editorState.caretRectAtEnd;
+    selectionRects = editorState.selectionRects;
+}
+
+inline bool operator==(const WKSelectionDrawingInfo& a, const WKSelectionDrawingInfo& b)
+{
+    if (a.type != b.type)
+        return false;
+
+    if (a.type == WKSelectionDrawingInfo::SelectionType::Range) {
+        if (a.caretRect != b.caretRect)
+            return false;
+
+        if (a.selectionRects.size() != b.selectionRects.size())
+            return false;
+
+        for (unsigned i = 0; i < a.selectionRects.size(); ++i) {
+            if (a.selectionRects[i].rect() != b.selectionRects[i].rect())
+                return false;
+        }
+    }
+
+    return true;
+}
+
+inline bool operator!=(const WKSelectionDrawingInfo& a, const WKSelectionDrawingInfo& b)
+{
+    return !(a == b);
+}
+
+} // namespace WebKit
+
 static const float highlightDelay = 0.12;
 static const float tapAndHoldDelay  = 0.75;
@@ -392 +444 @@
 
     _selectionNeedsUpdate = YES;
-    [self _updateChangedSelection];
+    [self _updateChangedSelection:YES];
     [self _updateTapHighlight];
 }
@@ -2660 +2712 @@
 - (void)_updateChangedSelection
 {
+    [self _updateChangedSelection:NO];
+}
+
+- (void)_updateChangedSelection:(BOOL)force
+{
     if (!_selectionNeedsUpdate)
         return;
+
+    WKSelectionDrawingInfo selectionDrawingInfo(_page->editorState());
+    if (!force && selectionDrawingInfo == _lastSelectionDrawingInfo)
+        return;
+
+    _lastSelectionDrawingInfo = selectionDrawingInfo;
 
     // FIXME: We need to figure out what to do if the selection is changed by Javascript.