Changeset 168378 in webkit

Timestamp:

May 6, 2014 2:08:14 PM (10 years ago)

Author:

beidson@apple.com

Message:

Don't select an image that is about to have its menu shown.
<rdar://problem/16807845> and ​https://bugs.webkit.org/show_bug.cgi?id=132579

Reviewed by Tim Horton.

Source/WebCore:

• WebCore.exp.in:

• editing/Editor.h:
• editing/mac/EditorMac.mm:

(WebCore::Editor::replaceNodeFromPasteboard): New method that first selects

the Node and then immediately pastes over it. Since it’s synchronous the
selection never has a chance to paint.

• html/shadow/mac/ImageControlsButtonElementMac.cpp:

(WebCore::ImageControlsButtonElementMac::defaultEventHandler): Don’t select the image.

Source/WebKit/mac:

• Misc/WebSharingServicePickerController.mm:

(-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):

Call the new replaceNodeFromPasteboard API instead of readSelectionFromPasteboard.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/editing/Editor.h (modified) (1 diff)
• WebCore/editing/mac/EditorMac.mm (modified) (1 diff)
• WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Misc/WebSharingServicePickerController.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-06  Brady Eidson  <beidson@apple.com>
+
+        Don't select an image that is about to have its menu shown.
+        <rdar://problem/16807845> and https://bugs.webkit.org/show_bug.cgi?id=132579
+
+        Reviewed by Tim Horton.
+
+        * WebCore.exp.in:
+
+        * editing/Editor.h:
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::replaceNodeFromPasteboard): New method that first selects
+          the Node and then immediately pastes over it. Since it’s synchronous the 
+          selection never has a chance to paint.
+
+        * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+        (WebCore::ImageControlsButtonElementMac::defaultEventHandler): Don’t select the image.
+
 2014-05-06  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1161 +1161 @@
 __ZN7WebCore6Editor24isSelectionUngrammaticalEv
 __ZN7WebCore6Editor24replaceSelectionWithTextERKN3WTF6StringEbb
+__ZN7WebCore6Editor25replaceNodeFromPasteboardEPNS_4NodeERKN3WTF6StringE
 __ZN7WebCore6Editor26decreaseSelectionListLevelEv
 __ZN7WebCore6Editor26increaseSelectionListLevelEv

trunk/Source/WebCore/editing/Editor.h

@@ -433 +433 @@
     void takeFindStringFromSelection();
     void readSelectionFromPasteboard(const String& pasteboardName);
+    void replaceNodeFromPasteboard(Node*, const String& pasteboardName);
     PassRefPtr<SharedBuffer> dataSelectionForPasteboard(const String& pasteboardName);
 #endif // !PLATFORM(IOS)

trunk/Source/WebCore/editing/mac/EditorMac.mm

@@ -266 +266 @@
 }
 
+void Editor::replaceNodeFromPasteboard(Node* node, const String& pasteboardName)
+{
+    ASSERT(node);
+
+    if (&node->document() != m_frame.document())
+        return;
+
+    RefPtr<Range> range = Range::create(node->document(), Position(node, Position::PositionIsBeforeAnchor), Position(node, Position::PositionIsAfterAnchor));
+    m_frame.selection().setSelection(VisibleSelection(range.get()), FrameSelection::DoNotSetFocus);
+
+    readSelectionFromPasteboard(pasteboardName);
+}
+
 // FIXME: Makes no sense that selectedTextForDataTransfer always includes alt text, but stringSelectionForPasteboard does not.
 // This was left in a bad state when selectedTextForDataTransfer was added. Need to look over clients and fix this.

trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp

@@ -112 +112 @@
             return;
 
-        ContainerNode* parent = parentNode();
-        Element* hostElement = nullptr;
-        while (parent) {
-            if (parent->isShadowRoot()) {
-                hostElement = static_cast<ShadowRoot*>(parent)->hostElement();
-                break;
-            }
-            parent = parent->parentNode();
-        }
-
-        if (!hostElement)
-            return;
-        ASSERT(isHTMLImageElement(hostElement));
-
-        RefPtr<Range> range = Range::create(document(), Position(hostElement, Position::PositionIsBeforeAnchor), Position(hostElement, Position::PositionIsAfterAnchor));
-        frame->selection().setSelection(VisibleSelection(range.get()));
-
         page->contextMenuController().showImageControlsMenu(event);
         event->setDefaultHandled();

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-05-06  Brady Eidson  <beidson@apple.com>
+
+        Don't select an image that is about to have its menu shown.
+        <rdar://problem/16807845> and https://bugs.webkit.org/show_bug.cgi?id=132579
+
+        Reviewed by Tim Horton.
+
+        * Misc/WebSharingServicePickerController.mm:
+        (-[WebSharingServicePickerController didShareImageData:confirmDataIsValidTIFFData:]):
+          Call the new replaceNodeFromPasteboard API instead of readSelectionFromPasteboard.
+
 2014-05-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm

@@ -32 +32 @@
 #import <AppKit/NSSharingService.h>
 #import <WebCore/BitmapImage.h>
+#import <WebCore/Document.h>
 #import <WebCore/Editor.h>
 #import <WebCore/FocusController.h>
@@ -121 +122 @@
     [pasteboard setData:data forType:NSPasteboardTypeTIFF];
 
-    Frame& frame = page->focusController().focusedOrMainFrame();
-    if (!frame.selection().isNone())
-        frame.editor().readSelectionFromPasteboard(serviceControlsPasteboardName);
+    if (Node* node = page->contextMenuController().context().hitTestResult().innerNode()) {
+        if (Frame* frame = node->document().frame())
+            frame->editor().replaceNodeFromPasteboard(node, serviceControlsPasteboardName);
+    }
 
     [self clear];