Attachment 196037 Details for Bug 103927 – Patch for landing

[patch] Patch for landing

bug-103927-20130401163904.patch (text/plain), 14.53 KB, created by James Simonsen on 2013-04-01 16:39:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Simonsen

Created: 2013-04-01 16:39:12 PDT

Size: 14.53 KB

patch

obsolete

>Subversion Revision: 147228
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4f22f8030eba3cbdb5862defd52e8c72afda35ef..399df87e1fec1eacf4cd686abc4185a57411d080 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2013-03-29  James Simonsen  <simonjam@chromium.org>
>+
>+        [Resource Timing] Expose timing information for iframes
>+        https://bugs.webkit.org/show_bug.cgi?id=103927
>+
>+        Reviewed by Nate Chapin.
>+
>+        The only catch with main documents is that we only want to record the load that was initiated by
>+        adding the <iframe> to a document. We don't want any subsequent navigations within the iframe to
>+        be reported.
>+
>+        Test: http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html
>+
>+        * loader/cache/CachedResourceLoader.cpp:
>+        (WebCore::CachedResourceLoader::revalidateResource):
>+        (WebCore::CachedResourceLoader::loadResource):
>+        (WebCore::CachedResourceLoader::loadDone): Make sure iframes are reported in the parent.
>+
> 2013-03-29  Nate Chapin  <japhet@chromium.org>
> 
>         ASSERT d->m_defersLoading != defers on detik.com and drive.google.com
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>index 4b4699bd67209ff97ad9a69736fd0307d95c1f34..e5dd43eb5411070bdc0400ab28bb9b0971ae1827 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>@@ -44,6 +44,7 @@
> #include "FrameLoader.h"
> #include "FrameLoaderClient.h"
> #include "HTMLElement.h"
>+#include "HTMLFrameOwnerElement.h"
> #include "LoaderStrategy.h"
> #include "Logging.h"
> #include "MemoryCache.h"
>@@ -527,10 +528,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(co
>     memoryCache()->remove(resource);
>     memoryCache()->add(newResource.get());
> #if ENABLE(RESOURCE_TIMING)
>-    if (resource->type() != CachedResource::MainResource) {
>-        InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
>-        m_initiatorMap.add(newResource.get(), info);
>-    }
>+    storeResourceTimingInitiatorInformation(resource, request);
> #else
>     UNUSED_PARAM(request);
> #endif
>@@ -548,13 +546,26 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::loadResource(CachedRe
>     if (!memoryCache()->add(resource.get()))
>         resource->setOwningCachedResourceLoader(this);
> #if ENABLE(RESOURCE_TIMING)
>-    if (type != CachedResource::MainResource) {
>+    storeResourceTimingInitiatorInformation(resource, request);
>+#endif
>+    return resource;
>+}
>+
>+#if ENABLE(RESOURCE_TIMING)
>+void CachedResourceLoader::storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>& resource, const CachedResourceRequest& request)
>+{
>+    if (resource->type() == CachedResource::MainResource) {
>+        // <iframe>s should report the initial navigation requested by the parent document, but not subsequent navigations.
>+        if (frame()->ownerElement() && m_documentLoader->frameLoader()->stateMachine()->committingFirstRealLoad()) {
>+            InitiatorInfo info = { frame()->ownerElement()->localName(), monotonicallyIncreasingTime() };
>+            m_initiatorMap.add(resource.get(), info);
>+        }
>+    } else {
>         InitiatorInfo info = { request.initiatorName(), monotonicallyIncreasingTime() };
>         m_initiatorMap.add(resource.get(), info);
>     }
>-#endif
>-    return resource;
> }
>+#endif // ENABLE(RESOURCE_TIMING)
> 
> CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalidationPolicy(CachedResource::Type type, ResourceRequest& request, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption defer) const
> {
>@@ -740,13 +751,16 @@ void CachedResourceLoader::loadDone(CachedResource* resource)
>     RefPtr<Document> protectDocument(m_document);
> 
> #if ENABLE(RESOURCE_TIMING)
>-    // FIXME: Add resource timing support for main resources.
>-    if (resource && resource->type() != CachedResource::MainResource && resource->response().isHTTP() && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
>+    if (resource && resource->response().isHTTP() && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
>         HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
>         if (initiatorIt != m_initiatorMap.end()) {
>             ASSERT(document());
>+            Document* initiatorDocument = document();
>+            if (resource->type() == CachedResource::MainResource)
>+                initiatorDocument = document()->parentDocument();
>+            ASSERT(initiatorDocument);
>             const InitiatorInfo& info = initiatorIt->value;
>-            document()->domWindow()->performance()->addResourceTiming(info.name, document(), resource->resourceRequest(), resource->response(), info.startTime, resource->loadFinishTime());
>+            initiatorDocument->domWindow()->performance()->addResourceTiming(info.name, initiatorDocument, resource->resourceRequest(), resource->response(), info.startTime, resource->loadFinishTime());
>             m_initiatorMap.remove(initiatorIt);
>         }
>     }
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
>index dae51f39a02ff6f70935fb3954726455f4bee2fb..ad08abaf12c1ef7aba13cfa6fd7f2c46fe739f69 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
>@@ -145,6 +145,9 @@ private:
>     CachedResourceHandle<CachedResource> requestResource(CachedResource::Type, CachedResourceRequest&);
>     CachedResourceHandle<CachedResource> revalidateResource(const CachedResourceRequest&, CachedResource*);
>     CachedResourceHandle<CachedResource> loadResource(CachedResource::Type, CachedResourceRequest&, const String& charset);
>+#if ENABLE(RESOURCE_TIMING)
>+    void storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>&, const CachedResourceRequest&);
>+#endif
>     void requestPreload(CachedResource::Type, CachedResourceRequest&, const String& charset);
> 
>     enum RevalidationPolicy { Use, Revalidate, Reload, Load };
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 93564a24954f00f6211831d3de42c32ee865b29b..3953c629fb9daac00b22be728d2c813978dc510b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-03-29  James Simonsen  <simonjam@chromium.org>
>+
>+        [Resource Timing] Expose timing information for iframes
>+        https://bugs.webkit.org/show_bug.cgi?id=103927
>+
>+        Reviewed by Nate Chapin.
>+
>+        * http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html: Fix timeout.
>+        * http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation-expected.txt: Added.
>+        * http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html: Added.
>+        * http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types-expected.txt: Remove bad line.
>+        * platform/chromium/TestExpectations: Unskip tests that relied on iframes.
>+
> 2013-03-29  Nate Chapin  <japhet@chromium.org>
> 
>         ASSERT d->m_defersLoading != defers on detik.com and drive.google.com
>diff --git a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html
>index f1979dbe382b4b2f4313b05ab40861173622ecd1..dd2479f5a7a8a730e14b0a0f09ecf0424585c3f3 100644
>--- a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html
>+++ b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html
>@@ -13,7 +13,7 @@
> setup({explicit_done: true});
> 
> function onload_test() {
>-    var context = new PerformanceContext(iframe.contentWindow.performance);
>+    var context = new PerformanceContext(document.getElementById("frameContext").contentWindow.performance);
>     var entries = context.getEntries();
> 
>     var expected_entries = {
>diff --git a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation-expected.txt b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..449fe3014efe2c4341b1519677a86174b5cb994f
>--- /dev/null
>+++ b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation-expected.txt
>@@ -0,0 +1,8 @@
>+Description
>+
>+This test validates that iframes that navigate themselves don't appear in the buffer.
>+
>+
>+
>+PASS /w3c/webperf/resources/inject_resource_test.html is expected to have initiatorType iframe 
>+
>diff --git a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7102f3bceed8f489689bfd57c64344a3aab19c2d
>--- /dev/null
>+++ b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html
>@@ -0,0 +1,48 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset="utf-8" />
>+<title>Resource Timing self navigating iframes</title>
>+<link rel="author" title="Google" href="http://www.google.com/" />
>+<link rel="help" href="http://www.w3.org/TR/resource-timing/#dom-performanceresourcetiming-initiatortype"/>
>+<script src="/w3c/resources/testharness.js"></script>
>+<script src="/w3c/resources/testharnessreport.js"></script>
>+<script src="/w3c/webperf/resources/webperftestharness.js"></script>
>+<script src="/w3c/webperf/resources/webperftestharnessextension.js"></script>
>+<script>
>+setup({explicit_done: true});
>+var d;
>+var iframe;
>+var iframeBody;
>+function setup_iframe() {
>+    var iframe_content = '<iframe id="innerFrame" src="/w3c/webperf/resources/inject_resource_test.html"></iframe>';
>+    iframe = document.getElementById('frameContext');
>+    d = iframe.contentWindow.document;
>+    d.write(iframe_content);
>+    iframe.contentWindow.setup_iframe = setup_inner_iframe;
>+}
>+function setup_inner_iframe() {
>+    var iframe_content = '<script>window.location = "/w3c/webperf/resources/generate_resource.php?type=iframe";</scr' + 'ipt>';
>+    var inner_iframe = d.getElementById('innerFrame');
>+    inner_iframe.contentWindow.document.write(iframe_content);
>+    inner_iframe.addEventListener("load", onload_test);
>+}
>+function onload_test() {
>+    var context = new PerformanceContext(iframe.contentWindow.performance);
>+    var entries = context.getEntriesByType('resource');
>+    var expected_entries = {
>+        '/w3c/webperf/resources/inject_resource_test.html': 'iframe',
>+    };
>+    test_resource_entries(entries, expected_entries);
>+    done();
>+}
>+window.setup_iframe = setup_iframe;
>+</script>
>+</head>
>+<body>
>+<h1>Description</h1>
>+<p>This test validates that iframes that navigate themselves don't appear in the buffer.</p>
>+<div id="log"></div>
>+<iframe id="frameContext" src="/w3c/webperf/resources/inject_resource_test.html"></iframe>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types-expected.txt b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types-expected.txt
>index e11bbee2c7f945478585ca2e59ba75656aa9b50b..01c27772a5d582ab3522b904d59f317c03c8118d 100644
>--- a/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types-expected.txt
>+++ b/LayoutTests/http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types-expected.txt
>@@ -19,6 +19,5 @@ PASS /w3c/webperf/resources/generate_resource.php?type=image&id=input is expecte
> PASS /w3c/webperf/resources/generate_resource.php?type=image&id=n1 is expected to have initiatorType css 
> 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 
> 
>diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
>index 55902cd53362286244b14b1cc1aadde9b393f831..b41257691ee36bbbad0efb30fc982e89cd84406c 100644
>--- a/LayoutTests/platform/chromium/TestExpectations
>+++ b/LayoutTests/platform/chromium/TestExpectations
>@@ -3512,11 +3512,8 @@ webkit.org/b/85522 http/tests/security/sandboxed-iframe-form-top.html [ Skip ]
> 
> webkit.org/b/102724 [ Linux ] svg/carto.net/colourpicker.svg [ ImageOnlyFailure Pass ]
> 
>-webkit.org/b/103927 http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_frame_initiator_type.html [ Failure ]
>-webkit.org/b/103927 [ Mac Linux ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_dynamic_insertion.html [ Failure ]
>-webkit.org/b/103927 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_dynamic_insertion.html [ Failure Timeout ]
>-webkit.org/b/103927 [ Mac Linux ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types.html [ Failure ]
>-webkit.org/b/103927 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types.html [ Failure Timeout ]
>+webkit.org/b/103927 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_dynamic_insertion.html [ Timeout ]
>+webkit.org/b/103927 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_initiator_types.html [ Timeout ]
> webkit.org/b/103927 [ Mac Linux ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_redirects.html [ Failure ]
> webkit.org/b/103927 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_redirects.html [ Failure Timeout ]
> webkit.org/b/103927 http/tests/w3c/webperf/submission/Intel/resource-timing/test_resource_timing_cross_origin_resource_request.html [ Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 103927: 195812 | 195815 | 196037