Changeset 225381 in webkit

Timestamp:

Nov 30, 2017 9:27:11 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Extra PerformanceEntryList entry after iframe navigation
​https://bugs.webkit.org/show_bug.cgi?id=178433

Reviewed by Joseph Pecoraro.

Source/WebCore:

Test: http/tests/security/PerformanceEntryList-parent-only-first-navigation.html

When an iframe is loaded, its main resource load should be reported to the parent frame's PerformanceEntryList.
Subsequent main resource loads should not.

• loader/FrameLoader.h:

(WebCore::FrameLoader::shouldReportResourceTimingToParentFrame):

• loader/ResourceTimingInformation.cpp:

(WebCore::ResourceTimingInformation::addResourceTiming):

LayoutTests:

• http/tests/security/PerformanceEntryList-parent-only-first-navigation-expected.txt: Added.
• http/tests/security/PerformanceEntryList-parent-only-first-navigation.html: Added.
• http/tests/security/resources/navigate-and-postMessage.html: Added.
• http/tests/security/resources/postMessage.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/PerformanceEntryList-parent-only-first-navigation-expected.txt (added)
• LayoutTests/http/tests/security/PerformanceEntryList-parent-only-first-navigation.html (added)
• LayoutTests/http/tests/security/resources/navigate-and-postMessage.html (added)
• LayoutTests/http/tests/security/resources/postMessage.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.h (modified) (2 diffs)
• Source/WebCore/loader/ResourceTimingInformation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-11-30  Alex Christensen  <achristensen@webkit.org>
+
+        Extra PerformanceEntryList entry after iframe navigation
+        https://bugs.webkit.org/show_bug.cgi?id=178433
+
+        Reviewed by Joseph Pecoraro.
+
+        * http/tests/security/PerformanceEntryList-parent-only-first-navigation-expected.txt: Added.
+        * http/tests/security/PerformanceEntryList-parent-only-first-navigation.html: Added.
+        * http/tests/security/resources/navigate-and-postMessage.html: Added.
+        * http/tests/security/resources/postMessage.html: Added.
+
 2017-11-30  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-30  Alex Christensen  <achristensen@webkit.org>
+
+        Extra PerformanceEntryList entry after iframe navigation
+        https://bugs.webkit.org/show_bug.cgi?id=178433
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: http/tests/security/PerformanceEntryList-parent-only-first-navigation.html
+
+        When an iframe is loaded, its main resource load should be reported to the parent frame's PerformanceEntryList.
+        Subsequent main resource loads should not.
+
+        * loader/FrameLoader.h:
+        (WebCore::FrameLoader::shouldReportResourceTimingToParentFrame):
+        * loader/ResourceTimingInformation.cpp:
+        (WebCore::ResourceTimingInformation::addResourceTiming):
+
 2017-11-30  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -159 +159 @@
     FrameState state() const { return m_state; }
 
+    void setShouldReportResourceTimingToParentFrame(bool value) { m_shouldReportResourceTimingToParentFrame = value; }
+    bool shouldReportResourceTimingToParentFrame() { return m_shouldReportResourceTimingToParentFrame; };
+    
 #if PLATFORM(IOS)
     RetainPtr<CFDictionaryRef> connectionProperties(ResourceLoader*);
@@ -417 +420 @@
     bool m_sentRedirectNotification;
     bool m_inStopAllLoaders;
+    bool m_shouldReportResourceTimingToParentFrame { true };
 
     String m_outgoingReferrer;

trunk/Source/WebCore/loader/ResourceTimingInformation.cpp

@@ -70 +70 @@
 
     Document* initiatorDocument = &document;
-    if (resource.type() == CachedResource::MainResource)
+    if (resource.type() == CachedResource::MainResource && document.frame() && document.frame()->loader().shouldReportResourceTimingToParentFrame()) {
+        document.frame()->loader().setShouldReportResourceTimingToParentFrame(false);
         initiatorDocument = document.parentDocument();
+    }
     if (!initiatorDocument)
         return;