[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit bda448fb423196c8ae55267e66c6e650f5760b2f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 11:44:10 2011 +0000

    2011-01-11  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [REGRESSION] Load timing is requested
            for all resources (not only for the main one).
            https://bugs.webkit.org/show_bug.cgi?id=51749
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::willSendRequest):
            * loader/ResourceLoadNotifier.cpp:
            (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6aac04a..b94d6b2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-11  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] Load timing is requested
+        for all resources (not only for the main one).
+        https://bugs.webkit.org/show_bug.cgi?id=51749
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::willSendRequest):
+        * loader/ResourceLoadNotifier.cpp:
+        (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+
 2011-01-11  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index 7248dc9..31b6b9c 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -830,11 +830,9 @@ void InspectorController::willSendRequest(unsigned long identifier, ResourceRequ
     if (!enabled())
         return;
 
-    request.setReportLoadTiming(true);
-
     if (m_frontend) {
-        // Only enable raw headers if front-end is attached, as otherwise we may lack
-        // permissions to fetch the headers.
+        // Only enable load timing and raw headers if front-end is attached, as otherwise we may produce overhead.
+        request.setReportLoadTiming(true);
         request.setReportRawHeaders(true);
 
         if (m_extraHeaders) {
diff --git a/Source/WebCore/loader/ResourceLoadNotifier.cpp b/Source/WebCore/loader/ResourceLoadNotifier.cpp
index d002ef3..a36ed94 100644
--- a/Source/WebCore/loader/ResourceLoadNotifier.cpp
+++ b/Source/WebCore/loader/ResourceLoadNotifier.cpp
@@ -128,6 +128,10 @@ void ResourceLoadNotifier::dispatchWillSendRequest(DocumentLoader* loader, unsig
     if (Page* page = m_frame->page())
         page->inspectorController()->willSendRequest(identifier, request, redirectResponse);
 #endif
+
+    // Report WebTiming for all frames.
+    if (loader && !request.isNull() && request.url() == loader->requestURL())
+        request.setReportLoadTiming(true);
 }
 
 void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)

-- 
WebKit Debian packaging