<!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>[170168] 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/170168">170168</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-19 17:49:16 -0700 (Thu, 19 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a single map for all callback types in WebPageProxy
https://bugs.webkit.org/show_bug.cgi?id=134069
Reviewed by Tim Horton.
* UIProcess/GenericCallback.h:
(WebKit::CallbackMap::take):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::printFinishedCallback):
(WebKit::WebPageProxy::resetState):
(WebKit::WebPageProxy::drawPagesForPrinting):
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):
(WebKit::WebPageProxy::attributedStringForCharacterRangeCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.h</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="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170167 => 170168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-19 23:42:24 UTC (rev 170167)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 00:49:16 UTC (rev 170168)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-19 Dan Bernstein <mitz@apple.com>
+
+ Use a single map for all callback types in WebPageProxy
+ https://bugs.webkit.org/show_bug.cgi?id=134069
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::CallbackMap::take):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::printFinishedCallback):
+ (WebKit::WebPageProxy::resetState):
+ (WebKit::WebPageProxy::drawPagesForPrinting):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):
+ (WebKit::WebPageProxy::attributedStringForCharacterRangeCallback):
+
</ins><span class="cx"> 2014-06-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Another build fix attempt.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (170167 => 170168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-19 23:42:24 UTC (rev 170167)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-20 00:49:16 UTC (rev 170168)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class T>
</span><del>- typename std::enable_if<std::is_base_of<CallbackBase, T>::value, RefPtr<T>>::type take(uint64_t callbackID)
</del><ins>+ RefPtr<T> take(uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CallbackBase> base = m_map.take(callbackID);
</span><span class="cx"> if (!base)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170167 => 170168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-19 23:42:24 UTC (rev 170167)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-20 00:49:16 UTC (rev 170168)
</span><span class="lines">@@ -4125,7 +4125,7 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void WebPageProxy::printFinishedCallback(const ResourceError& printError, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- RefPtr<PrintFinishedCallback> callback = m_printFinishedCallbacks.take(callbackID);
</del><ins>+ auto callback = m_callbacks.take<PrintFinishedCallback>(callbackID);
</ins><span class="cx"> if (!callback) {
</span><span class="cx"> // FIXME: Log error or assert.
</span><span class="cx"> return;
</span><span class="lines">@@ -4283,12 +4283,6 @@
</span><span class="cx">
</span><span class="cx"> m_callbacks.invalidate(error);
</span><span class="cx"> m_loadDependentStringCallbackIDs.clear();
</span><del>-#if PLATFORM(MAC)
- invalidateCallbackMap(m_attributedStringForCharacterRangeCallbacks, error);
-#endif
-#if PLATFORM(GTK)
- invalidateCallbackMap(m_printFinishedCallbacks, error);
-#endif
</del><span class="cx">
</span><span class="cx"> Vector<WebEditCommandProxy*> editCommandVector;
</span><span class="cx"> copyToVector(m_editCommandSet, editCommandVector);
</span><span class="lines">@@ -4743,7 +4737,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><del>- m_printFinishedCallbacks.set(callbackID, callback);
</del><ins>+ m_callbacks.put(callback);
</ins><span class="cx"> m_isInPrintingMode = true;
</span><span class="cx"> m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170167 => 170168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-19 23:42:24 UTC (rev 170167)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-20 00:49:16 UTC (rev 170168)
</span><span class="lines">@@ -1304,12 +1304,6 @@
</span><span class="cx">
</span><span class="cx"> CallbackMap m_callbacks;
</span><span class="cx"> HashSet<uint64_t> m_loadDependentStringCallbackIDs;
</span><del>-#if PLATFORM(MAC)
- HashMap<uint64_t, RefPtr<AttributedStringForCharacterRangeCallback>> m_attributedStringForCharacterRangeCallbacks;
-#endif
-#if PLATFORM(GTK)
- HashMap<uint64_t, RefPtr<PrintFinishedCallback>> m_printFinishedCallbacks;
-#endif
</del><span class="cx">
</span><span class="cx"> HashSet<WebEditCommandProxy*> m_editCommandSet;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (170167 => 170168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-19 23:42:24 UTC (rev 170167)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-20 00:49:16 UTC (rev 170168)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><del>- m_attributedStringForCharacterRangeCallbacks.set(callbackID, callback);
</del><ins>+ m_callbacks.put(callback);
</ins><span class="cx">
</span><span class="cx"> process().send(Messages::WebPage::AttributedSubstringForCharacterRangeAsync(range, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(actualRange.isValid());
</span><span class="cx">
</span><del>- RefPtr<AttributedStringForCharacterRangeCallback> callback = m_attributedStringForCharacterRangeCallbacks.take(callbackID);
</del><ins>+ auto callback = m_callbacks.take<AttributedStringForCharacterRangeCallback>(callbackID);
</ins><span class="cx"> if (!callback) {
</span><span class="cx"> // FIXME: Log error or assert.
</span><span class="cx"> // this can validly happen if a load invalidated the callback, though
</span></span></pre>
</div>
</div>
</body>
</html>