Changeset 203756 in webkit

Timestamp:

Jul 26, 2016 5:44:01 PM (8 years ago)

Author:

Simon Fraser

Message:

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.

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebResourceLoadScheduler.cpp (modified) (7 diffs)
• mac/ChangeLog (modified) (1 diff)
• mac/Misc/WebKitLogging.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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.
+
+        * 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>
 

trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp

@@ -25 +25 @@
 #include "WebResourceLoadScheduler.h"
 
-#include "WebKitLogging.h"
 #include <WebCore/Document.h>
 #include <WebCore/DocumentLoader.h>
@@ -127 +126 @@
     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.
@@ -222 +219 @@
 void WebResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
 {
-    LOG(ResourceLoading, "WebResourceLoadScheduler::servePendingRequests. m_suspendPendingRequestsCount=%d", m_suspendPendingRequestsCount); 
     if (isSuspendingPendingRequests())
         return;
@@ -243 +239 @@
 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) {
@@ -292 +286 @@
 void WebResourceLoadScheduler::scheduleServePendingRequests()
 {
-    LOG(ResourceLoading, "WebResourceLoadScheduler::scheduleServePendingRequests, m_requestTimer.isActive()=%u", m_requestTimer.isActive());
     if (!m_requestTimer.isActive())
         m_requestTimer.startOneShot(0);
@@ -299 +292 @@
 void WebResourceLoadScheduler::requestTimerFired()
 {
-    LOG(ResourceLoading, "WebResourceLoadScheduler::requestTimerFired\n");
     servePendingRequests();
 }
@@ -339 +331 @@
 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);
 }

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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:
+
 2016-07-26  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebKitLogging.h

@@ -61 +61 @@
     M(Redirect) \
     M(RemoteInspector) \
-    M(ResourceLoading) \
     M(TextInput) \
     M(Timing) \