<!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>[201018] 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/201018">201018</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-17 10:07:19 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the !ENABLE(WEB_TIMING) build after <a href="http://trac.webkit.org/projects/webkit/changeset/200887">r200887</a>
https://bugs.webkit.org/show_bug.cgi?id=157796
Reviewed by Chris Dumez.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didFinishLoading):
(WebCore::DocumentThreadableLoader::loadRequest):
* loader/DocumentThreadableLoader.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::revalidateResource):
(WebCore::CachedResourceLoader::loadResource):
* loader/cache/CachedResourceLoader.h:</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="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201017 => 201018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/ChangeLog 2016-05-17 17:07:19 UTC (rev 201018)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-17 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(WEB_TIMING) build after r200887
+ https://bugs.webkit.org/show_bug.cgi?id=157796
+
+ Reviewed by Chris Dumez.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::didFinishLoading):
+ (WebCore::DocumentThreadableLoader::loadRequest):
+ * loader/DocumentThreadableLoader.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ (WebCore::CachedResourceLoader::revalidateResource):
+ (WebCore::CachedResourceLoader::loadResource):
+ * loader/cache/CachedResourceLoader.h:
+
</ins><span class="cx"> 2016-05-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r54729): Line breaking in complex mixed-direction text is inconsistent across page refreshes
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (201017 => 201018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-05-17 17:07:19 UTC (rev 201018)
</span><span class="lines">@@ -325,8 +325,10 @@
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::didFinishLoading(unsigned long identifier, double finishTime)
</span><span class="cx"> {
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> m_resourceTimingInfo.addResourceTiming(m_resource.get(), &m_document);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> InspectorInstrumentation::didFinishLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, finishTime);
</span><span class="lines">@@ -396,8 +398,10 @@
</span><span class="cx"> if (m_resource) {
</span><span class="cx"> m_resource->addClient(this);
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> m_resourceTimingInfo.storeResourceTimingInitiatorInformation(m_resource, newRequest, m_document.frame());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (201017 => 201018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-05-17 17:07:19 UTC (rev 201018)
</span><span class="lines">@@ -106,7 +106,9 @@
</span><span class="cx"> ThreadableLoaderClient* m_client;
</span><span class="cx"> Document& m_document;
</span><span class="cx"> ThreadableLoaderOptions m_options;
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> ResourceTimingInformation m_resourceTimingInfo;
</span><ins>+#endif
</ins><span class="cx"> bool m_sameOriginRequest;
</span><span class="cx"> bool m_simpleRequest;
</span><span class="cx"> bool m_async;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201017 => 201018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-05-17 17:07:19 UTC (rev 201018)
</span><span class="lines">@@ -618,10 +618,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> logMemoryCacheResourceRequest(frame(), DiagnosticLoggingKeys::inMemoryCacheKey(), DiagnosticLoggingKeys::usedKey());
</span><span class="cx"> memoryCache.resourceAccessed(*resource);
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
</span><span class="cx"> m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
</span><span class="cx"> m_resourceTimingInfo.addResourceTiming(resource.get(), document());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -673,8 +675,12 @@
</span><span class="cx">
</span><span class="cx"> memoryCache.remove(*resource);
</span><span class="cx"> memoryCache.add(*newResource);
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
</span><ins>+#else
+ UNUSED_PARAM(request);
+#endif
</ins><span class="cx"> return newResource;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -689,8 +695,10 @@
</span><span class="cx">
</span><span class="cx"> if (request.allowsCaching() && !memoryCache.add(*resource))
</span><span class="cx"> resource->setOwningCachedResourceLoader(this);
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
</span><ins>+#endif
</ins><span class="cx"> return resource;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (201017 => 201018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-05-17 17:03:28 UTC (rev 201017)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-05-17 17:07:19 UTC (rev 201018)
</span><span class="lines">@@ -177,7 +177,9 @@
</span><span class="cx">
</span><span class="cx"> Timer m_garbageCollectDocumentResourcesTimer;
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
</ins><span class="cx"> ResourceTimingInformation m_resourceTimingInfo;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // 29 bits left
</span><span class="cx"> bool m_autoLoadImages : 1;
</span></span></pre>
</div>
</div>
</body>
</html>