Modified: trunk/Source/WebKit/ChangeLog (203755 => 203756)
--- 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)
@@ -1,5 +1,22 @@
2016-07-26 Simon Fraser <[email protected]>
+ 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 <[email protected]>
+
Sort the project files.
* WebKit.xcodeproj/project.pbxproj:
Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (203755 => 203756)
--- 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)
@@ -24,7 +24,6 @@
#include "WebResourceLoadScheduler.h"
-#include "WebKitLogging.h"
#include <WebCore/Document.h>
#include <WebCore/DocumentLoader.h>
#include <WebCore/Frame.h>
@@ -126,8 +125,6 @@
{
ASSERT(resourceLoader);
- LOG(ResourceLoading, "WebResourceLoadScheduler::load resource %p '%s'", resourceLoader, resourceLoader->url().string().latin1().data());
-
#if PLATFORM(IOS)
// 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.
if (!isSuspendingPendingRequests() && resourceLoader->documentLoader()->archiveResourceForURL(resourceLoader->iOSOriginalRequest().url())) {
@@ -221,7 +218,6 @@
void WebResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
{
- LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests. m_suspendPendingRequestsCount=%d", m_suspendPendingRequestsCount);
if (isSuspendingPendingRequests())
return;
@@ -242,8 +238,6 @@
void WebResourceLoadScheduler::servePendingRequests(HostInformation* host, ResourceLoadPriority minimumPriority)
{
- LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests HostInformation.m_name='%s'", host->name().latin1().data());
-
auto priority = ResourceLoadPriority::Highest;
while (true) {
auto& requestsPending = host->requestsPending(priority);
@@ -291,7 +285,6 @@
void WebResourceLoadScheduler::scheduleServePendingRequests()
{
- LOG(ResourceLoading, "WebResourceLoadScheduler::scheduleServePendingRequests, m_requestTimer.isActive()=%u", m_requestTimer.isActive());
if (!m_requestTimer.isActive())
m_requestTimer.startOneShot(0);
}
@@ -298,7 +291,6 @@
void WebResourceLoadScheduler::requestTimerFired()
{
- LOG(ResourceLoading, "WebResourceLoadScheduler::requestTimerFired\n");
servePendingRequests();
}
@@ -338,7 +330,6 @@
void WebResourceLoadScheduler::HostInformation::addLoadInProgress(ResourceLoader* resourceLoader)
{
- LOG(ResourceLoading, "HostInformation '%s' loading '%s'. Current count %d", m_name.latin1().data(), resourceLoader->url().string().latin1().data(), m_requestsLoading.size());
m_requestsLoading.add(resourceLoader);
}
Modified: trunk/Source/WebKit/mac/ChangeLog (203755 => 203756)
--- 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)
@@ -1,3 +1,15 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ 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:
+
2016-07-26 Myles C. Maxfield <[email protected]>
[iPhone] Playing a video on tudou.com plays only sound, no video
Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (203755 => 203756)
--- 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)
@@ -60,7 +60,6 @@
M(Progress) \
M(Redirect) \
M(RemoteInspector) \
- M(ResourceLoading) \
M(TextInput) \
M(Timing) \
M(View) \
