<!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>[177708] trunk/Source/WebKit2</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/177708">177708</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 17:00:20 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ContextMenuContextData should store a ShareableBitmap not a ShareableBitmap::Handle
https://bugs.webkit.org/show_bug.cgi?id=139924
Reviewed by Anders Carlsson.
Replaces the ShareableBitmap::Handle in ContextMenuContextData with a RefPtr<ShareableBitmap>.
Removes the now unnecessary override copy-constructor and assignment-operator.
* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::encode):
(WebKit::ContextMenuContextData::decode):
(WebKit::ContextMenuContextData::controlledDataIsEditable):
(WebKit::ContextMenuContextData::operator=): Deleted.
* Shared/ContextMenuContextData.h:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::controlledImage):
(WebKit::ContextMenuContextData::needsServicesMenu):
(WebKit::ContextMenuContextData::controlledImageHandle): Deleted.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatah">trunk/Source/WebKit2/Shared/ContextMenuContextData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177707 => 177708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-24 00:46:18 UTC (rev 177707)
+++ trunk/Source/WebKit2/ChangeLog        2014-12-24 01:00:20 UTC (rev 177708)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-12-23 Sam Weinig <sam@webkit.org>
+
+ ContextMenuContextData should store a ShareableBitmap not a ShareableBitmap::Handle
+ https://bugs.webkit.org/show_bug.cgi?id=139924
+
+ Reviewed by Anders Carlsson.
+
+ Replaces the ShareableBitmap::Handle in ContextMenuContextData with a RefPtr<ShareableBitmap>.
+ Removes the now unnecessary override copy-constructor and assignment-operator.
+
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::encode):
+ (WebKit::ContextMenuContextData::decode):
+ (WebKit::ContextMenuContextData::controlledDataIsEditable):
+ (WebKit::ContextMenuContextData::operator=): Deleted.
+ * Shared/ContextMenuContextData.h:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::controlledImage):
+ (WebKit::ContextMenuContextData::needsServicesMenu):
+ (WebKit::ContextMenuContextData::controlledImageHandle): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+
</ins><span class="cx"> 2014-12-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS build fix after 177692.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (177707 => 177708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp        2014-12-24 00:46:18 UTC (rev 177707)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp        2014-12-24 01:00:20 UTC (rev 177708)
</span><span class="lines">@@ -64,37 +64,13 @@
</span><span class="cx"> Image* image = context.controlledImage();
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> // FIXME: figure out the rounding startegy for ShareableBitmap.
</span><del>- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
- bitmap->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
- bitmap->createHandle(m_controlledImageHandle);
</del><ins>+ m_controlledImage = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
+ m_controlledImage->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuContextData::ContextMenuContextData(const ContextMenuContextData& other)
-{
- *this = other;
-}
-
-ContextMenuContextData& ContextMenuContextData::operator=(const ContextMenuContextData& other)
-{
- m_webHitTestResultData = other.m_webHitTestResultData;
- m_isTelephoneNumberContext = other.m_isTelephoneNumberContext;
-
-#if ENABLE(SERVICE_CONTROLS)
- m_controlledImageHandle.clear();
-
- if (!other.m_controlledImageHandle.isNull()) {
- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(other.m_controlledImageHandle);
- bitmap->createHandle(m_controlledImageHandle);
- }
-
- m_selectionIsEditable = other.m_selectionIsEditable;
-#endif
-
- return *this;
-}
-
</del><span class="cx"> void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_webHitTestResultData;
</span><span class="lines">@@ -104,7 +80,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- encoder << m_controlledImageHandle;
</del><ins>+ ShareableBitmap::Handle handle;
+ if (m_controlledImage)
+ m_controlledImage->createHandle(handle, SharedMemory::ReadOnly);
+ encoder << handle;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,8 +98,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- if (!decoder.decode(contextMenuContextData.m_controlledImageHandle))
</del><ins>+ ShareableBitmap::Handle handle;
+ if (!decoder.decode(handle))
</ins><span class="cx"> return false;
</span><ins>+
+ if (!handle.isNull())
+ contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -132,7 +115,7 @@
</span><span class="cx"> if (!m_controlledSelectionData.isEmpty())
</span><span class="cx"> return m_selectionIsEditable;
</span><span class="cx">
</span><del>- if (!m_controlledImageHandle.isNull())
</del><ins>+ if (m_controlledImage)
</ins><span class="cx"> return m_webHitTestResultData.isContentEditable;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (177707 => 177708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.h        2014-12-24 00:46:18 UTC (rev 177707)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.h        2014-12-24 01:00:20 UTC (rev 177708)
</span><span class="lines">@@ -50,9 +50,6 @@
</span><span class="cx"> ContextMenuContextData();
</span><span class="cx"> ContextMenuContextData(TelephoneNumberContextTag);
</span><span class="cx"> ContextMenuContextData(const WebCore::ContextMenuContext&);
</span><del>-
- ContextMenuContextData(const ContextMenuContextData&);
- ContextMenuContextData& operator=(const ContextMenuContextData&);
</del><span class="cx">
</span><span class="cx"> const WebHitTestResult::Data& webHitTestResultData() const { return m_webHitTestResultData; }
</span><span class="cx">
</span><span class="lines">@@ -62,14 +59,15 @@
</span><span class="cx"> , m_controlledSelectionData(selectionData)
</span><span class="cx"> , m_selectedTelephoneNumbers(selectedTelephoneNumbers)
</span><span class="cx"> , m_selectionIsEditable(isEditable)
</span><del>- { }
</del><ins>+ {
+ }
</ins><span class="cx">
</span><del>- const ShareableBitmap::Handle& controlledImageHandle() const { return m_controlledImageHandle; }
</del><ins>+ ShareableBitmap* controlledImage() const { return m_controlledImage.get(); }
</ins><span class="cx"> const Vector<uint8_t>& controlledSelectionData() const { return m_controlledSelectionData; }
</span><span class="cx"> const Vector<String>& selectedTelephoneNumbers() const { return m_selectedTelephoneNumbers; }
</span><span class="cx">
</span><span class="cx"> bool controlledDataIsEditable() const;
</span><del>- bool needsServicesMenu() const { return !m_controlledImageHandle.isNull() || !m_controlledSelectionData.isEmpty(); }
</del><ins>+ bool needsServicesMenu() const { return m_controlledImage || !m_controlledSelectionData.isEmpty(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span><span class="lines">@@ -80,12 +78,11 @@
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-
</del><span class="cx"> WebHitTestResult::Data m_webHitTestResultData;
</span><span class="cx"> bool m_isTelephoneNumberContext;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- ShareableBitmap::Handle m_controlledImageHandle;
</del><ins>+ RefPtr<ShareableBitmap> m_controlledImage;
</ins><span class="cx"> Vector<uint8_t> m_controlledSelectionData;
</span><span class="cx"> Vector<String> m_selectedTelephoneNumbers;
</span><span class="cx"> bool m_selectionIsEditable;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177707 => 177708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-12-24 00:46:18 UTC (rev 177707)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-12-24 01:00:20 UTC (rev 177708)
</span><span class="lines">@@ -3913,7 +3913,7 @@
</span><span class="cx"> bool useProposedItems = true;
</span><span class="cx"> bool askClientToChangeMenu = clientEligibility == ContextMenuClientEligibility::EligibleForClient;
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- if (!contextMenuContextData.controlledImageHandle().isNull())
</del><ins>+ if (contextMenuContextData.controlledImage())
</ins><span class="cx"> askClientToChangeMenu = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (177707 => 177708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm        2014-12-24 00:46:18 UTC (rev 177707)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm        2014-12-24 01:00:20 UTC (rev 177708)
</span><span class="lines">@@ -354,10 +354,10 @@
</span><span class="cx"> void WebContextMenuProxyMac::setupServicesMenu(const ContextMenuContextData& context)
</span><span class="cx"> {
</span><span class="cx"> bool includeEditorServices = context.controlledDataIsEditable();
</span><del>- bool hasControlledImage = !context.controlledImageHandle().isNull();
</del><ins>+ bool hasControlledImage = context.controlledImage();
</ins><span class="cx"> NSArray *items = nil;
</span><span class="cx"> if (hasControlledImage) {
</span><del>- RefPtr<ShareableBitmap> image = ShareableBitmap::create(context.controlledImageHandle());
</del><ins>+ RefPtr<ShareableBitmap> image = context.controlledImage();
</ins><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>