<!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>[163622] trunk/Source/WebCore</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/163622">163622</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 04:02:15 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE: DocumentThreadableLoader always has a Document.
<https://webkit.org/b/128364>
DocumentThreadableLoader always has an "owner" Document, so store
that as a reference instead of a pointer. Removed some unnecessary
assertions exposed by this change.
Reviewed by Antti Koivisto.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadResourceSynchronously):
(WebCore::DocumentThreadableLoader::create):
(WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
(WebCore::DocumentThreadableLoader::didReceiveResponse):
(WebCore::DocumentThreadableLoader::didReceiveData):
(WebCore::DocumentThreadableLoader::didFinishLoading):
(WebCore::DocumentThreadableLoader::didFail):
(WebCore::DocumentThreadableLoader::preflightFailure):
(WebCore::DocumentThreadableLoader::loadRequest):
(WebCore::DocumentThreadableLoader::securityOrigin):
* loader/DocumentThreadableLoader.h:
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoader::create):
(WebCore::ThreadableLoader::loadResourceSynchronously):
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoaderh">trunk/Source/WebCore/loader/DocumentThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderThreadableLoadercpp">trunk/Source/WebCore/loader/ThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163621 => 163622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 11:44:31 UTC (rev 163621)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 12:02:15 UTC (rev 163622)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-07 Andreas Kling <akling@apple.com>
+
+ CTTE: DocumentThreadableLoader always has a Document.
+ <https://webkit.org/b/128364>
+
+ DocumentThreadableLoader always has an "owner" Document, so store
+ that as a reference instead of a pointer. Removed some unnecessary
+ assertions exposed by this change.
+
+ Reviewed by Antti Koivisto.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::loadResourceSynchronously):
+ (WebCore::DocumentThreadableLoader::create):
+ (WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
+ (WebCore::DocumentThreadableLoader::didReceiveResponse):
+ (WebCore::DocumentThreadableLoader::didReceiveData):
+ (WebCore::DocumentThreadableLoader::didFinishLoading):
+ (WebCore::DocumentThreadableLoader::didFail):
+ (WebCore::DocumentThreadableLoader::preflightFailure):
+ (WebCore::DocumentThreadableLoader::loadRequest):
+ (WebCore::DocumentThreadableLoader::securityOrigin):
+ * loader/DocumentThreadableLoader.h:
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoader::create):
+ (WebCore::ThreadableLoader::loadResourceSynchronously):
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader):
+
</ins><span class="cx"> 2014-02-07 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Vector-effect updates require a re-layout
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (163621 => 163622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-02-07 11:44:31 UTC (rev 163621)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-02-07 12:02:15 UTC (rev 163622)
</span><span class="lines">@@ -56,14 +56,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::loadResourceSynchronously(Document* document, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</del><ins>+void DocumentThreadableLoader::loadResourceSynchronously(Document& document, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> // The loader will be deleted as soon as this function exits.
</span><del>- RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, &client, LoadSynchronously, request, options));
</del><ins>+ RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadSynchronously, request, options));
</ins><span class="cx"> ASSERT(loader->hasOneRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document* document, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</del><ins>+PassRefPtr<DocumentThreadableLoader> DocumentThreadableLoader::create(Document& document, ThreadableLoaderClient& client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<DocumentThreadableLoader> loader = adoptRef(new DocumentThreadableLoader(document, client, LoadAsynchronously, request, options));
</span><span class="cx"> if (!loader->m_resource)
</span><span class="lines">@@ -71,16 +71,14 @@
</span><span class="cx"> return loader.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DocumentThreadableLoader::DocumentThreadableLoader(Document* document, ThreadableLoaderClient* client, BlockingBehavior blockingBehavior, const ResourceRequest& request, const ThreadableLoaderOptions& options)
- : m_client(client)
</del><ins>+DocumentThreadableLoader::DocumentThreadableLoader(Document& document, ThreadableLoaderClient& client, BlockingBehavior blockingBehavior, const ResourceRequest& request, const ThreadableLoaderOptions& options)
+ : m_client(&client)
</ins><span class="cx"> , m_document(document)
</span><span class="cx"> , m_options(options)
</span><span class="cx"> , m_sameOriginRequest(securityOrigin()->canRequest(request.url()))
</span><span class="cx"> , m_simpleRequest(true)
</span><span class="cx"> , m_async(blockingBehavior == LoadAsynchronously)
</span><span class="cx"> {
</span><del>- ASSERT(document);
- ASSERT(client);
</del><span class="cx"> // Setting an outgoing referer is only supported in the async code path.
</span><span class="cx"> ASSERT(m_async || request.httpReferrer().isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -248,8 +246,8 @@
</span><span class="cx"> String accessControlErrorDescription;
</span><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- DocumentLoader* loader = m_document->frame()->loader().documentLoader();
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_document->frame(), identifier, response);
</del><ins>+ DocumentLoader* loader = m_document.frame()->loader().documentLoader();
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_document.frame(), identifier, response);
</ins><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, response, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -293,7 +291,7 @@
</span><span class="cx"> // Preflight data should be invisible to clients.
</span><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- InspectorInstrumentation::didReceiveData(m_document->frame(), identifier, 0, 0, dataLength);
</del><ins>+ InspectorInstrumentation::didReceiveData(m_document.frame(), identifier, 0, 0, dataLength);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(identifier);
</span><span class="cx"> #endif
</span><span class="lines">@@ -318,7 +316,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- InspectorInstrumentation::didFinishLoading(m_document->frame(), m_document->frame()->loader().documentLoader(), identifier, finishTime);
</del><ins>+ InspectorInstrumentation::didFinishLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, finishTime);
</ins><span class="cx"> #endif
</span><span class="cx"> ASSERT(!m_sameOriginRequest);
</span><span class="cx"> ASSERT(m_options.crossOriginRequestPolicy == UseAccessControl);
</span><span class="lines">@@ -331,7 +329,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (m_actualRequest)
</span><del>- InspectorInstrumentation::didFailLoading(m_document->frame(), m_document->frame()->loader().documentLoader(), identifier, error);
</del><ins>+ InspectorInstrumentation::didFailLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, error);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(identifier);
</span><span class="cx"> #endif
</span><span class="lines">@@ -357,7 +355,7 @@
</span><span class="cx"> ResourceError error(errorDomainWebKitInternal, 0, url, errorDescription);
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (m_actualRequest)
</span><del>- InspectorInstrumentation::didFailLoading(m_document->frame(), m_document->frame()->loader().documentLoader(), identifier, error);
</del><ins>+ InspectorInstrumentation::didFailLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, error);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(identifier);
</span><span class="cx"> #endif
</span><span class="lines">@@ -389,12 +387,12 @@
</span><span class="cx"> newRequest.setInitiator(m_options.initiator);
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(!m_resource);
</span><del>- m_resource = m_document->cachedResourceLoader()->requestRawResource(newRequest);
</del><ins>+ m_resource = m_document.cachedResourceLoader()->requestRawResource(newRequest);
</ins><span class="cx"> if (m_resource) {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (m_resource->loader()) {
</span><span class="cx"> unsigned long identifier = m_resource->loader()->identifier();
</span><del>- InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(m_document, identifier, m_client);
</del><ins>+ InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(&m_document, identifier, m_client);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> m_resource->addClient(this);
</span><span class="lines">@@ -407,10 +405,10 @@
</span><span class="cx"> ResourceError error;
</span><span class="cx"> ResourceResponse response;
</span><span class="cx"> unsigned long identifier = std::numeric_limits<unsigned long>::max();
</span><del>- if (m_document->frame())
- identifier = m_document->frame()->loader().loadResourceSynchronously(request, m_options.allowCredentials, m_options.clientCredentialPolicy, error, response, data);
</del><ins>+ if (m_document.frame())
+ identifier = m_document.frame()->loader().loadResourceSynchronously(request, m_options.allowCredentials, m_options.clientCredentialPolicy, error, response, data);
</ins><span class="cx">
</span><del>- InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(m_document, identifier, m_client);
</del><ins>+ InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(&m_document, identifier, m_client);
</ins><span class="cx">
</span><span class="cx"> // No exception for file:/// resources, see <rdar://problem/4962298>.
</span><span class="cx"> // Also, if we have an HTTP response, then it wasn't a network error in fact.
</span><span class="lines">@@ -446,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* DocumentThreadableLoader::securityOrigin() const
</span><span class="cx"> {
</span><del>- return m_options.securityOrigin ? m_options.securityOrigin.get() : m_document->securityOrigin();
</del><ins>+ return m_options.securityOrigin ? m_options.securityOrigin.get() : m_document.securityOrigin();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (163621 => 163622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2014-02-07 11:44:31 UTC (rev 163621)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2014-02-07 12:02:15 UTC (rev 163622)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> class DocumentThreadableLoader : public RefCounted<DocumentThreadableLoader>, public ThreadableLoader, private CachedRawResourceClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static void loadResourceSynchronously(Document*, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
- static PassRefPtr<DocumentThreadableLoader> create(Document*, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&);
</del><ins>+ static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
+ static PassRefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient&, const ResourceRequest&, const ThreadableLoaderOptions&);
</ins><span class="cx"> virtual ~DocumentThreadableLoader();
</span><span class="cx">
</span><span class="cx"> virtual void cancel();
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> LoadAsynchronously
</span><span class="cx"> };
</span><span class="cx">
</span><del>- DocumentThreadableLoader(Document*, ThreadableLoaderClient*, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&);
</del><ins>+ DocumentThreadableLoader(Document&, ThreadableLoaderClient&, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> void clearResource();
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> m_resource;
</span><span class="cx"> ThreadableLoaderClient* m_client;
</span><del>- Document* m_document;
</del><ins>+ Document& m_document;
</ins><span class="cx"> ThreadableLoaderOptions m_options;
</span><span class="cx"> bool m_sameOriginRequest;
</span><span class="cx"> bool m_simpleRequest;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (163621 => 163622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.cpp 2014-02-07 11:44:31 UTC (rev 163621)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp 2014-02-07 12:02:15 UTC (rev 163622)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (context->isWorkerGlobalScope())
</span><span class="cx"> return WorkerThreadableLoader::create(static_cast<WorkerGlobalScope*>(context), client, WorkerRunLoop::defaultMode(), request, options);
</span><span class="cx">
</span><del>- return DocumentThreadableLoader::create(toDocument(context), client, request, options);
</del><ins>+ return DocumentThreadableLoader::create(toDocument(*context), *client, request, options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableLoader::loadResourceSynchronously(ScriptExecutionContext* context, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DocumentThreadableLoader::loadResourceSynchronously(toDocument(context), request, client, options);
</del><ins>+ DocumentThreadableLoader::loadResourceSynchronously(*toDocument(context), request, client, options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (163621 => 163622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-02-07 11:44:31 UTC (rev 163621)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-02-07 12:02:15 UTC (rev 163622)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
</span><span class="cx"> // will return a 0 value. Either this should return 0 or the other code path should do a callback with
</span><span class="cx"> // a failure.
</span><del>- thisPtr->m_mainThreadLoader = DocumentThreadableLoader::create(document, thisPtr, *request, options);
</del><ins>+ thisPtr->m_mainThreadLoader = DocumentThreadableLoader::create(*document, *thisPtr, *request, options);
</ins><span class="cx"> ASSERT(thisPtr->m_mainThreadLoader);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>