<!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>[169732] 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/169732">169732</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 17:26:48 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give callbacks real status codes
https://bugs.webkit.org/show_bug.cgi?id=133668
Reviewed by Dan Bernstein.
This makes it possible to know whether a callback was invalidated due to the webpage being closed,
or whether it was due the a web process crash.
* UIProcess/GenericCallback.h:
(WebKit::GenericCallback::create):
(WebKit::GenericCallback::performCallbackWithReturnValue):
(WebKit::GenericCallback::invalidate):
(WebKit::invalidateCallbackMap):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::resetState):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
* UIProcess/WebPageProxy.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169731 => 169732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-10 00:22:23 UTC (rev 169731)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-10 00:26:48 UTC (rev 169732)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-06-09 Anders Carlsson <andersca@apple.com>
+
+ Give callbacks real status codes
+ https://bugs.webkit.org/show_bug.cgi?id=133668
+
+ Reviewed by Dan Bernstein.
+
+ This makes it possible to know whether a callback was invalidated due to the webpage being closed,
+ or whether it was due the a web process crash.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::GenericCallback::create):
+ (WebKit::GenericCallback::performCallbackWithReturnValue):
+ (WebKit::GenericCallback::invalidate):
+ (WebKit::invalidateCallbackMap):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::resetState):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2014-06-09 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS WebKit: Crash in charactersAroundPosition.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (169731 => 169732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-10 00:22:23 UTC (rev 169731)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-10 00:26:48 UTC (rev 169732)
</span><span class="lines">@@ -39,6 +39,13 @@
</span><span class="cx">
</span><span class="cx"> class CallbackBase : public RefCounted<CallbackBase> {
</span><span class="cx"> public:
</span><ins>+ enum class Error {
+ None,
+ Unknown,
+ ProcessExited,
+ OwnerWasInvalidated,
+ };
+
</ins><span class="cx"> virtual ~CallbackBase()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -120,13 +127,22 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> class GenericCallback : public CallbackBase {
</span><span class="cx"> public:
</span><del>- typedef std::function<void (bool, T)> CallbackFunction;
</del><ins>+ typedef std::function<void (T, Error)> CallbackFunction;
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<GenericCallback> create(CallbackFunction callback)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new GenericCallback(callback));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: Get rid of this legacy version.
+ typedef std::function<void (bool, T)> LegacyCallbackFunction;
+ static PassRefPtr<GenericCallback> create(LegacyCallbackFunction callback)
+ {
+ return adoptRef(new GenericCallback([callback](T t, Error error) {
+ callback(error != Error::None, std::move(t));
+ }));
+ }
+
</ins><span class="cx"> virtual ~GenericCallback()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_callback);
</span><span class="lines">@@ -137,17 +153,17 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_callback(false, returnValue);
</del><ins>+ m_callback(returnValue, 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 = Error::Unknown)
</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, T());
</del><ins>+ m_callback(T(), error);
</ins><span class="cx">
</span><span class="cx"> m_callback = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -262,7 +278,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-void invalidateCallbackMap(HashMap<uint64_t, T>& map)
</del><ins>+void invalidateCallbackMap(HashMap<uint64_t, T>& map, CallbackBase::Error error = CallbackBase::Error::Unknown)
</ins><span class="cx"> {
</span><span class="cx"> Vector<T> callbacksVector;
</span><span class="cx"> copyValuesToVector(map, callbacksVector);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169731 => 169732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-10 00:22:23 UTC (rev 169731)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-10 00:26:48 UTC (rev 169732)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->disconnectFramesFromPage(this);
</span><span class="cx">
</span><del>- resetState();
</del><ins>+ resetState(ResetStateReason::PageInvalidated);
</ins><span class="cx">
</span><span class="cx"> m_loaderClient = std::make_unique<API::LoaderClient>();
</span><span class="cx"> m_policyClient = std::make_unique<API::PolicyClient>();
</span><span class="lines">@@ -4153,7 +4153,7 @@
</span><span class="cx"> m_loaderClient->processDidCrash(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::resetState()
</del><ins>+void WebPageProxy::resetState(ResetStateReason resetStateReason)
</ins><span class="cx"> {
</span><span class="cx"> m_mainFrame = nullptr;
</span><span class="cx"> m_drawingArea = nullptr;
</span><span class="lines">@@ -4220,12 +4220,23 @@
</span><span class="cx"> m_dynamicViewportSizeUpdateInProgress = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ CallbackBase::Error error;
+ switch (resetStateReason) {
+ case ResetStateReason::PageInvalidated:
+ error = CallbackBase::Error::OwnerWasInvalidated;
+ break;
+
+ case ResetStateReason::WebProcessExited:
+ error = CallbackBase::Error::ProcessDidClose;
+ break;
+ }
+
</ins><span class="cx"> invalidateCallbackMap(m_voidCallbacks);
</span><span class="cx"> invalidateCallbackMap(m_dataCallbacks);
</span><span class="cx"> invalidateCallbackMap(m_imageCallbacks);
</span><span class="cx"> invalidateCallbackMap(m_stringCallbacks);
</span><span class="cx"> m_loadDependentStringCallbackIDs.clear();
</span><del>- invalidateCallbackMap(m_scriptValueCallbacks);
</del><ins>+ invalidateCallbackMap(m_scriptValueCallbacks, error);
</ins><span class="cx"> invalidateCallbackMap(m_computedPagesCallbacks);
</span><span class="cx"> invalidateCallbackMap(m_validateCommandCallbacks);
</span><span class="cx"> invalidateCallbackMap(m_unsignedCallbacks);
</span><span class="lines">@@ -4283,7 +4294,7 @@
</span><span class="cx"> m_loadStateAtProcessExit = m_mainFrame->frameLoadState().m_state;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- resetState();
</del><ins>+ resetState(ResetStateReason::WebProcessExited);
</ins><span class="cx">
</span><span class="cx"> m_pageClient.processDidExit();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169731 => 169732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-10 00:22:23 UTC (rev 169731)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-10 00:26:48 UTC (rev 169732)
</span><span class="lines">@@ -1108,8 +1108,12 @@
</span><span class="cx">
</span><span class="cx"> void updateViewState(WebCore::ViewState::Flags flagsToUpdate = WebCore::ViewState::AllFlags);
</span><span class="cx"> void updateActivityToken();
</span><del>-
- void resetState();
</del><ins>+
+ enum class ResetStateReason {
+ PageInvalidated,
+ WebProcessExited,
+ };
+ void resetState(ResetStateReason);
</ins><span class="cx"> void resetStateAfterProcessExited();
</span><span class="cx">
</span><span class="cx"> void setUserAgent(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>