Changeset 139513 in webkit

Timestamp:

Jan 11, 2013, 3:54:56 PM (12 years ago)

Author:

simonjam@chromium.org

Message:

[Resource Timing] XMLHttpRequests should have initiator type 'xmlhttprequest'
​https://bugs.webkit.org/show_bug.cgi?id=106409

Reviewed by Nate Chapin.

Source/WebCore:

The initiator is passed through ThreadableLoaderOptions to the CachedResourceRequest. This is
optional, so other users of ThreadableLoader will have the default initiator of 'request'. Note
that synchronous XHRs don't show up in the Resource Timing buffer yet.

Test: http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html

• loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::loadRequest):

• loader/ThreadableLoader.h:

(ThreadableLoaderOptions):

• loader/cache/CachedResourceRequestInitiators.cpp:

(WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):

• loader/cache/CachedResourceRequestInitiators.h:

(CachedResourceRequestInitiators):

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::createRequest):

LayoutTests:

• http/tests/w3c/webperf/resources/all_resource_types.htm:
• http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types-expected.txt:
• http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/w3c/webperf/resources/all_resource_types.htm (modified) (1 diff)
• LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types-expected.txt (modified) (3 diffs)
• LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentThreadableLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/ThreadableLoader.h (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequestInitiators.h (modified) (1 diff)
• Source/WebCore/xml/XMLHttpRequest.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-11  James Simonsen  <simonjam@chromium.org>
+
+        [Resource Timing] XMLHttpRequests should have initiator type 'xmlhttprequest'
+        https://bugs.webkit.org/show_bug.cgi?id=106409
+
+        Reviewed by Nate Chapin.
+
+        * http/tests/w3c/webperf/resources/all_resource_types.htm:
+        * http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types-expected.txt:
+        * http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html:
+
 2013-01-11  Stephen Chenney  <schenney@chromium.org>
 

trunk/LayoutTests/http/tests/w3c/webperf/resources/all_resource_types.htm

@@ -15 +15 @@
         <script src="empty_script.js"></script>
         <script>
-            var xhr = new XMLHttpRequest;
-            xhr.open("GET", "blank_page_yellow.htm", false);
-            xhr.send();
+            var async_xhr = new XMLHttpRequest;
+            async_xhr.open("GET", "generate_resource.php?type=image&id=async_xhr", true);
+            async_xhr.onreadystatechange = function() {
+                if (async_xhr.readyState == 4 && async_xhr.status == 200 && parent.hasOwnProperty('on_async_xhr_done'))
+                    parent.on_async_xhr_done();
+            }
+            async_xhr.send();
         </script>
         <style>

trunk/LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types-expected.txt

@@ -8 +8 @@
 PASS /w3c/webperf/resources/blank_image.png is expected to have initiatorType img 
 PASS /w3c/webperf/resources/blank_page_green.htm is expected to have initiatorType iframe 
-PASS /w3c/webperf/resources/blank_page_yellow.htm is expected to have initiatorType xmlhttprequest 
 PASS /w3c/webperf/resources/empty_script.js is expected to have initiatorType script 
 PASS /w3c/webperf/resources/generate_resource.php?type=css&id=embed is expected to have initiatorType embed 
@@ -15 +14 @@
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=1 is expected to have initiatorType css 
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=2 is expected to have initiatorType css 
+PASS /w3c/webperf/resources/generate_resource.php?type=image&id=async_xhr is expected to have initiatorType xmlhttprequest 
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=body is expected to have initiatorType body 
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=input is expected to have initiatorType input 
@@ -20 +20 @@
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=object is expected to have initiatorType object 
 PASS /w3c/webperf/resources/generate_resource.php?type=image&id=poster is expected to have initiatorType video 
+PASS /w3c/webperf/resources/generate_resource.php?type=image&id=sync_xhr is expected to have initiatorType xmlhttprequest 
 PASS /w3c/webperf/resources/nested.css is expected to have initiatorType link 
 

trunk/LayoutTests/http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html

@@ -16 +16 @@
 var ol_font_loaded = false;
 var ul_font_loaded = false;
+var xhr_loaded = false;
 
 function check_finished() {
@@ -24 +25 @@
         ol_font_loaded = check_font_loaded('ol');
     }
-    if (page_loaded && ol_font_loaded && ul_font_loaded && background_loaded) {
+    if (page_loaded && ol_font_loaded && ul_font_loaded && background_loaded && xhr_loaded) {
         perform_test();
     }
@@ -64 +65 @@
 
     var expected_entries = {
-        '/w3c/webperf/resources/generate_resource.php?type=image&id=body': 'body',
-        '/w3c/webperf/resources/nested.css': 'link',
+        '/w3c/webperf/resources/Ahem.ttf': 'css',
         '/w3c/webperf/resources/blank_image.png': 'img',
         '/w3c/webperf/resources/blank_page_green.htm': 'iframe',
         '/w3c/webperf/resources/empty_script.js': 'script',
-        '/w3c/webperf/resources/blank_page_yellow.htm': 'xmlhttprequest',
+        '/w3c/webperf/resources/generate_resource.php?type=css&id=embed': 'embed',
+        '/w3c/webperf/resources/generate_resource.php?type=css&id=n1': 'css',
+        '/w3c/webperf/resources/generate_resource.php?type=font&id=n1': 'css',
         '/w3c/webperf/resources/generate_resource.php?type=image&id=1': 'css',
         '/w3c/webperf/resources/generate_resource.php?type=image&id=2': 'css',
-        '/w3c/webperf/resources/Ahem.ttf': 'css',
-        '/w3c/webperf/resources/generate_resource.php?type=css&id=n1': 'css',
-        '/w3c/webperf/resources/generate_resource.php?type=font&id=n1': 'css',
+        '/w3c/webperf/resources/generate_resource.php?type=image&id=async_xhr': 'xmlhttprequest',
+        '/w3c/webperf/resources/generate_resource.php?type=image&id=body': 'body',
+        '/w3c/webperf/resources/generate_resource.php?type=image&id=input': 'input',
         '/w3c/webperf/resources/generate_resource.php?type=image&id=n1': 'css',
-        '/w3c/webperf/resources/generate_resource.php?type=css&id=embed': 'embed',
-        '/w3c/webperf/resources/generate_resource.php?type=image&id=input': 'input',
         '/w3c/webperf/resources/generate_resource.php?type=image&id=object': 'object',
         '/w3c/webperf/resources/generate_resource.php?type=image&id=poster': 'video',
+        '/w3c/webperf/resources/nested.css': 'link',
     };
 
@@ -87 +88 @@
 
 window.on_test_body_created = check_finished;
+window.on_async_xhr_done = function() {
+    xhr_loaded = true;
+    check_finished();
+}
 </script>
 </head>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-11  James Simonsen  <simonjam@chromium.org>
+
+        [Resource Timing] XMLHttpRequests should have initiator type 'xmlhttprequest'
+        https://bugs.webkit.org/show_bug.cgi?id=106409
+
+        Reviewed by Nate Chapin.
+
+        The initiator is passed through ThreadableLoaderOptions to the CachedResourceRequest. This is
+        optional, so other users of ThreadableLoader will have the default initiator of 'request'. Note
+        that synchronous XHRs don't show up in the Resource Timing buffer yet.
+
+        Test: http/tests/w3c/webperf/submission/resource-timing/html/test_resource_initiator_types.html
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::loadRequest):
+        * loader/ThreadableLoader.h:
+        (ThreadableLoaderOptions):
+        * loader/cache/CachedResourceRequestInitiators.cpp:
+        (WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):
+        * loader/cache/CachedResourceRequestInitiators.h:
+        (CachedResourceRequestInitiators):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest):
+
 2013-01-11  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -376 +376 @@
 
         CachedResourceRequest newRequest(request, options);
+#if ENABLE(RESOURCE_TIMING)
+        newRequest.setInitiator(m_options.initiator);
+#endif
 #if ENABLE(INSPECTOR)
         if (m_actualRequest) {

trunk/Source/WebCore/loader/ThreadableLoader.h

@@ -65 +65 @@
         CrossOriginRequestPolicy crossOriginRequestPolicy;
         RefPtr<SecurityOrigin> securityOrigin;
+#if ENABLE(RESOURCE_TIMING)
+        AtomicString initiator;
+#endif
     };
 

trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp

@@ -32 +32 @@
     : css("css", AtomicString::ConstructFromLiteral)
     , icon("icon", AtomicString::ConstructFromLiteral)
+    , xmlhttprequest("xmlhttprequest", AtomicString::ConstructFromLiteral)
 {
 }

trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h

@@ -35 +35 @@
     const AtomicString css;
     const AtomicString icon;
+    const AtomicString xmlhttprequest;
     WTF_MAKE_NONCOPYABLE(CachedResourceRequestInitiators); WTF_MAKE_FAST_ALLOCATED;
 private:

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -65 +65 @@
 #include <wtf/text/CString.h>
 
+#if ENABLE(RESOURCE_TIMING)
+#include "CachedResourceRequestInitiators.h"
+#endif
+
 #if USE(JSC)
 #include "JSDOMBinding.h"
@@ -787 +791 @@
     options.crossOriginRequestPolicy = UseAccessControl;
     options.securityOrigin = securityOrigin();
+#if ENABLE(RESOURCE_TIMING)
+    options.initiator = cachedResourceRequestInitiators().xmlhttprequest;
+#endif
 
 #if ENABLE(XHR_TIMEOUT)