<!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>[169990] 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/169990">169990</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-15 11:07:09 -0700 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>invalidateCallbackMap doesn’t pass the error parameter on to invalidate(), so script completion handler is passed the wrong error
https://bugs.webkit.org/show_bug.cgi?id=133921
<rdar://problem/17316653>
Reviewed by Dan Bernstein.
* UIProcess/GenericCallback.h:
(WebKit::VoidCallback::performCallback):
(WebKit::VoidCallback::invalidate):
(WebKit::VoidAPICallback::create):
(WebKit::invalidateCallbackMap):
* UIProcess/Plugins/WebPluginSiteDataManager.cpp:
(WebKit::WebPluginSiteDataManager::invalidate):
(WebKit::WebPluginSiteDataManager::clearSiteData):
* UIProcess/WebApplicationCacheManagerProxy.cpp:
(WebKit::WebApplicationCacheManagerProxy::contextDestroyed):
(WebKit::WebApplicationCacheManagerProxy::processDidClose):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::~WebContext):
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::contextDestroyed):
(WebKit::WebCookieManagerProxy::processDidClose):
* UIProcess/WebDatabaseManagerProxy.cpp:
(WebKit::WebDatabaseManagerProxy::contextDestroyed):
(WebKit::WebDatabaseManagerProxy::processDidClose):
* UIProcess/WebMediaCacheManagerProxy.cpp:
(WebKit::WebMediaCacheManagerProxy::contextDestroyed):
(WebKit::WebMediaCacheManagerProxy::processDidClose):
* UIProcess/WebOriginDataManagerProxy.cpp:
(WebKit::WebOriginDataManagerProxy::contextDestroyed):
(WebKit::WebOriginDataManagerProxy::processDidClose):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::forceRepaint):
(WebKit::WebPageProxy::resetState):
* UIProcess/WebResourceCacheManagerProxy.cpp:
(WebKit::WebResourceCacheManagerProxy::contextDestroyed):
(WebKit::WebResourceCacheManagerProxy::processDidClose):
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController dealloc]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):</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="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-06-15 Anders Carlsson <andersca@apple.com>
+
+ invalidateCallbackMap doesn’t pass the error parameter on to invalidate(), so script completion handler is passed the wrong error
+ https://bugs.webkit.org/show_bug.cgi?id=133921
+ <rdar://problem/17316653>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::VoidCallback::performCallback):
+ (WebKit::VoidCallback::invalidate):
+ (WebKit::VoidAPICallback::create):
+ (WebKit::invalidateCallbackMap):
+ * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+ (WebKit::WebPluginSiteDataManager::invalidate):
+ (WebKit::WebPluginSiteDataManager::clearSiteData):
+ * UIProcess/WebApplicationCacheManagerProxy.cpp:
+ (WebKit::WebApplicationCacheManagerProxy::contextDestroyed):
+ (WebKit::WebApplicationCacheManagerProxy::processDidClose):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::~WebContext):
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::contextDestroyed):
+ (WebKit::WebCookieManagerProxy::processDidClose):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::contextDestroyed):
+ (WebKit::WebDatabaseManagerProxy::processDidClose):
+ * UIProcess/WebMediaCacheManagerProxy.cpp:
+ (WebKit::WebMediaCacheManagerProxy::contextDestroyed):
+ (WebKit::WebMediaCacheManagerProxy::processDidClose):
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::WebOriginDataManagerProxy::contextDestroyed):
+ (WebKit::WebOriginDataManagerProxy::processDidClose):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::forceRepaint):
+ (WebKit::WebPageProxy::resetState):
+ * UIProcess/WebResourceCacheManagerProxy.cpp:
+ (WebKit::WebResourceCacheManagerProxy::contextDestroyed):
+ (WebKit::WebResourceCacheManagerProxy::processDidClose):
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController dealloc]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+
</ins><span class="cx"> 2014-06-15 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for the GTK+ port after r169987.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> class VoidCallback : public CallbackBase {
</span><span class="cx"> public:
</span><del>- typedef std::function<void (bool)> CallbackFunction;
</del><ins>+ typedef std::function<void (Error)> CallbackFunction;
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<VoidCallback> create(CallbackFunction callback)
</span><span class="cx"> {
</span><span class="lines">@@ -88,17 +88,17 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_callback(false);
</del><ins>+ m_callback(Error::None);
</ins><span class="cx">
</span><span class="cx"> m_callback = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void invalidate()
</del><ins>+ void invalidate(Error error)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_callback(true);
</del><ins>+ m_callback(error);
</ins><span class="cx">
</span><span class="cx"> m_callback = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<VoidCallback> create(void* context, CallbackFunction callback)
</span><span class="cx"> {
</span><del>- return VoidCallback::create([context, callback](bool error) {
- callback(error ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ return VoidCallback::create([context, callback](Error error) {
+ callback(error != Error::None ? toAPI(API::Error::create().get()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -180,13 +180,14 @@
</span><span class="cx"> typedef GenericCallback<const ShareableBitmap::Handle&> ImageCallback;
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-void invalidateCallbackMap(HashMap<uint64_t, T>& map, CallbackBase::Error error = CallbackBase::Error::Unknown)
</del><ins>+void invalidateCallbackMap(HashMap<uint64_t, T>& callbackMap, CallbackBase::Error error)
</ins><span class="cx"> {
</span><del>- Vector<T> callbacksVector;
- copyValuesToVector(map, callbacksVector);
- for (size_t i = 0, size = callbacksVector.size(); i < size; ++i)
- callbacksVector[i]->invalidate();
- map.clear();
</del><ins>+ Vector<T> callbacks;
+ copyValuesToVector(callbackMap, callbacks);
+ for (auto& callback : callbacks)
+ callback->invalidate(error);
+
+ callbackMap.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPluginSiteDataManager::invalidate()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx">
</span><span class="cx"> m_pendingGetSitesWithData.clear();
</span><span class="cx"> m_pendingClearSiteData.clear();
</span><span class="lines">@@ -172,7 +172,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<VoidCallback> callback = prpCallback;
</span><span class="cx"> if (!m_webContext) {
</span><del>- callback->invalidate();
</del><ins>+ // FIXME: If the context is invalid we should not call the callback. It'd be better to just return false from clearSiteData.
+ callback->invalidate(CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebApplicationCacheManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> m_pluginSiteDataManager->clearContext();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- invalidateCallbackMap(m_dictionaryCallbacks);
</del><ins>+ invalidateCallbackMap(m_dictionaryCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx">
</span><span class="cx"> platformInvalidateContext();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -67,20 +67,20 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
- invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
+ invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
- invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::processDidClose(NetworkProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
- invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -129,12 +129,12 @@
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebDatabaseManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -58,12 +58,12 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaCacheManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaCacheManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebMediaCacheManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebOriginDataManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -2335,7 +2335,8 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<VoidCallback> callback = prpCallback;
</span><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ // FIXME: If the page is invalid we should not call the callback. It'd be better to just return false from forceRepaint.
+ callback->invalidate(CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4278,19 +4279,19 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- invalidateCallbackMap(m_voidCallbacks);
- invalidateCallbackMap(m_dataCallbacks);
- invalidateCallbackMap(m_imageCallbacks);
- invalidateCallbackMap(m_stringCallbacks);
</del><ins>+ invalidateCallbackMap(m_voidCallbacks, error);
+ invalidateCallbackMap(m_dataCallbacks, error);
+ invalidateCallbackMap(m_imageCallbacks, error);
+ invalidateCallbackMap(m_stringCallbacks, error);
</ins><span class="cx"> m_loadDependentStringCallbackIDs.clear();
</span><span class="cx"> invalidateCallbackMap(m_scriptValueCallbacks, error);
</span><del>- invalidateCallbackMap(m_computedPagesCallbacks);
- invalidateCallbackMap(m_validateCommandCallbacks);
- invalidateCallbackMap(m_unsignedCallbacks);
- invalidateCallbackMap(m_editingRangeCallbacks);
- invalidateCallbackMap(m_rectForCharacterRangeCallbacks);
</del><ins>+ invalidateCallbackMap(m_computedPagesCallbacks, error);
+ invalidateCallbackMap(m_validateCommandCallbacks, error);
+ invalidateCallbackMap(m_unsignedCallbacks, error);
+ invalidateCallbackMap(m_editingRangeCallbacks, error);
+ invalidateCallbackMap(m_rectForCharacterRangeCallbacks, error);
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- invalidateCallbackMap(m_attributedStringForCharacterRangeCallbacks);
</del><ins>+ invalidateCallbackMap(m_attributedStringForCharacterRangeCallbacks, error);
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> invalidateCallbackMap(m_gestureCallbacks);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -65,12 +65,12 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceCacheManagerProxy::contextDestroyed()
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceCacheManagerProxy::processDidClose(WebProcessProxy*)
</span><span class="cx"> {
</span><del>- invalidateCallbackMap(m_arrayCallbacks);
</del><ins>+ invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebResourceCacheManagerProxy::shouldTerminate(WebProcessProxy*) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (169989 => 169990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-06-15 16:33:58 UTC (rev 169989)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-06-15 18:07:09 UTC (rev 169990)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self];
</span><span class="cx">
</span><span class="cx"> if (_repaintCallback) {
</span><del>- _repaintCallback->invalidate();
</del><ins>+ _repaintCallback->invalidate(CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> // invalidate() calls completeFinishExitFullScreenAnimationAfterRepaint, which
</span><span class="cx"> // clears _repaintCallback.
</span><span class="cx"> ASSERT(!_repaintCallback);
</span><span class="lines">@@ -409,12 +409,12 @@
</span><span class="cx"> [self _manager]->restoreScrollPosition();
</span><span class="cx">
</span><span class="cx"> if (_repaintCallback) {
</span><del>- _repaintCallback->invalidate();
</del><ins>+ _repaintCallback->invalidate(CallbackBase::Error::OwnerWasInvalidated);
</ins><span class="cx"> // invalidate() calls completeFinishExitFullScreenAnimationAfterRepaint, which
</span><span class="cx"> // clears _repaintCallback.
</span><span class="cx"> ASSERT(!_repaintCallback);
</span><span class="cx"> }
</span><del>- _repaintCallback = VoidCallback::create([self](bool) {
</del><ins>+ _repaintCallback = VoidCallback::create([self](CallbackBase::Error) {
</ins><span class="cx"> [self completeFinishExitFullScreenAnimationAfterRepaint];
</span><span class="cx"> });
</span><span class="cx"> [self _page]->forceRepaint(_repaintCallback);
</span></span></pre>
</div>
</div>
</body>
</html>