<!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>[167686] 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/167686">167686</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-22 15:05:46 -0700 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/167674">r167674</a>.
https://bugs.webkit.org/show_bug.cgi?id=132025
Going a different way with this (Requested by bradee-oh on
#webkit).
Reverted changeset:
"Change Image Controls replacement to use selection and paste"
https://bugs.webkit.org/show_bug.cgi?id=131992
http://trac.webkit.org/changeset/167674</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="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllerh">trunk/Source/WebCore/page/ContextMenuController.h</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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenuh">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-22 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167674.
+ https://bugs.webkit.org/show_bug.cgi?id=132025
+
+ Going a different way with this (Requested by bradee-oh on
+ #webkit).
+
+ Reverted changeset:
+
+ "Change Image Controls replacement to use selection and paste"
+ https://bugs.webkit.org/show_bug.cgi?id=131992
+ http://trac.webkit.org/changeset/167674
+
</ins><span class="cx"> 2014-04-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Support Python 2.7 in Cygwin
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -2987,6 +2987,10 @@
</span><span class="cx"> __ZNK7WebCore12IconDatabase9isEnabledEv
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+__ZN7WebCore21ContextMenuController22replaceControlledImageEN3WTF10PassRefPtrINS_5ImageEEE
+#endif
+
</ins><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> __ZN7WebCore10IDBKeyData14setNumberValueEd
</span><span class="cx"> __ZN7WebCore10IDBKeyData6decodeERNS_12KeyedDecoderERS0_
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -30,15 +30,11 @@
</span><span class="cx">
</span><span class="cx"> #include "ContextMenuController.h"
</span><span class="cx"> #include "Event.h"
</span><del>-#include "Frame.h"
-#include "FrameSelection.h"
</del><span class="cx"> #include "HTMLDivElement.h"
</span><span class="cx"> #include "Page.h"
</span><del>-#include "Range.h"
</del><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><del>-#include "ShadowRoot.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -103,33 +99,8 @@
</span><span class="cx"> void ImageControlsButtonElementMac::defaultEventHandler(Event* event)
</span><span class="cx"> {
</span><span class="cx"> if (event->type() == eventNames().clickEvent) {
</span><del>- // Before showing the menu, change the current selection to the represented Image element.
- 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));
-
- Frame* frame = document().frame();
- if (!frame)
- return;
-
- Page* page = document().page();
- if (!page)
- return;
-
- RefPtr<Range> range = Range::create(document(), Position(hostElement, Position::PositionIsBeforeAnchor), Position(hostElement, Position::PositionIsAfterAnchor));
- frame->selection().setSelection(VisibleSelection(range.get()));
-
- page->contextMenuController().showImageControlsMenu(event);
</del><ins>+ if (Page* page = document().page())
+ page->contextMenuController().showImageControlsMenu(event);
</ins><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -1452,6 +1452,24 @@
</span><span class="cx"> handleContextMenuEvent(event);
</span><span class="cx"> m_client.showContextMenu();
</span><span class="cx"> }
</span><ins>+
+void ContextMenuController::replaceControlledImage(PassRefPtr<Image> newImage)
+{
+ Node* node = m_context.hitTestResult().innerNonSharedNode();
+ if (!node)
+ return;
+
+ Frame* frame = node->document().frame();
+ if (!frame)
+ return;
+
+ RenderObject* renderer = node->renderer();
+ if (!renderer || !renderer->isRenderImage())
+ return;
+
+ CachedResourceHandle<CachedImage> replacedImage = new CachedImage(URL::fakeURLWithRelativePart("image"), newImage.get(), frame->page()->sessionID());
+ toRenderImage(renderer)->imageResource().setCachedImage(replacedImage.get());
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.h (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.h 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebCore/page/ContextMenuController.h 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)
</span><span class="cx"> void showImageControlsMenu(Event*);
</span><ins>+ void replaceControlledImage(PassRefPtr<Image>);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-22 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167674.
+ https://bugs.webkit.org/show_bug.cgi?id=132025
+
+ Going a different way with this (Requested by bradee-oh on
+ #webkit).
+
+ Reverted changeset:
+
+ "Change Image Controls replacement to use selection and paste"
+ https://bugs.webkit.org/show_bug.cgi?id=131992
+ http://trac.webkit.org/changeset/167674
+
</ins><span class="cx"> 2014-04-22 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Change Image Controls replacement to use selection and paste
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <AppKit/NSSharingService.h>
</span><span class="cx"> #import <WebCore/BitmapImage.h>
</span><del>-#import <WebCore/Editor.h>
-#import <WebCore/FocusController.h>
-#import <WebCore/Frame.h>
-#import <WebCore/FrameSelection.h>
</del><span class="cx"> #import <WebCore/ContextMenuController.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx">
</span><span class="lines">@@ -52,8 +48,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static NSString *imageControlPasteboardName = @"WebKitImageControlsPasteboard";
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @implementation WebSharingServicePickerController
</span><span class="lines">@@ -125,22 +119,14 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGImageSourceRef> source = adoptCF(CGImageSourceCreateWithData((CFDataRef)[items objectAtIndex:0], NULL));
</span><span class="cx"> RetainPtr<CGImageRef> cgImage = adoptCF(CGImageSourceCreateImageAtIndex(source.get(), 0, NULL));
</span><ins>+ RefPtr<Image> image = BitmapImage::create(cgImage.get());
</ins><span class="cx">
</span><del>- if (!cgImage)
- return;
-
</del><span class="cx"> Page* page = [_menuClient->webView() page];
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:imageControlPasteboardName];
- [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
- [pasteboard setData:[items objectAtIndex:0] forType:NSPasteboardTypeTIFF];
</del><ins>+ page->contextMenuController().replaceControlledImage(image.get());
</ins><span class="cx">
</span><del>- Frame& frame = page->focusController().focusedOrMainFrame();
- if (!frame.selection().isNone())
- frame.editor().readSelectionFromPasteboard(imageControlPasteboardName);
-
</del><span class="cx"> [self clear];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-22 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167674.
+ https://bugs.webkit.org/show_bug.cgi?id=132025
+
+ Going a different way with this (Requested by bradee-oh on
+ #webkit).
+
+ Reverted changeset:
+
+ "Change Image Controls replacement to use selection and paste"
+ https://bugs.webkit.org/show_bug.cgi?id=131992
+ http://trac.webkit.org/changeset/167674
+
</ins><span class="cx"> 2014-04-22 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused local variable
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -3445,6 +3445,16 @@
</span><span class="cx"> m_contextMenuClient.contextMenuDismissed(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+void WebPageProxy::replaceControlledImage(PassRefPtr<ShareableBitmap> newBitmap)
+{
+ RefPtr<ShareableBitmap> bitmap = newBitmap;
+ ShareableBitmap::Handle bitmapHandle;
+ bitmap->createHandle(bitmapHandle);
+ m_process->send(Messages::WebPage::ReplaceControlledImage(bitmapHandle), m_pageID);
+}
+#endif
+
</ins><span class="cx"> void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="cx"> {
</span><span class="cx"> // Application custom items don't need to round-trip through to WebCore in the WebProcess.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -1059,6 +1059,10 @@
</span><span class="cx">
</span><span class="cx"> void takeSnapshot(WebCore::IntRect, WebCore::IntSize bitmapSize, SnapshotOptions, ImageCallback::CallbackFunction);
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ void replaceControlledImage(PassRefPtr<ShareableBitmap>);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, const WebPageConfiguration&);
</span><span class="cx"> void platformInitialize();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)
</span><span class="cx"> void clearImageServicesMenu();
</span><ins>+ void replaceControlledImage(CGImageRef newImage);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebPageProxy& page() const { return *m_page; }
</del><span class="cx"> NSWindow *window() const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -56,11 +56,8 @@
</span><span class="cx"> @property NSSharingServicePickerStyle style;
</span><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><del>-static NSString *imageControlPasteboardName = @"WebKitImageControlsPasteboard";
-
-#endif // ENABLE(IMAGE_CONTROLS)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @interface WKUserDataWrapper : NSObject {
</span><span class="lines">@@ -234,15 +231,7 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CGImageSourceRef> source = adoptCF(CGImageSourceCreateWithData((CFDataRef)[items objectAtIndex:0], NULL));
</span><span class="cx"> RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(source.get(), 0, NULL));
</span><del>-
- if (!image)
- return;
-
- NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:imageControlPasteboardName];
- [pasteboard declareTypes:@[ NSPasteboardTypeTIFF ] owner:nil];
- [pasteboard setData:[items objectAtIndex:0] forType:NSPasteboardTypeTIFF];
-
- _menuProxy->page().readSelectionFromPasteboard(imageControlPasteboardName);
</del><ins>+ _menuProxy->replaceControlledImage(image.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
</span><span class="lines">@@ -260,7 +249,6 @@
</span><span class="cx"> : m_webView(webView)
</span><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><del>- ASSERT(m_page);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebContextMenuProxyMac::~WebContextMenuProxyMac()
</span><span class="lines">@@ -445,6 +433,17 @@
</span><span class="cx"> return [m_webView window];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+void WebContextMenuProxyMac::replaceControlledImage(CGImageRef newImage)
+{
+ FloatSize newImageSize(CGImageGetWidth(newImage), CGImageGetHeight(newImage));
+ RefPtr<ShareableBitmap> newBitmap = ShareableBitmap::createShareable(expandedIntSize(newImageSize), ShareableBitmap::SupportsAlpha);
+ newBitmap->createGraphicsContext()->drawNativeImage(newImage, newImageSize, ColorSpaceDeviceRGB, FloatRect(FloatPoint(), newImageSize), FloatRect(FloatPoint(), newImageSize));
+
+ m_page->replaceControlledImage(newBitmap.release());
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -77,6 +77,13 @@
</span><span class="cx"> m_page->corePage()->contextMenuController().contextMenuItemSelected(&coreItem);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+void WebContextMenu::replaceControlledImage(PassRefPtr<Image> newImage)
+{
+ m_page->corePage()->contextMenuController().replaceControlledImage(newImage);
+}
+#endif
+
</ins><span class="cx"> void WebContextMenu::menuItemsWithUserData(Vector<WebContextMenuItemData> &menuItems, RefPtr<API::Object>& userData) const
</span><span class="cx"> {
</span><span class="cx"> ContextMenuController& controller = m_page->corePage()->contextMenuController();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.h 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> void itemSelected(const WebContextMenuItemData&);
</span><span class="cx"> Vector<WebContextMenuItemData> items() const;
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+ void replaceControlledImage(PassRefPtr<WebCore::Image>);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> WebContextMenu(WebPage*);
</span><span class="cx"> void menuItemsWithUserData(Vector<WebContextMenuItemData>&, RefPtr<API::Object>&) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -3114,6 +3114,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IMAGE_CONTROLS)
+void WebPage::replaceControlledImage(const ShareableBitmap::Handle& bitmapHandle)
+{
+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(bitmapHandle);
+ if (bitmap)
+ m_contextMenu->replaceControlledImage(bitmap->createImage());
+}
+#endif
+
</ins><span class="cx"> void WebPage::replaceSelectionWithText(Frame* frame, const String& text)
</span><span class="cx"> {
</span><span class="cx"> bool selectReplacement = true;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -771,6 +771,10 @@
</span><span class="cx"> PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(WebCore::Frame&, const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
</span><span class="cx">
</span><span class="cx"> void getBytecodeProfile(uint64_t callbackID);
</span><ins>+
+#if ENABLE(IMAGE_CONTROLS)
+ void replaceControlledImage(const ShareableBitmap::Handle&);
+#endif
</ins><span class="cx">
</span><span class="cx"> // Some platforms require accessibility-enabled processes to spin the run loop so that the WebProcess doesn't hang.
</span><span class="cx"> // While this is not ideal, it does not have to be applied to every platform at the moment.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (167685 => 167686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-22 21:58:42 UTC (rev 167685)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-22 22:05:46 UTC (rev 167686)
</span><span class="lines">@@ -362,4 +362,8 @@
</span><span class="cx"> GetBytecodeProfile(uint64_t callbackID)
</span><span class="cx">
</span><span class="cx"> TakeSnapshot(WebCore::IntRect snapshotRect, WebCore::IntSize bitmapSize, uint32_t options, uint64_t callbackID)
</span><ins>+
+#if ENABLE(IMAGE_CONTROLS)
+ ReplaceControlledImage(WebKit::ShareableBitmap::Handle newBitmapHandle)
+#endif
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>