<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168378] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168378">168378</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 14:08:14 -0700 (Tue, 06 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't select an image that is about to have its menu shown.
&lt;rdar://problem/16807845&gt; 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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllermm">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebCore/ChangeLog        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-06  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Don't select an image that is about to have its menu shown.
+        &lt;rdar://problem/16807845&gt; 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.
+
</ins><span class="cx"> 2014-05-06  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Mac] make metadata cue attributes consistent
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebCore/WebCore.exp.in        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -1160,6 +1160,7 @@
</span><span class="cx"> __ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_15StylePropertiesENS_10EditActionE
</span><span class="cx"> __ZN7WebCore6Editor24isSelectionUngrammaticalEv
</span><span class="cx"> __ZN7WebCore6Editor24replaceSelectionWithTextERKN3WTF6StringEbb
</span><ins>+__ZN7WebCore6Editor25replaceNodeFromPasteboardEPNS_4NodeERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore6Editor26decreaseSelectionListLevelEv
</span><span class="cx"> __ZN7WebCore6Editor26increaseSelectionListLevelEv
</span><span class="cx"> __ZN7WebCore6Editor26toggleOverwriteModeEnabledEv
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebCore/editing/Editor.h        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -432,6 +432,7 @@
</span><span class="cx">     bool canCopyExcludingStandaloneImages();
</span><span class="cx">     void takeFindStringFromSelection();
</span><span class="cx">     void readSelectionFromPasteboard(const String&amp; pasteboardName);
</span><ins>+    void replaceNodeFromPasteboard(Node*, const String&amp; pasteboardName);
</ins><span class="cx">     PassRefPtr&lt;SharedBuffer&gt; dataSelectionForPasteboard(const String&amp; pasteboardName);
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -265,6 +265,19 @@
</span><span class="cx">         pasteAsPlainTextWithPasteboard(pasteboard);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Editor::replaceNodeFromPasteboard(Node* node, const String&amp; pasteboardName)
+{
+    ASSERT(node);
+
+    if (&amp;node-&gt;document() != m_frame.document())
+        return;
+
+    RefPtr&lt;Range&gt; range = Range::create(node-&gt;document(), Position(node, Position::PositionIsBeforeAnchor), Position(node, Position::PositionIsAfterAnchor));
+    m_frame.selection().setSelection(VisibleSelection(range.get()), FrameSelection::DoNotSetFocus);
+
+    readSelectionFromPasteboard(pasteboardName);
+}
+
</ins><span class="cx"> // FIXME: Makes no sense that selectedTextForDataTransfer always includes alt text, but stringSelectionForPasteboard does not.
</span><span class="cx"> // This was left in a bad state when selectedTextForDataTransfer was added. Need to look over clients and fix this.
</span><span class="cx"> String Editor::stringSelectionForPasteboard()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -111,23 +111,6 @@
</span><span class="cx">         if (!page)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        ContainerNode* parent = parentNode();
-        Element* hostElement = nullptr;
-        while (parent) {
-            if (parent-&gt;isShadowRoot()) {
-                hostElement = static_cast&lt;ShadowRoot*&gt;(parent)-&gt;hostElement();
-                break;
-            }
-            parent = parent-&gt;parentNode();
-        }
-
-        if (!hostElement)
-            return;
-        ASSERT(isHTMLImageElement(hostElement));
-
-        RefPtr&lt;Range&gt; range = Range::create(document(), Position(hostElement, Position::PositionIsBeforeAnchor), Position(hostElement, Position::PositionIsAfterAnchor));
-        frame-&gt;selection().setSelection(VisibleSelection(range.get()));
-
</del><span class="cx">         page-&gt;contextMenuController().showImageControlsMenu(event);
</span><span class="cx">         event-&gt;setDefaultHandled();
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-06  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Don't select an image that is about to have its menu shown.
+        &lt;rdar://problem/16807845&gt; 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.
+
</ins><span class="cx"> 2014-05-06  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Move the WebKitLegacy header check to the right file
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (168377 => 168378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm        2014-05-06 20:19:31 UTC (rev 168377)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm        2014-05-06 21:08:14 UTC (rev 168378)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import &quot;WebViewInternal.h&quot;
</span><span class="cx"> #import &lt;AppKit/NSSharingService.h&gt;
</span><span class="cx"> #import &lt;WebCore/BitmapImage.h&gt;
</span><ins>+#import &lt;WebCore/Document.h&gt;
</ins><span class="cx"> #import &lt;WebCore/Editor.h&gt;
</span><span class="cx"> #import &lt;WebCore/FocusController.h&gt;
</span><span class="cx"> #import &lt;WebCore/Frame.h&gt;
</span><span class="lines">@@ -120,9 +121,10 @@
</span><span class="cx">     [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
</span><span class="cx">     [pasteboard setData:data forType:NSPasteboardTypeTIFF];
</span><span class="cx"> 
</span><del>-    Frame&amp; frame = page-&gt;focusController().focusedOrMainFrame();
-    if (!frame.selection().isNone())
-        frame.editor().readSelectionFromPasteboard(serviceControlsPasteboardName);
</del><ins>+    if (Node* node = page-&gt;contextMenuController().context().hitTestResult().innerNode()) {
+        if (Frame* frame = node-&gt;document().frame())
+            frame-&gt;editor().replaceNodeFromPasteboard(node, serviceControlsPasteboardName);
+    }
</ins><span class="cx"> 
</span><span class="cx">     [self clear];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>