<!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>[203756] trunk/Source/WebKit</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/203756">203756</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 17:44:01 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the Windows debug build.
WebResourceLoadScheduler's logging was a holdover from it being in WebCore,
and prior to <a href="http://trac.webkit.org/projects/webkit/changeset/203749">r203749</a> WebKit was actually using a WebCore log channel.
For some reason this doesn't build on Windows debug, so just remove
this logging for now.
Source/WebKit:
* WebCoreSupport/WebResourceLoadScheduler.cpp:
(WebResourceLoadScheduler::scheduleLoad): Deleted.
(WebResourceLoadScheduler::servePendingRequests): Deleted.
(WebResourceLoadScheduler::scheduleServePendingRequests): Deleted.
(WebResourceLoadScheduler::requestTimerFired): Deleted.
(WebResourceLoadScheduler::HostInformation::addLoadInProgress): Deleted.
Source/WebKit/mac:
* Misc/WebKitLogging.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingh">trunk/Source/WebKit/mac/Misc/WebKitLogging.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (203755 => 203756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-07-26 23:40:35 UTC (rev 203755)
+++ trunk/Source/WebKit/ChangeLog 2016-07-27 00:44:01 UTC (rev 203756)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-07-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix the Windows debug build.
+
+ WebResourceLoadScheduler's logging was a holdover from it being in WebCore,
+ and prior to r203749 WebKit was actually using a WebCore log channel.
+
+ For some reason this doesn't build on Windows debug, so just remove
+ this logging for now.
+
+ * WebCoreSupport/WebResourceLoadScheduler.cpp:
+ (WebResourceLoadScheduler::scheduleLoad): Deleted.
+ (WebResourceLoadScheduler::servePendingRequests): Deleted.
+ (WebResourceLoadScheduler::scheduleServePendingRequests): Deleted.
+ (WebResourceLoadScheduler::requestTimerFired): Deleted.
+ (WebResourceLoadScheduler::HostInformation::addLoadInProgress): Deleted.
+
+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Sort the project files.
</span><span class="cx">
</span><span class="cx"> * WebKit.xcodeproj/project.pbxproj:
</span></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (203755 => 203756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-07-26 23:40:35 UTC (rev 203755)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-07-27 00:44:01 UTC (rev 203756)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx">
</span><span class="cx"> #include "WebResourceLoadScheduler.h"
</span><span class="cx">
</span><del>-#include "WebKitLogging.h"
</del><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="lines">@@ -126,8 +125,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resourceLoader);
</span><span class="cx">
</span><del>- LOG(ResourceLoading, "WebResourceLoadScheduler::load resource %p '%s'", resourceLoader, resourceLoader->url().string().latin1().data());
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // If there's a web archive resource for this URL, we don't need to schedule the load since it will never touch the network.
</span><span class="cx"> if (!isSuspendingPendingRequests() && resourceLoader->documentLoader()->archiveResourceForURL(resourceLoader->iOSOriginalRequest().url())) {
</span><span class="lines">@@ -221,7 +218,6 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
</span><span class="cx"> {
</span><del>- LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests. m_suspendPendingRequestsCount=%d", m_suspendPendingRequestsCount);
</del><span class="cx"> if (isSuspendingPendingRequests())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -242,8 +238,6 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::servePendingRequests(HostInformation* host, ResourceLoadPriority minimumPriority)
</span><span class="cx"> {
</span><del>- LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests HostInformation.m_name='%s'", host->name().latin1().data());
-
</del><span class="cx"> auto priority = ResourceLoadPriority::Highest;
</span><span class="cx"> while (true) {
</span><span class="cx"> auto& requestsPending = host->requestsPending(priority);
</span><span class="lines">@@ -291,7 +285,6 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::scheduleServePendingRequests()
</span><span class="cx"> {
</span><del>- LOG(ResourceLoading, "WebResourceLoadScheduler::scheduleServePendingRequests, m_requestTimer.isActive()=%u", m_requestTimer.isActive());
</del><span class="cx"> if (!m_requestTimer.isActive())
</span><span class="cx"> m_requestTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="lines">@@ -298,7 +291,6 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::requestTimerFired()
</span><span class="cx"> {
</span><del>- LOG(ResourceLoading, "WebResourceLoadScheduler::requestTimerFired\n");
</del><span class="cx"> servePendingRequests();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -338,7 +330,6 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::HostInformation::addLoadInProgress(ResourceLoader* resourceLoader)
</span><span class="cx"> {
</span><del>- LOG(ResourceLoading, "HostInformation '%s' loading '%s'. Current count %d", m_name.latin1().data(), resourceLoader->url().string().latin1().data(), m_requestsLoading.size());
</del><span class="cx"> m_requestsLoading.add(resourceLoader);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203755 => 203756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-26 23:40:35 UTC (rev 203755)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-27 00:44:01 UTC (rev 203756)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ Fix the Windows debug build.
+
+ WebResourceLoadScheduler's logging was a holdover from it being in WebCore,
+ and prior to r203749 WebKit was actually using a WebCore log channel.
+
+ For some reason this doesn't build on Windows debug, so just remove
+ this logging for now.
+
+ * Misc/WebKitLogging.h:
+
</ins><span class="cx"> 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iPhone] Playing a video on tudou.com plays only sound, no video
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (203755 => 203756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-07-26 23:40:35 UTC (rev 203755)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-07-27 00:44:01 UTC (rev 203756)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> M(Progress) \
</span><span class="cx"> M(Redirect) \
</span><span class="cx"> M(RemoteInspector) \
</span><del>- M(ResourceLoading) \
</del><span class="cx"> M(TextInput) \
</span><span class="cx"> M(Timing) \
</span><span class="cx"> M(View) \
</span></span></pre>
</div>
</div>
</body>
</html>