WebKit Bugzilla
Attachment 339621 Details for
Bug 185322
: ASSERT(!childItemWithTarget(child->target())) is hit in HistoryItem::addChildItem()
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185322-20180504185121.patch (text/plain), 724.60 KB, created by
Chris Dumez
on 2018-05-04 18:51:22 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Chris Dumez
Created:
2018-05-04 18:51:22 PDT
Size:
724.60 KB
patch
obsolete
>Subversion Revision: 231367 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 0ba10b34f9106c347d262918c00eac5d257f085d..d3123850e73068a62331ded5dcb45f34fd1a24c1 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,32 @@ >+2018-05-04 Chris Dumez <cdumez@apple.com> >+ >+ ASSERT(!childItemWithTarget(child->target())) is hit in HistoryItem::addChildItem() >+ https://bugs.webkit.org/show_bug.cgi?id=185322 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ We generate unique names for Frame to be used in HistoryItem. Those names not only >+ need to be unique, they also need to be repeatable to avoid layout tests flakiness >+ and for things like restoring form state from an HistoryItem. >+ >+ The previously generated frame names were relying on the Frame's index among a >+ parent Frame's children. The issue was that we could end up with duplicate names >+ because one could insert a Frame *before* an existing one. This is because the code >+ would not take care of updating existing Frames's unique name on frame tree mutation. >+ >+ Updating frame tree names on mutation would be inefficient and is also not necessary. >+ The approach chosen in this patch is to stop using the Frame's index and instead rely >+ on an increasing counter stored on the top-frame's FrameTree. To make the names >+ repeatable, we reset the counter on page navigation. >+ >+ * page/Frame.cpp: >+ (WebCore::Frame::setDocument): >+ * page/FrameTree.cpp: >+ (WebCore::FrameTree::uniqueChildName const): >+ (WebCore::FrameTree::generateUniqueName const): >+ * page/FrameTree.h: >+ (WebCore::FrameTree::resetFrameIdentifiers): >+ > 2018-05-04 Chris Dumez <cdumez@apple.com> > > Unreviewed, rolling out r231331. >diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp >index a84265aa7936c34892cc9e071a990b9ad1e51168..fa5e2ab46d4fce494cde24a1ceeae1026be8ea5a 100644 >--- a/Source/WebCore/page/Frame.cpp >+++ b/Source/WebCore/page/Frame.cpp >@@ -282,6 +282,11 @@ void Frame::setDocument(RefPtr<Document>&& newDocument) > if (m_page) > m_page->didChangeMainDocument(); > m_loader->client().dispatchDidChangeMainDocument(); >+ >+ // We want to generate the same unique names whenever a page is loaded to avoid making layout tests >+ // flaky and for things like form state restoration to work. To achieve this, we reset our frame >+ // identifier generator every time the page is navigated. >+ tree().resetFrameIdentifiers(); > } > > #if ENABLE(ATTACHMENT_ELEMENT) >diff --git a/Source/WebCore/page/FrameTree.cpp b/Source/WebCore/page/FrameTree.cpp >index 26ccc7a4e6de106a541b2b8b7ef8ac78df1a024f..42cb333a0c09d514db0f17c7cf0db6f8766bfd30 100644 >--- a/Source/WebCore/page/FrameTree.cpp >+++ b/Source/WebCore/page/FrameTree.cpp >@@ -31,6 +31,7 @@ > #include <wtf/Vector.h> > #include <wtf/text/CString.h> > #include <wtf/text/StringBuilder.h> >+#include <wtf/text/StringConcatenateNumbers.h> > > namespace WebCore { > >@@ -62,19 +63,6 @@ Frame* FrameTree::parent() const > return m_parent; > } > >-unsigned FrameTree::indexInParent() const >-{ >- if (!m_parent) >- return 0; >- unsigned index = 0; >- for (Frame* frame = m_parent->tree().firstChild(); frame; frame = frame->tree().nextSibling()) { >- if (&frame->tree() == this) >- return index; >- ++index; >- } >- RELEASE_ASSERT_NOT_REACHED(); >-} >- > void FrameTree::appendChild(Frame& child) > { > ASSERT(child.page() == m_thisFrame.page()); >@@ -111,46 +99,18 @@ AtomicString FrameTree::uniqueChildName(const AtomicString& requestedName) const > if (!requestedName.isEmpty() && !child(requestedName) && !equalIgnoringASCIICase(requestedName, "_blank")) > return requestedName; > >- // The "name" attribute was not unique or absent. Generate a name based on the >- // new frame's location in the frame tree. The name uses HTML comment syntax to >- // avoid collisions with author names. >- >- // An example path for the third child of the second child of the root frame: >- // <!--framePath //<!--frame1-->/<!--frame2-->--> >- >- const char framePathPrefix[] = "<!--framePath "; >- const int framePathPrefixLength = 14; >- const int framePathSuffixLength = 3; >- >- // Find the nearest parent that has a frame with a path in it. >- Vector<Frame*, 16> chain; >- Frame* frame; >- for (frame = &m_thisFrame; frame; frame = frame->tree().parent()) { >- if (frame->tree().uniqueName().startsWith(framePathPrefix)) >- break; >- chain.append(frame); >- } >- StringBuilder name; >- name.append(framePathPrefix); >- if (frame) { >- name.append(frame->tree().uniqueName().string().substring(framePathPrefixLength, >- frame->tree().uniqueName().length() - framePathPrefixLength - framePathSuffixLength)); >- } >- for (int i = chain.size() - 1; i >= 0; --i) { >- frame = chain[i]; >- name.append('/'); >- if (frame->tree().parent()) { >- name.appendLiteral("<!--frame"); >- name.appendNumber(frame->tree().indexInParent()); >- name.appendLiteral("-->"); >- } >- } >+ // The "name" attribute was not unique or absent. Generate a name based on a counter on the main frame that gets reset >+ // on navigation. The name uses HTML comment syntax to avoid collisions with author names. >+ return generateUniqueName(); >+} > >- name.appendLiteral("/<!--frame"); >- name.appendNumber(childCount()); >- name.appendLiteral("-->-->"); >+AtomicString FrameTree::generateUniqueName() const >+{ >+ auto& top = this->top(); >+ if (&top.tree() != this) >+ return top.tree().generateUniqueName(); > >- return name.toAtomicString(); >+ return makeString("<!--frame", ++m_frameIDGenerator, "-->"); > } > > static bool inScope(Frame& frame, TreeScope& scope) >diff --git a/Source/WebCore/page/FrameTree.h b/Source/WebCore/page/FrameTree.h >index c63b4d1518d4f3e9164e3df164e00a66cebef642..0b6a763528bfd74bb3b1be06619be88ddfe9e772 100644 >--- a/Source/WebCore/page/FrameTree.h >+++ b/Source/WebCore/page/FrameTree.h >@@ -50,7 +50,6 @@ public: > WEBCORE_EXPORT void setName(const AtomicString&); > WEBCORE_EXPORT void clearName(); > WEBCORE_EXPORT Frame* parent() const; >- void setParent(Frame* parent) { m_parent = parent; } > > Frame* nextSibling() const { return m_nextSibling.get(); } > Frame* previousSibling() const { return m_previousSibling; } >@@ -78,16 +77,13 @@ public: > Frame* child(const AtomicString& name) const; > WEBCORE_EXPORT Frame* find(const AtomicString& name) const; > WEBCORE_EXPORT unsigned childCount() const; >- >- AtomicString uniqueChildName(const AtomicString& requestedName) const; >- > WEBCORE_EXPORT Frame& top() const; > > WEBCORE_EXPORT Frame* scopedChild(unsigned index) const; > WEBCORE_EXPORT Frame* scopedChild(const AtomicString& name) const; > unsigned scopedChildCount() const; > >- unsigned indexInParent() const; >+ void resetFrameIdentifiers() { m_frameIDGenerator = 0; } > > private: > Frame* deepFirstChild() const; >@@ -98,6 +94,9 @@ private: > Frame* scopedChild(const AtomicString& name, TreeScope*) const; > unsigned scopedChildCount(TreeScope*) const; > >+ AtomicString uniqueChildName(const AtomicString& requestedName) const; >+ AtomicString generateUniqueName() const; >+ > Frame& m_thisFrame; > > Frame* m_parent; >@@ -109,6 +108,7 @@ private: > RefPtr<Frame> m_firstChild; > Frame* m_lastChild; > mutable unsigned m_scopedChildCount; >+ mutable uint64_t m_frameIDGenerator { 0 }; > }; > > } // namespace WebCore >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 05179154f2a1364d4aeadcc816b8647ac0a687a4..f2d4c5cbbf2b0264eb95d6074479f6c1fc94a003 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,562 @@ >+2018-05-04 Chris Dumez <cdumez@apple.com> >+ >+ ASSERT(!childItemWithTarget(child->target())) is hit in HistoryItem::addChildItem() >+ https://bugs.webkit.org/show_bug.cgi?id=185322 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Rebaseline layout tests due to frame name changes. >+ >+ * applicationmanifest/display-mode-subframe-expected.txt: >+ * contentfiltering/allow-after-add-data-expected.txt: >+ * contentfiltering/allow-after-finished-adding-data-expected.txt: >+ * contentfiltering/allow-after-response-expected.txt: >+ * contentfiltering/allow-after-will-send-request-expected.txt: >+ * contentfiltering/allow-never-expected.txt: >+ * contentfiltering/block-after-add-data-expected.txt: >+ * contentfiltering/block-after-add-data-then-allow-unblock-expected.txt: >+ * contentfiltering/block-after-add-data-then-deny-unblock-expected.txt: >+ * contentfiltering/block-after-finished-adding-data-expected.txt: >+ * contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt: >+ * contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt: >+ * contentfiltering/block-after-response-expected.txt: >+ * contentfiltering/block-after-response-then-allow-unblock-expected.txt: >+ * contentfiltering/block-after-response-then-deny-unblock-expected.txt: >+ * contentfiltering/block-after-will-send-request-expected.txt: >+ * contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt: >+ * contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt: >+ * contentfiltering/block-never-expected.txt: >+ * fast/dom/Geolocation/callback-to-deleted-context-expected.txt: >+ * fast/dom/Geolocation/disconnected-frame-expected.txt: >+ * fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt: >+ * fast/dom/Window/messageevent-source-postmessage-expected.txt: >+ * fast/dom/Window/messageevent-source-postmessage-reified-expected.txt: >+ * fast/dom/javascript-url-crash-function-expected.txt: >+ * fast/encoding/meta-overrules-auto-expected.txt: >+ * fast/events/before-unload-forbidden-navigation-expected.txt: >+ * fast/events/before-unload-in-subframe-expected.txt: >+ * fast/events/before-unload-with-subframes-expected.txt: >+ * fast/events/focusingUnloadedFrame-expected.txt: >+ * fast/events/onloadFrameCrash-expected.txt: >+ * fast/events/onunload-not-on-body-expected.txt: >+ * fast/events/pageshow-pagehide-expected.txt: >+ * fast/events/stop-load-in-unload-handler-using-document-write-expected.txt: >+ * fast/events/stop-load-in-unload-handler-using-window-stop-expected.txt: >+ * fast/forms/form-and-frame-interaction-retains-values-expected.txt: >+ * fast/frames/crash-when-child-iframe-forces-layout-during-unload-and-sibling-frame-has-mediaquery-expected.txt: >+ * fast/frames/frame-element-name-expected.txt: >+ * fast/frames/frame-src-attribute-expected.txt: >+ * fast/frames/frame-unload-crash-expected.txt: >+ * fast/frames/iframe-reparenting-unique-name-expected.txt: >+ * fast/frames/iframe-set-inner-html-expected.txt: >+ * fast/frames/layout-after-destruction-expected.txt: >+ * fast/frames/long-names-in-nested-subframes-expected.txt: >+ * fast/frames/page-unload-document-open-expected.txt: >+ * fast/frames/reparent-in-unload-contentdocument-expected.txt: >+ * fast/frames/sandboxed-iframe-noscript-expected.txt: >+ * fast/frames/sandboxed-iframe-storage-expected.txt: >+ * fast/frames/srcdoc/setting-src-does-nothing-expected.txt: >+ * fast/frames/srcdoc/srcdoc-can-navigate-expected.txt: >+ * fast/frames/srcdoc/srcdoc-loads-content-expected.txt: >+ * fast/history/back-from-page-with-focused-iframe-expected.txt: >+ * fast/history/history-back-initial-vs-final-url-expected.txt: >+ * fast/history/redirect-via-iframe-expected.txt: >+ * fast/loader/child-frame-add-after-back-forward-expected.txt: >+ * fast/loader/dynamic-iframe-extra-back-forward-item-expected.txt: >+ * fast/loader/fragment-navigation-base-blank-expected.txt: >+ * fast/loader/frame-location-change-not-added-to-history-expected.txt: >+ * fast/loader/frame-src-change-added-to-history-expected.txt: >+ * fast/loader/frame-src-change-not-added-to-history-expected.txt: >+ * fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt: >+ * fast/loader/grandparent-completion-starts-redirect-expected.txt: >+ * fast/loader/iframe-meta-refresh-base-blank-expected.txt: >+ * fast/loader/iframe-set-location-base-blank-expected.txt: >+ * fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-async-delegate-expected.txt: >+ * fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-expected.txt: >+ * fast/loader/page-dismissal-modal-dialogs-expected.txt: >+ * fast/loader/ping-error-expected.txt: >+ * fast/loader/plain-text-document-expected.txt: >+ * fast/loader/refresh-iframe-base-blank-expected.txt: >+ * fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt: >+ * fast/loader/stateobjects/pushstate-in-iframe-expected.txt: >+ * fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt: >+ * fast/loader/stateobjects/replacestate-in-iframe-expected.txt: >+ * fast/loader/stop-provisional-loads-expected.txt: >+ * fast/loader/subframe-removes-itself-expected.txt: >+ * fast/loader/subframe-self-close-expected.txt: >+ * fast/loader/unload-hyperlink-targeted-expected.txt: >+ * fast/parser/double-write-from-closed-iframe-expected.txt: >+ * fast/parser/iframe-sets-parent-to-javascript-url-expected.txt: >+ * fast/parser/javascript-url-compat-mode-expected.txt: >+ * fast/parser/move-during-parsing-expected.txt: >+ * fast/parser/noscript-with-javascript-disabled-expected.txt: >+ * fast/parser/pre-html5-parser-quirks-expected.txt: >+ * fast/preloader/iframe-srcdoc-expected.txt: >+ * fast/tokenizer/text-plain-expected.txt: >+ * fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt: >+ * fast/xsl/xslt-text-expected.txt: >+ * http/tests/appcache/x-frame-options-prevents-framing-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin-expected.txt: >+ * http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url-expected.txt: >+ * http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page-expected.txt: >+ * http/tests/cookies/same-site/fetch-in-cross-origin-iframe-expected.txt: >+ * http/tests/cookies/same-site/fetch-in-cross-origin-service-worker-expected.txt: >+ * http/tests/cookies/same-site/fetch-in-same-origin-service-worker-expected.txt: >+ * http/tests/from-origin/document-from-origin-same-accepted-expected.txt: >+ * http/tests/from-origin/document-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/document-from-origin-same-site-accepted-expected.txt: >+ * http/tests/from-origin/document-from-origin-same-site-blocked-expected.txt: >+ * http/tests/from-origin/document-nested-from-origin-same-accepted-expected.txt: >+ * http/tests/from-origin/document-nested-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/fetch-iframe-from-origin-same-accepted-expected.txt: >+ * http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/redirect-document-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/sandboxed-sub-frame-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/sandboxed-sub-frame-nested-cross-origin-from-origin-same-blocked-expected.txt: >+ * http/tests/from-origin/sandboxed-sub-frame-nested-same-origin-from-origin-same-blocked-expected.txt: >+ * http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt: >+ * http/tests/loading/basic-auth-remove-credentials-expected.txt: >+ * http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: >+ * http/tests/loading/basic-credentials-sent-automatically-expected.txt: >+ * http/tests/loading/pdf-commit-load-callbacks-expected.txt: >+ * http/tests/loading/redirect-with-no-location-crash-expected.txt: >+ * http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt: >+ * http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: >+ * http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: >+ * http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt: >+ * http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: >+ * http/tests/misc/last-modified-parsing-expected.txt: >+ * http/tests/misc/policy-delegate-called-twice-expected.txt: >+ * http/tests/misc/redirect-to-external-url-expected.txt: >+ * http/tests/misc/webtiming-origins-expected.txt: Removed. >+ * http/tests/navigation/back-to-slow-frame-expected.txt: >+ * http/tests/navigation/forward-and-cancel-expected.txt: >+ * http/tests/navigation/image-load-in-subframe-unload-handler-expected.txt: >+ * http/tests/navigation/lockedhistory-iframe-expected.txt: >+ * http/tests/navigation/post-frames-expected.txt: >+ * http/tests/navigation/reload-subframe-frame-expected.txt: >+ * http/tests/navigation/reload-subframe-iframe-expected.txt: >+ * http/tests/navigation/reload-subframe-object-expected.txt: >+ * http/tests/preload/download_resources_from_header_iframe-expected.txt: >+ * http/tests/preload/download_resources_from_invalid_headers-expected.txt: >+ * http/tests/quicklook/at-import-stylesheet-blocked-expected.txt: >+ * http/tests/quicklook/cross-origin-iframe-blocked-expected.txt: >+ * http/tests/quicklook/document-domain-is-empty-string-expected.txt: >+ * http/tests/quicklook/external-stylesheet-blocked-expected.txt: >+ * http/tests/quicklook/hide-referer-on-navigation-expected.txt: >+ * http/tests/quicklook/rtf-document-domain-is-empty-string-expected.txt: >+ * http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt: >+ * http/tests/quicklook/top-navigation-blocked-expected.txt: >+ * http/tests/resourceLoadStatistics/add-blocking-to-redirect-expected.txt: >+ * http/tests/resourceLoadStatistics/add-partitioning-to-redirect-expected.txt: >+ * http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt: >+ * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt: >+ * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt: >+ * http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt: >+ * http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt: >+ * http/tests/resourceLoadStatistics/remove-partitioning-in-redirect-expected.txt: >+ * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-expected.txt: >+ * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-expected.txt: >+ * http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: >+ * http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt: >+ * http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt: >+ * http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt: >+ * http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt: >+ * http/tests/security/appcache-in-private-browsing-expected.txt: >+ * http/tests/security/appcache-switching-private-browsing-expected.txt: >+ * http/tests/security/canvas-cors-with-two-hosts-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-meta-element-ignored-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-report-only-ignored-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-allow-same-origin-sandboxed-cross-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-protocolless-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-blocked-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-invalidnonce-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy2-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-in-enforced-policy-and-not-in-report-only-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/scriptnonce-invalidnonce-expected.txt: >+ * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt: >+ * http/tests/security/contentSecurityPolicy/WebAssembly-blocked-in-subframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-01-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-02-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-03-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-04-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-05-expected.txt: >+ * http/tests/security/contentSecurityPolicy/directive-parsing-multiple-headers-expected.txt: >+ * http/tests/security/contentSecurityPolicy/eval-blocked-in-subframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/object-src-none-allowed-expected.txt: >+ * http/tests/security/contentSecurityPolicy/object-src-none-blocked-expected.txt: >+ * http/tests/security/contentSecurityPolicy/report-status-code-zero-when-using-https-expected.txt: >+ * http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-loads-with-img-src-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-none-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-none-inline-event-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-parsing-implicit-and-explicit-port-number-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-redirect-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-self-blocked-01-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-self-blocked-02-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-self-blocked-03-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-self-expected.txt: >+ * http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-01-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-02-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-03-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-04-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-05-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-06-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-07-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-08-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-09-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-10-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-deprecated-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-none-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt: >+ * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt: >+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt: >+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt: >+ * http/tests/security/contentSecurityPolicy/xsl-redirect-allowed-expected.txt: >+ * http/tests/security/contentSecurityPolicy/xsl-redirect-allowed2-expected.txt: >+ * http/tests/security/cookies/first-party-cookie-allow-xslt-expected.txt: >+ * http/tests/security/cookies/third-party-cookie-blocking-redirect-expected.txt: >+ * http/tests/security/cookies/third-party-cookie-blocking-xslt-expected.txt: >+ * http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt: >+ * http/tests/security/cross-frame-access-delete-expected.txt: >+ * http/tests/security/cross-frame-access-frameelement-expected.txt: >+ * http/tests/security/cross-frame-access-history-put-expected.txt: Removed. >+ * http/tests/security/cross-frame-access-location-put-expected.txt: >+ * http/tests/security/cross-frame-access-private-browsing-expected.txt: >+ * http/tests/security/cross-origin-appcache-allowed-expected.txt: >+ * http/tests/security/cross-origin-appcache-expected.txt: >+ * http/tests/security/cross-origin-css-primitive-expected.txt: >+ * http/tests/security/cross-origin-indexeddb-allowed-expected.txt: >+ * http/tests/security/cross-origin-indexeddb-expected.txt: >+ * http/tests/security/cross-origin-plugin-allowed-expected.txt: >+ * http/tests/security/cross-origin-plugin-expected.txt: >+ * http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed-expected.txt: >+ * http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt: >+ * http/tests/security/cross-origin-session-storage-allowed-expected.txt: >+ * http/tests/security/cross-origin-session-storage-third-party-blocked-expected.txt: >+ * http/tests/security/cross-origin-websql-allowed-expected.txt: >+ * http/tests/security/cross-origin-websql-expected.txt: >+ * http/tests/security/cross-origin-worker-indexeddb-allowed-expected.txt: >+ * http/tests/security/cross-origin-worker-indexeddb-expected.txt: >+ * http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt: >+ * http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt: >+ * http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt: >+ * http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt: >+ * http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt: >+ * http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt: >+ * http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt: >+ * http/tests/security/history-pushState-replaceState-from-sandboxed-iframe-expected.txt: >+ * http/tests/security/http-0.9/default-port-plugin-blocked-expected.txt: >+ * http/tests/security/http-0.9/default-port-script-blocked-expected.txt: >+ * http/tests/security/http-0.9/iframe-blocked-expected.txt: >+ * http/tests/security/http-0.9/image-on-HTTP-0.9-default-port-page-allowed-expected.txt: >+ * http/tests/security/http-0.9/image-on-HTTP-0.9-page-blocked-expected.txt: >+ * http/tests/security/http-0.9/sandbox-should-not-persist-on-navigation-expected.txt: >+ * http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level-expected.txt: >+ * http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-to-javscript-url-expected.txt: >+ * http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-from-javscript-url-expected.txt: >+ * http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level-expected.txt: >+ * http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-subframe-expected.txt: >+ * http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe-expected.txt: >+ * http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt: >+ * http/tests/security/mixedContent/blob-url-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt: >+ * http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt: >+ * http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt: >+ * http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt: >+ * http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt: >+ * http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt: >+ * http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt: >+ * http/tests/security/private-browsing-http-auth-expected.txt: >+ * http/tests/security/referrer-policy-always-expected.txt: >+ * http/tests/security/referrer-policy-default-expected.txt: >+ * http/tests/security/referrer-policy-https-always-expected.txt: >+ * http/tests/security/referrer-policy-https-default-expected.txt: >+ * http/tests/security/referrer-policy-https-never-expected.txt: >+ * http/tests/security/referrer-policy-https-no-referrer-expected.txt: >+ * http/tests/security/referrer-policy-https-no-referrer-when-downgrade-expected.txt: >+ * http/tests/security/referrer-policy-https-origin-expected.txt: >+ * http/tests/security/referrer-policy-https-unsafe-url-expected.txt: >+ * http/tests/security/referrer-policy-invalid-expected.txt: >+ * http/tests/security/referrer-policy-never-expected.txt: >+ * http/tests/security/referrer-policy-no-referrer-expected.txt: >+ * http/tests/security/referrer-policy-no-referrer-when-downgrade-expected.txt: >+ * http/tests/security/referrer-policy-origin-expected.txt: >+ * http/tests/security/referrer-policy-redirect-expected.txt: >+ * http/tests/security/referrer-policy-rel-noreferrer-expected.txt: >+ * http/tests/security/same-origin-appcache-blocked-expected.txt: >+ * http/tests/security/same-origin-document-domain-storage-allowed-expected.txt: >+ * http/tests/security/same-origin-storage-blocked-expected.txt: >+ * http/tests/security/same-origin-websql-blocked-expected.txt: >+ * http/tests/security/sandboxed-iframe-document-cookie-expected.txt: >+ * http/tests/security/sandboxed-iframe-geolocation-getCurrentPosition-expected.txt: >+ * http/tests/security/sandboxed-iframe-geolocation-watchPosition-expected.txt: >+ * http/tests/security/srcdoc-inherits-referrer-expected.txt: >+ * http/tests/security/srcdoc-inherits-referrer-for-forms-expected.txt: >+ * http/tests/security/storage-blocking-loosened-local-storage-expected.txt: >+ * http/tests/security/storage-blocking-loosened-plugin-expected.txt: >+ * http/tests/security/storage-blocking-loosened-private-browsing-plugin-expected.txt: >+ * http/tests/security/storage-blocking-loosened-websql-expected.txt: >+ * http/tests/security/storage-blocking-strengthened-local-storage-expected.txt: >+ * http/tests/security/storage-blocking-strengthened-plugin-expected.txt: >+ * http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt: >+ * http/tests/security/storage-blocking-strengthened-websql-expected.txt: >+ * http/tests/security/strip-referrer-to-origin-for-third-party-redirects-in-private-mode-expected.txt: >+ * http/tests/security/strip-referrer-to-origin-for-third-party-requests-in-private-mode-expected.txt: >+ * http/tests/security/window-properties-clear-domain-expected.txt: >+ * http/tests/security/window-properties-clear-port-expected.txt: >+ * http/tests/security/window-properties-pass-expected.txt: >+ * http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt: >+ * http/tests/security/xss-DENIED-defineProperty-expected.txt: >+ * http/tests/security/xssAuditor/faux-script1-expected.txt: >+ * http/tests/security/xssAuditor/faux-script2-expected.txt: >+ * http/tests/security/xssAuditor/faux-script3-expected.txt: >+ * http/tests/security/xssAuditor/malformed-HTML-expected.txt: >+ * http/tests/security/xssAuditor/non-block-javascript-url-frame-expected.txt: >+ * http/tests/security/xssAuditor/reflection-in-path-expected.txt: >+ * http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt: >+ * http/tests/security/xssAuditor/svg-animate-expected.txt: >+ * http/tests/ssl/media-stream/get-user-media-different-host-expected.txt: >+ * http/tests/ssl/media-stream/get-user-media-nested-expected.txt: >+ * http/tests/ssl/media-stream/get-user-media-secure-connection-expected.txt: >+ * http/tests/ssl/ping-with-unsafe-redirect-expected.txt: >+ * http/tests/storageAccess/deny-storage-access-under-opener-expected.txt: >+ * http/tests/storageAccess/grant-storage-access-under-opener-expected.txt: >+ * http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame-expected.txt: >+ * http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame-expected.txt: >+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-expected.txt: >+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt: >+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt: >+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt: >+ * http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt: >+ * http/tests/xmlhttprequest/frame-unload-abort-crash-expected.txt: >+ * http/tests/xmlhttprequest/origin-exact-matching-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-004-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-005-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-006-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-007-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-008-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-009-expected.txt: >+ * http/tests/xmlhttprequest/uri-resolution-opera-open-010-expected.txt: >+ * http/tests/xsl/xslt-transform-with-javascript-disabled-expected.txt: >+ * imported/blink/fast/plugins/empty-url-object-expected.txt: >+ * loader/stateobjects/pushstate-size-iframe-expected.txt: >+ * loader/stateobjects/replacestate-size-iframe-expected.txt: >+ * media/auto-play-in-sandbox-with-allow-scripts-expected.txt: >+ * platform/ios-wk1/http/tests/quicklook/top-navigation-blocked-expected.txt: >+ * platform/ios-wk1/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt: >+ * platform/ios/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt: >+ * platform/ios/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt: >+ * platform/ios/http/tests/quicklook/document-domain-is-empty-string-expected.txt: >+ * platform/ios/http/tests/quicklook/external-stylesheet-blocked-expected.txt: >+ * platform/ios/http/tests/quicklook/hide-referer-on-navigation-expected.txt: >+ * platform/ios/http/tests/quicklook/top-navigation-blocked-expected.txt: >+ * platform/ios/quicklook/excel-expected.txt: >+ * platform/ios/quicklook/excel-legacy-expected.txt: >+ * platform/ios/quicklook/excel-macro-enabled-expected.txt: >+ * platform/ios/quicklook/powerpoint-expected.txt: >+ * platform/ios/quicklook/powerpoint-legacy-expected.txt: >+ * platform/ios/quicklook/word-expected.txt: >+ * platform/ios/quicklook/word-legacy-expected.txt: >+ * platform/ios/webarchive/loading/cache-expired-subresource-expected.txt: >+ * platform/mac-wk2/http/tests/security/cross-origin-plugin-expected.txt: >+ * platform/mac-wk2/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt: >+ * platform/mac-wk2/http/tests/security/storage-blocking-strengthened-plugin-expected.txt: >+ * platform/mac-wk2/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt: >+ * platform/mac-wk2/plugins/resize-from-plugin-expected.txt: >+ * platform/mac/fast/loader/webarchive-encoding-respected-expected.txt: >+ * platform/mac/webarchive/adopt-attribute-styled-body-webarchive-expected.txt: >+ * platform/mac/webarchive/loading/cache-expired-subresource-expected.txt: >+ * platform/mac/webarchive/test-duplicate-resources-expected.txt: >+ * platform/win/plugins/resize-from-plugin-expected.txt: >+ * platform/win/webarchive/loading/cache-expired-subresource-expected.txt: >+ * platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt: >+ * platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt: >+ * platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt: >+ * platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt: >+ * platform/wk2/fast/loader/subframe-removes-itself-expected.txt: >+ * platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt: >+ * platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt: >+ * platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt: >+ * platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt: >+ * platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt: >+ * platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt: >+ * platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt: >+ * platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt: >+ * platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: >+ * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt: >+ * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt: >+ * platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt: >+ * platform/wk2/webarchive/loading/javascript-url-iframe-crash-expected.txt: >+ * platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt: >+ * platform/wk2/webarchive/loading/missing-data-expected.txt: >+ * platform/wk2/webarchive/loading/object-expected.txt: >+ * platform/wk2/webarchive/loading/test-loading-archive-expected.txt: >+ * platform/wk2/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt: >+ * platform/wk2/webarchive/loading/video-in-webarchive-expected.txt: >+ * plugins/resize-from-plugin-expected.txt: >+ * quicklook/excel-expected.txt: >+ * quicklook/excel-legacy-expected.txt: >+ * quicklook/excel-macro-enabled-expected.txt: >+ * quicklook/keynote-09-expected.txt: >+ * quicklook/multi-sheet-numbers-09-expected.txt: >+ * quicklook/numbers-09-expected.txt: >+ * quicklook/pages-09-expected.txt: >+ * quicklook/powerpoint-expected.txt: >+ * quicklook/powerpoint-legacy-expected.txt: >+ * quicklook/word-expected.txt: >+ * quicklook/word-legacy-expected.txt: >+ * userscripts/user-script-all-frames-expected.txt: >+ * userscripts/user-script-top-frame-only-expected.txt: >+ * userscripts/user-style-all-frames-expected.txt: >+ * userscripts/user-style-top-frame-only-expected.txt: >+ * webarchive/loading/javascript-url-iframe-crash-expected.txt: >+ * webarchive/loading/mainresource-null-mimetype-crash-expected.txt: >+ * webarchive/loading/missing-data-expected.txt: >+ * webarchive/loading/object-expected.txt: >+ * webarchive/loading/test-loading-archive-expected.txt: >+ * webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt: >+ * webarchive/loading/video-in-webarchive-expected.txt: >+ > 2018-05-04 Chris Dumez <cdumez@apple.com> > > Unreviewed, rolling out r231331. >diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog >index bd4d09e62d1e6ddaa87e93bc24f35e40ed866a94..45c4cd1255115c6b64c1670ec4d006f012280a38 100644 >--- a/LayoutTests/imported/w3c/ChangeLog >+++ b/LayoutTests/imported/w3c/ChangeLog >@@ -1,3 +1,26 @@ >+2018-05-04 Chris Dumez <cdumez@apple.com> >+ >+ ASSERT(!childItemWithTarget(child->target())) is hit in HistoryItem::addChildItem() >+ https://bugs.webkit.org/show_bug.cgi?id=185322 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Rebaseline layout tests due to frame name changes. >+ >+ * web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-expected.txt: >+ * web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-expected.txt: >+ > 2018-05-04 Chris Nardi <cnardi@chromium.org> > > Serialize all URLs with double-quotes per CSSOM spec >diff --git a/LayoutTests/applicationmanifest/display-mode-subframe-expected.txt b/LayoutTests/applicationmanifest/display-mode-subframe-expected.txt >index 28e43ad0b70783e7c0ca568792b779510d8126cc..e0b94f2338f0127ab98897873e075cfeb766cf4f 100644 >--- a/LayoutTests/applicationmanifest/display-mode-subframe-expected.txt >+++ b/LayoutTests/applicationmanifest/display-mode-subframe-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > (display-mode) (display-mode: standalone) >diff --git a/LayoutTests/contentfiltering/allow-after-add-data-expected.txt b/LayoutTests/contentfiltering/allow-after-add-data-expected.txt >index 580d0518879dfea12dd0c496868aec0867743398..31b5684c125ca052f493e16861f626f7d1e94031 100644 >--- a/LayoutTests/contentfiltering/allow-after-add-data-expected.txt >+++ b/LayoutTests/contentfiltering/allow-after-add-data-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/allow-after-add-data.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt b/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt >index 90da90deae86ac56ac7e9c1404b7365546eba95c..2ec8724819fcddea49d12a83bda329aac9ca12f1 100644 >--- a/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt >+++ b/LayoutTests/contentfiltering/allow-after-finished-adding-data-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/allow-after-finished-adding-data.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/allow-after-response-expected.txt b/LayoutTests/contentfiltering/allow-after-response-expected.txt >index 0043fb45035b0672f386b54e42eb7bcc2743d82b..507356a68b9c037b028c8e991d1fbe049da98579 100644 >--- a/LayoutTests/contentfiltering/allow-after-response-expected.txt >+++ b/LayoutTests/contentfiltering/allow-after-response-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/allow-after-response.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt b/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt >index a566a4bf574e7383109230e189f2f5d88b4bd233..0eeb74b97d7fd8bd5f18f3f671a084185c782ab0 100644 >--- a/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt >+++ b/LayoutTests/contentfiltering/allow-after-will-send-request-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/allow-after-will-send-request.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/allow-never-expected.txt b/LayoutTests/contentfiltering/allow-never-expected.txt >index 39f72062ffc05b0fedbb9bc74c7ce2b09540b8aa..7cdcfb42ee9223e14ab2b6aee759b4c68206d027 100644 >--- a/LayoutTests/contentfiltering/allow-never-expected.txt >+++ b/LayoutTests/contentfiltering/allow-never-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/allow-never.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-add-data-expected.txt b/LayoutTests/contentfiltering/block-after-add-data-expected.txt >index 876a994ad0d94e92a4ec29191999d7ee7c8ed2ba..5c2bf1d6798e0de41b3671453906f5729a4bbfa5 100644 >--- a/LayoutTests/contentfiltering/block-after-add-data-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-add-data-expected.txt >@@ -1,28 +1,28 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-add-data.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt >index 441c37e1eca7343921ff99c8fbf02be9b17ad289..3378c0e50317b17150713e7905e3fb74442846b3 100644 >--- a/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.txt >@@ -1,35 +1,35 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-add-data-then-allow-unblock.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt >index a48ca11e2bd74649ae39beb274d74173ad38aa97..9f7e29fc357fce4ba98c12af3e8b099d0aedfd10 100644 >--- a/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.txt >@@ -1,30 +1,30 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-add-data-then-deny-unblock.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt b/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt >index 0caf086ffc2bbae0baed92dd4bbdefca601e8d28..01a49ef71d0c0adf986dfeb030cfe394bc262a51 100644 >--- a/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-finished-adding-data-expected.txt >@@ -1,28 +1,28 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-finished-adding-data.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt >index 26a80f247b2a515ce2b314fa1affbd52d2915acd..4353f2f26b45f024060f5747975af703bdc320e0 100644 >--- a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.txt >@@ -1,35 +1,35 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-finished-adding-data-then-allow-unblock.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt >index eedb252a79428d45410723902489d0be8e140dbb..26b71d57ac5d0de1ce8fedea1259860467d53b8e 100644 >--- a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.txt >@@ -1,30 +1,30 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-finished-adding-data-then-deny-unblock.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-response-expected.txt b/LayoutTests/contentfiltering/block-after-response-expected.txt >index dc419f43c4f93dd97d876c32d9516c47f303b8d8..88df44912da83973a656604c3900fd7cd0489bcf 100644 >--- a/LayoutTests/contentfiltering/block-after-response-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-response-expected.txt >@@ -1,28 +1,28 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-response.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt >index 4b9ff9ec5c38397ca2935a1381ea1e1cfeb5f121..5c329c9ffb5d11c3ba6906158cdea0df0340081f 100644 >--- a/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.txt >@@ -1,35 +1,35 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-response-then-allow-unblock.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt >index 8686bae6b2a3ae348fc22deed335a95a122f8520..bcdff3ea3899750f9944cfeafa4f49ee07b7af9b 100644 >--- a/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.txt >@@ -1,30 +1,30 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-response-then-deny-unblock.html **nav target** >- (file test):contentfiltering/resources/fail.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/fail.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt b/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt >index 2d8c754d59336d4bd84a527faed991cf72ec3444..186f56a22ab0e16db83576d5a6bc71c44c7cf3ae 100644 >--- a/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-will-send-request-expected.txt >@@ -1,28 +1,28 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-will-send-request.html **nav target** >- about:blank (in frame "<!--framePath //<!--frame0-->-->") >+ about:blank (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt >index d656c671ee6ed931aee843fb45ed6f13fc56bd33..e30e6e5f986c946e756e3dc3f04469921c4213cb 100644 >--- a/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.txt >@@ -1,35 +1,35 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-will-send-request-then-allow-unblock.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt b/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt >index ad1bde0fb5ea63647b4aec200fd373b408adfcf9..810fc22758bd90fec0315135566c724698612b07 100644 >--- a/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt >+++ b/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.txt >@@ -1,30 +1,30 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/fail.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/fail.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: x-apple-content-filter://mock-unblock >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-after-will-send-request-then-deny-unblock.html **nav target** >- about:blank (in frame "<!--framePath //<!--frame0-->-->") >+ about:blank (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/contentfiltering/block-never-expected.txt b/LayoutTests/contentfiltering/block-never-expected.txt >index b14074471d81784aa7b8dc93e5713f70626f129c..e334b42a99d114273ac511ab5bef6feb18564f52 100644 >--- a/LayoutTests/contentfiltering/block-never-expected.txt >+++ b/LayoutTests/contentfiltering/block-never-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/pass.html >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/pass.html > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > ============== Back Forward List ============== > curr-> (file test):contentfiltering/block-never.html **nav target** >- (file test):contentfiltering/resources/pass.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):contentfiltering/resources/pass.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/fast/dom/Geolocation/callback-to-deleted-context-expected.txt >index bc8826a026739b6821187e7d0ad4d203a7938d64..e7ba9e63a4463a987ffab9755755cc58d6e6243b 100644 >--- a/LayoutTests/fast/dom/Geolocation/callback-to-deleted-context-expected.txt >+++ b/LayoutTests/fast/dom/Geolocation/callback-to-deleted-context-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. > > On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >diff --git a/LayoutTests/fast/dom/Geolocation/disconnected-frame-expected.txt b/LayoutTests/fast/dom/Geolocation/disconnected-frame-expected.txt >index 6ba331494889babb69e7383339f6fcc02192a42c..ebc8b256d07bc3551a1eae674cb230a3c2c2ecb9 100644 >--- a/LayoutTests/fast/dom/Geolocation/disconnected-frame-expected.txt >+++ b/LayoutTests/fast/dom/Geolocation/disconnected-frame-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Tests that when a request is made on a Geolocation object and its Frame is disconnected before a callback is made, the error callback is invoked with the correct error message. > > On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >diff --git a/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt b/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt >index 34e4b9ec2fad1b4980e3bc013cdfb2bb4a4a873f..942460e39d3160ff0b3260247a6f7f46e6590bf4 100644 >--- a/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt >+++ b/LayoutTests/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Tests that when a request is made on a Geolocation object, permission is denied and its Frame is disconnected before a callback is made, the error callback is invoked with PERMISSION_DENIED. > > On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >diff --git a/LayoutTests/fast/dom/Window/messageevent-source-postmessage-expected.txt b/LayoutTests/fast/dom/Window/messageevent-source-postmessage-expected.txt >index a6db670822f159e7e9cd0adbc5f2e74bab13fa49..8637378e1140cb95a1fb7e5b0acbe1c51b8a010f 100644 >--- a/LayoutTests/fast/dom/Window/messageevent-source-postmessage-expected.txt >+++ b/LayoutTests/fast/dom/Window/messageevent-source-postmessage-expected.txt >@@ -21,7 +21,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > * Child received message 1 from parent > PASS messageEvent.source is parent >diff --git a/LayoutTests/fast/dom/Window/messageevent-source-postmessage-reified-expected.txt b/LayoutTests/fast/dom/Window/messageevent-source-postmessage-reified-expected.txt >index b7bbcfd9436b1a030f9dcde36d127d93a3c5f46c..63683795e7e190a910d3145e12e2b0e18742a1ba 100644 >--- a/LayoutTests/fast/dom/Window/messageevent-source-postmessage-reified-expected.txt >+++ b/LayoutTests/fast/dom/Window/messageevent-source-postmessage-reified-expected.txt >@@ -21,7 +21,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > * Child received message 1 from parent > PASS messageEvent.source is parent >diff --git a/LayoutTests/fast/dom/javascript-url-crash-function-expected.txt b/LayoutTests/fast/dom/javascript-url-crash-function-expected.txt >index ee3eb763e519a4741cda8ab23bf960b18379f873..38daec8c21e3f4c167e22bea0ef103fc2c3743f0 100644 >--- a/LayoutTests/fast/dom/javascript-url-crash-function-expected.txt >+++ b/LayoutTests/fast/dom/javascript-url-crash-function-expected.txt >@@ -3,6 +3,6 @@ This page tests whether loading a javascript: URL into an iframe while the ifram > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: You didn't crash. >diff --git a/LayoutTests/fast/encoding/meta-overrules-auto-expected.txt b/LayoutTests/fast/encoding/meta-overrules-auto-expected.txt >index beb1a9b018bee23fd551f6bc897e11648cfe1e92..9fcf6375fb32f6579f364ed5350ea37b7601648f 100644 >--- a/LayoutTests/fast/encoding/meta-overrules-auto-expected.txt >+++ b/LayoutTests/fast/encoding/meta-overrules-auto-expected.txt >@@ -2,6 +2,6 @@ This iframe should use UTF-8 because of its meta tag even in spite of this test > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > UTF-8 >diff --git a/LayoutTests/fast/events/before-unload-forbidden-navigation-expected.txt b/LayoutTests/fast/events/before-unload-forbidden-navigation-expected.txt >index 4f1a7886264d2f72a85d43027e3cf47482ddabf3..a47f33b3b839374135a7948fd1268c678ec35394 100644 >--- a/LayoutTests/fast/events/before-unload-forbidden-navigation-expected.txt >+++ b/LayoutTests/fast/events/before-unload-forbidden-navigation-expected.txt >@@ -4,6 +4,6 @@ PASS 1/2 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: 2/2 >diff --git a/LayoutTests/fast/events/before-unload-in-subframe-expected.txt b/LayoutTests/fast/events/before-unload-in-subframe-expected.txt >index d16afd4e242388ce34515dca264dfa7224358e73..30a244f1ced88d1dbac8ab27e94c0bc4cc694f7e 100644 >--- a/LayoutTests/fast/events/before-unload-in-subframe-expected.txt >+++ b/LayoutTests/fast/events/before-unload-in-subframe-expected.txt >@@ -4,6 +4,6 @@ PASS > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Child loaded. >diff --git a/LayoutTests/fast/events/before-unload-with-subframes-expected.txt b/LayoutTests/fast/events/before-unload-with-subframes-expected.txt >index 7212540acb2041f676c66f140ac0affdaa1f5d18..edd5f744929aa634b7337b23b1c2a5c3e1525d66 100644 >--- a/LayoutTests/fast/events/before-unload-with-subframes-expected.txt >+++ b/LayoutTests/fast/events/before-unload-with-subframes-expected.txt >@@ -4,6 +4,6 @@ PASS 1/2 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: 2/2 >diff --git a/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt b/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt >index 2ae8b18d1237b9edbdc6841c509ba6694f7f0c34..bda57a47114a968bb92755f3ff2392050426ab2e 100644 >--- a/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt >+++ b/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt >@@ -1,11 +1,11 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > To reproduce the original crash outside of DumpRenderTree, press option-tab twice. After focusing the link below on the first option-tab, the focus loop will try to focus the unloaded frame on the second and crash. Crash > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/fast/events/onloadFrameCrash-expected.txt b/LayoutTests/fast/events/onloadFrameCrash-expected.txt >index fd6f97229bf624b8052a5104e65db1d77d6ea3ea..c9d1558e478734fb5fb86039d17165adbfbb1e96 100644 >--- a/LayoutTests/fast/events/onloadFrameCrash-expected.txt >+++ b/LayoutTests/fast/events/onloadFrameCrash-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/fast/events/onunload-not-on-body-expected.txt b/LayoutTests/fast/events/onunload-not-on-body-expected.txt >index 7cc64f7257f1b235ad6a60534d3238f56a47886d..bb88aba2e67a362bc43e0b75002563d223b4c38c 100644 >--- a/LayoutTests/fast/events/onunload-not-on-body-expected.txt >+++ b/LayoutTests/fast/events/onunload-not-on-body-expected.txt >@@ -1,3 +1,3 @@ >-frame "<!--framePath //<!--frame2-->-->" - has 1 onunload handler(s) >+frame "<!--frame3-->" - has 1 onunload handler(s) > CONSOLE MESSAGE: line 1: Use of window.alert is not allowed while unloading a page. > you should only see one unload alert appear. >diff --git a/LayoutTests/fast/events/pageshow-pagehide-expected.txt b/LayoutTests/fast/events/pageshow-pagehide-expected.txt >index afdae9b9136225d281154ce10bfc6338e23582cb..07603d048ba8ac8539685fa4eabaeed487014c18 100644 >--- a/LayoutTests/fast/events/pageshow-pagehide-expected.txt >+++ b/LayoutTests/fast/events/pageshow-pagehide-expected.txt >@@ -1,7 +1,7 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) >+frame "<!--frame2-->" - has 1 onunload handler(s) >+frame "<!--frame2-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Test pageshow/pagehide event behavior in subframes. > > >diff --git a/LayoutTests/fast/events/stop-load-in-unload-handler-using-document-write-expected.txt b/LayoutTests/fast/events/stop-load-in-unload-handler-using-document-write-expected.txt >index 6adad2dfe8865934ae5c68c702d6705bc70c9ef8..0e472e1af100d8af647ebf6bf97772b5431b0cbd 100644 >--- a/LayoutTests/fast/events/stop-load-in-unload-handler-using-document-write-expected.txt >+++ b/LayoutTests/fast/events/stop-load-in-unload-handler-using-document-write-expected.txt >@@ -1,3 +1,3 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > PASS > >diff --git a/LayoutTests/fast/events/stop-load-in-unload-handler-using-window-stop-expected.txt b/LayoutTests/fast/events/stop-load-in-unload-handler-using-window-stop-expected.txt >index 6adad2dfe8865934ae5c68c702d6705bc70c9ef8..0e472e1af100d8af647ebf6bf97772b5431b0cbd 100644 >--- a/LayoutTests/fast/events/stop-load-in-unload-handler-using-window-stop-expected.txt >+++ b/LayoutTests/fast/events/stop-load-in-unload-handler-using-window-stop-expected.txt >@@ -1,3 +1,3 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > PASS > >diff --git a/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt b/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt >index b21a22e7ddef3e37e5f0a7e9326c68f8de7be3df..f807847472089d04a01bd5cb7c02c83021b32f1e 100644 >--- a/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt >+++ b/LayoutTests/fast/forms/form-and-frame-interaction-retains-values-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > >@@ -13,6 +13,6 @@ In this test the main page is loaded in a frameset, which sets the value of an i > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame3-->' > -------- > >diff --git a/LayoutTests/fast/frames/crash-when-child-iframe-forces-layout-during-unload-and-sibling-frame-has-mediaquery-expected.txt b/LayoutTests/fast/frames/crash-when-child-iframe-forces-layout-during-unload-and-sibling-frame-has-mediaquery-expected.txt >index e3814dac3f0ba45822ca05b6be7f261be2a8a153..d62ba3aee5e0c4dc1483395c37d1e989f25d6a2e 100644 >--- a/LayoutTests/fast/frames/crash-when-child-iframe-forces-layout-during-unload-and-sibling-frame-has-mediaquery-expected.txt >+++ b/LayoutTests/fast/frames/crash-when-child-iframe-forces-layout-during-unload-and-sibling-frame-has-mediaquery-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Ensures that when layout is forced during an unload event, frames with media queries do not crash. > >diff --git a/LayoutTests/fast/frames/frame-element-name-expected.txt b/LayoutTests/fast/frames/frame-element-name-expected.txt >index 0e510253272362ed063069f686d6daf3a600c500..d042c4956460005e413c14f81ff2982d069596c1 100644 >--- a/LayoutTests/fast/frames/frame-element-name-expected.txt >+++ b/LayoutTests/fast/frames/frame-element-name-expected.txt >@@ -8,14 +8,14 @@ PASS escape(window.name) is "left" > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame1-->' > -------- > PASS escape(window.frameElement.name) is "" > PASS escape(window.name) is "" > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame2-->' > -------- > PASS escape(window.frameElement.name) is "_blank" > PASS escape(window.name) is "_blank" >diff --git a/LayoutTests/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/fast/frames/frame-src-attribute-expected.txt >index a86166d200e43d0421221d7f9c3599a8c0c70f47..8ea5207f234baaa387645d420ba894a440f650bb 100644 >--- a/LayoutTests/fast/frames/frame-src-attribute-expected.txt >+++ b/LayoutTests/fast/frames/frame-src-attribute-expected.txt >@@ -1,13 +1,13 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL. > > PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does. > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/fast/frames/frame-unload-crash-expected.txt b/LayoutTests/fast/frames/frame-unload-crash-expected.txt >index 0147b80d923b44df31536f59dbbe79f3f8fa9890..8f6b5411cbeb9651b996dba2b93fa85e91d60815 100644 >--- a/LayoutTests/fast/frames/frame-unload-crash-expected.txt >+++ b/LayoutTests/fast/frames/frame-unload-crash-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame2-->" - has 1 onunload handler(s) > This is a test for bug 25136: CRASH in DocumentLoader::removeSubresourceLoader due to null m_frame. If successful, PASS should be printed below. > > PASS >diff --git a/LayoutTests/fast/frames/iframe-reparenting-unique-name-expected.txt b/LayoutTests/fast/frames/iframe-reparenting-unique-name-expected.txt >index 85623d2dcfae062fd2c5e271f015ff1847faccb5..4c55b9a7359f96f549104314533445abf5ca4e09 100644 >--- a/LayoutTests/fast/frames/iframe-reparenting-unique-name-expected.txt >+++ b/LayoutTests/fast/frames/iframe-reparenting-unique-name-expected.txt >@@ -1,18 +1,18 @@ > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > This test PASSED if DRT outputs two <iframe>s with unique names. > > > > -------- >-Frame: '<!--framePath //<!--frame1-->/<!--frame0-->-->' >+Frame: '<!--frame3-->' > -------- > Frame 0 > > -------- >-Frame: '<!--framePath //<!--frame1-->/<!--frame1-->-->' >+Frame: '<!--frame4-->' > -------- > Frame 1 >diff --git a/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt b/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt >index f0da833198a8041e6c835f87af0f3adfdab3bdde..cf4650a786fb31747ea310cdc4fcccea0110bae9 100644 >--- a/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt >+++ b/LayoutTests/fast/frames/iframe-set-inner-html-expected.txt >@@ -2,11 +2,11 @@ > This tests that inserting two <iframe> elements using innerHTML actually causes two frames with unique names to be created. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/fast/frames/layout-after-destruction-expected.txt b/LayoutTests/fast/frames/layout-after-destruction-expected.txt >index 8810955569541560f2caf9e9408ed47d075b7020..efe60e7e63b425205de0b54444ebc830ce49b732 100644 >--- a/LayoutTests/fast/frames/layout-after-destruction-expected.txt >+++ b/LayoutTests/fast/frames/layout-after-destruction-expected.txt >@@ -1,5 +1,5 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > This test should not assert on reload in a debug build. > > Element in top frame >diff --git a/LayoutTests/fast/frames/long-names-in-nested-subframes-expected.txt b/LayoutTests/fast/frames/long-names-in-nested-subframes-expected.txt >index 38919676bc6addcc4dcd42b111ce761215e624ae..4e85bfc6f71ad6bd5b85ca00093272cfdfc35d76 100644 >--- a/LayoutTests/fast/frames/long-names-in-nested-subframes-expected.txt >+++ b/LayoutTests/fast/frames/long-names-in-nested-subframes-expected.txt >@@ -11,21 +11,21 @@ Frame: 'and_this_name_is_long_too_so_we_would_get_pretty_long_names' > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->/<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->/<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->/<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > >diff --git a/LayoutTests/fast/frames/page-unload-document-open-expected.txt b/LayoutTests/fast/frames/page-unload-document-open-expected.txt >index 3ce3a5b432cbfcefa96081fd7ba77c7f861bc01b..66d8f11919b9a444b01b39631b1f6b3a3b89d39b 100644 >--- a/LayoutTests/fast/frames/page-unload-document-open-expected.txt >+++ b/LayoutTests/fast/frames/page-unload-document-open-expected.txt >@@ -1,2 +1,2 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Passes if it does not crash. >diff --git a/LayoutTests/fast/frames/reparent-in-unload-contentdocument-expected.txt b/LayoutTests/fast/frames/reparent-in-unload-contentdocument-expected.txt >index 1034926e1c5fd3afaa4b6aceb5f2a5c98f2e6a67..4742185d57fd079dca2529fba5f71b121e4a1887 100644 >--- a/LayoutTests/fast/frames/reparent-in-unload-contentdocument-expected.txt >+++ b/LayoutTests/fast/frames/reparent-in-unload-contentdocument-expected.txt >@@ -6,6 +6,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > Should be visible. >diff --git a/LayoutTests/fast/frames/sandboxed-iframe-noscript-expected.txt b/LayoutTests/fast/frames/sandboxed-iframe-noscript-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/fast/frames/sandboxed-iframe-noscript-expected.txt >+++ b/LayoutTests/fast/frames/sandboxed-iframe-noscript-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt b/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt >index 4ab88c7f5a1a97097de24779b272c5615ca7d4b8..0fd5e7ffa8662b45bba5cbde9277ef5e2fd42885 100644 >--- a/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt >+++ b/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt >@@ -12,7 +12,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS window.openDatabase('SandboxedIframeStorageDisallowed', '1.0', '', 1) threw exception SecurityError: The operation is insecure.. > PASS window.localStorage threw exception SecurityError: The operation is insecure.. >@@ -20,7 +20,7 @@ PASS window.sessionStorage threw exception SecurityError: The operation is insec > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS window.openDatabase('SandboxedIframeStorageAllowed', '1.0', '', 1) != null is true > PASS window.localStorage != null is true >diff --git a/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing-expected.txt b/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing-expected.txt >index d19c5fee612ff24572659a87f202382ecb333f9a..e417bca2ba8afa997f22b1523ce9ab952685d3c7 100644 >--- a/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing-expected.txt >+++ b/LayoutTests/fast/frames/srcdoc/setting-src-does-nothing-expected.txt >@@ -3,6 +3,6 @@ This test ensures that setting the src attribute does not cause the document ins > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate-expected.txt b/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate-expected.txt >+++ b/LayoutTests/fast/frames/srcdoc/srcdoc-can-navigate-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content-expected.txt b/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content-expected.txt >+++ b/LayoutTests/fast/frames/srcdoc/srcdoc-loads-content-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt b/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt >index c8fb25de602a4b7156930cf084411d9a57d308cd..eed810ff1fcd567eefa3e91d86eff4723a80c3fe 100644 >--- a/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt >+++ b/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt >@@ -5,5 +5,5 @@ This test PASSED if there is no assertion failure and you see two JavaScript ale > ============== Back Forward List ============== > curr-> (file test):fast/history/back-from-page-with-focused-iframe.html **nav target** > data:text/html,<!DOCTYPE html><html><iframe srcdoc="<script> window.onfocus = function() { window.onblur = function () { alert(/iframe blurred/); }; window.top.onfocus = function () { alert(/main frame focused/); }; window.top.history.back(); }; window.focus(); </script>"></iframe></html> **nav target** >- about:srcdoc (in frame "<!--framePath //<!--frame0-->-->") >+ about:srcdoc (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt b/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt >index 0b4fbc4072471450be6397dca27ca13b250f6e73..46f2ebff84488681f908317cd4505aedc564536b 100644 >--- a/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt >+++ b/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt >@@ -11,12 +11,12 @@ Final URL loaded. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > final page contents > > ============== Back Forward List ============== > curr-> (file test):fast/history/history-back-initial-vs-final-url.html **nav target** >- (file test):fast/history/resources/frame-final-url.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):fast/history/resources/frame-final-url.html (in frame "<!--frame1-->") > data:text/html,<script>alert("Going back.");history.back();</script> **nav target** > =============================================== >diff --git a/LayoutTests/fast/history/redirect-via-iframe-expected.txt b/LayoutTests/fast/history/redirect-via-iframe-expected.txt >index ff970081f43e6b054b7345d44523deff5ab553fd..4a84cb2661d91e63e8196dfadf36475dfc527cbc 100644 >--- a/LayoutTests/fast/history/redirect-via-iframe-expected.txt >+++ b/LayoutTests/fast/history/redirect-via-iframe-expected.txt >@@ -5,6 +5,6 @@ PASS: History item count should be 2 and is. > > ============== Back Forward List ============== > (file test):fast/history/redirect-via-iframe.html **nav target** >- (file test):fast/history/resources/iframe-redirect.html#2 (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):fast/history/resources/iframe-redirect.html#2 (in frame "<!--frame1-->") > curr-> (file test):fast/history/resources/redirect-target.html#2 **nav target** > =============================================== >diff --git a/LayoutTests/fast/loader/child-frame-add-after-back-forward-expected.txt b/LayoutTests/fast/loader/child-frame-add-after-back-forward-expected.txt >index c4a70bc0dd7adbc1bd3cb8b8b9873d195bd3ca32..f0ce496fab82bfb6313303bea02d20b238ef3892 100644 >--- a/LayoutTests/fast/loader/child-frame-add-after-back-forward-expected.txt >+++ b/LayoutTests/fast/loader/child-frame-add-after-back-forward-expected.txt >@@ -3,6 +3,6 @@ main frame - has 1 onunload handler(s) > Go forward then back. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item-expected.txt b/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item-expected.txt >index 1f9b19fd1e51d6a20e4593d2cb7d73a63d27a739..6a99e7e463735d1f6a6d6d261d0c2fe5cd29172d 100644 >--- a/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item-expected.txt >+++ b/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item-expected.txt >@@ -4,5 +4,5 @@ This page appends an iframe after onload. That iframe should *not* result in a n > > ============== Back Forward List ============== > curr-> (file test):fast/loader/dynamic-iframe-extra-back-forward-item.html **nav target** >- (file test):fast/loader/resources/notify-done.html (in frame "<!--framePath //<!--frame0-->-->") >+ (file test):fast/loader/resources/notify-done.html (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/fast/loader/fragment-navigation-base-blank-expected.txt b/LayoutTests/fast/loader/fragment-navigation-base-blank-expected.txt >index 5732b7cfe80610c47d0b5c97c4193971a388f05e..995829f251804785814774ddac2e4230abda9afc 100644 >--- a/LayoutTests/fast/loader/fragment-navigation-base-blank-expected.txt >+++ b/LayoutTests/fast/loader/fragment-navigation-base-blank-expected.txt >@@ -1,11 +1,11 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didChangeLocationWithinPageForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didChangeLocationWithinPageForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > ALERT: Test finished due to hash change with a window count of 1 > >diff --git a/LayoutTests/fast/loader/frame-location-change-not-added-to-history-expected.txt b/LayoutTests/fast/loader/frame-location-change-not-added-to-history-expected.txt >index 7803941fe0c3e8dac38efa62d748cfac44059e31..28c65d7f30d3dac0010201fb0541d1d4939c1648 100644 >--- a/LayoutTests/fast/loader/frame-location-change-not-added-to-history-expected.txt >+++ b/LayoutTests/fast/loader/frame-location-change-not-added-to-history-expected.txt >@@ -3,5 +3,5 @@ history.length = 1 > > ============== Back Forward List ============== > curr-> (file test):fast/loader/frame-location-change-not-added-to-history.html **nav target** >- data:,hello (in frame "<!--framePath //<!--frame0-->-->") >+ data:,hello (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/fast/loader/frame-src-change-added-to-history-expected.txt b/LayoutTests/fast/loader/frame-src-change-added-to-history-expected.txt >index 10d64a6393265fb0108421e50aafa2d00c476875..8ddef4b8231be006d784b9e5233bcbf0ded33cfc 100644 >--- a/LayoutTests/fast/loader/frame-src-change-added-to-history-expected.txt >+++ b/LayoutTests/fast/loader/frame-src-change-added-to-history-expected.txt >@@ -1,17 +1,17 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > 1 > > ============== Back Forward List ============== > (file test):fast/loader/frame-src-change-added-to-history.html **nav target** >- data:,4 (in frame "<!--framePath //<!--frame0-->-->") >+ data:,4 (in frame "<!--frame1-->") > (file test):fast/loader/frame-src-change-added-to-history.html >- data:,3 (in frame "<!--framePath //<!--frame0-->-->") **nav target** >+ data:,3 (in frame "<!--frame1-->") **nav target** > (file test):fast/loader/frame-src-change-added-to-history.html >- data:,2 (in frame "<!--framePath //<!--frame0-->-->") **nav target** >+ data:,2 (in frame "<!--frame1-->") **nav target** > curr-> (file test):fast/loader/frame-src-change-added-to-history.html >- data:,1 (in frame "<!--framePath //<!--frame0-->-->") **nav target** >+ data:,1 (in frame "<!--frame1-->") **nav target** > =============================================== >diff --git a/LayoutTests/fast/loader/frame-src-change-not-added-to-history-expected.txt b/LayoutTests/fast/loader/frame-src-change-not-added-to-history-expected.txt >index 89bb1fa32c7cf69a4f7521b6766f10dfc7a02636..4df6d2acfe7d2fcdd5275ab3ad1f5f5e84024676 100644 >--- a/LayoutTests/fast/loader/frame-src-change-not-added-to-history-expected.txt >+++ b/LayoutTests/fast/loader/frame-src-change-not-added-to-history-expected.txt >@@ -3,5 +3,5 @@ history.length = 1 > > ============== Back Forward List ============== > curr-> (file test):fast/loader/frame-src-change-not-added-to-history.html **nav target** >- data:,hello (in frame "<!--framePath //<!--frame0-->-->") >+ data:,hello (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt b/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt >index 80244bc9afc8c5a63d0ee80827375b1550665e58..8ebb471883e1d529711455783dfc1243ddd9d64c 100644 >--- a/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt >+++ b/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame2-->" - has 1 onunload handler(s) > ALERT: Subframe onload > ALERT: Subframe onpageshow > CONSOLE MESSAGE: line 16: Use of window.alert is not allowed while unloading a page. >diff --git a/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt b/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt >index 98c5ace3ffbf3f6b0413e64c241a80a968d5a95a..60bcd81963091ae7098ae0d59464d5105eba4ca9 100644 >--- a/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt >+++ b/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt >@@ -5,12 +5,12 @@ If the explanatory text on the grandchild frame is still there, the test has fai > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is the parent of a frame that redirects itself. > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/fast/loader/iframe-meta-refresh-base-blank-expected.txt b/LayoutTests/fast/loader/iframe-meta-refresh-base-blank-expected.txt >index 513679f2bc7f892007912e61946036cc241bc24e..661539af2610cc8d723a5db42584a1de96e46da4 100644 >--- a/LayoutTests/fast/loader/iframe-meta-refresh-base-blank-expected.txt >+++ b/LayoutTests/fast/loader/iframe-meta-refresh-base-blank-expected.txt >@@ -1,17 +1,17 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: Finishing test with a window count of 1 >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/fast/loader/iframe-set-location-base-blank-expected.txt b/LayoutTests/fast/loader/iframe-set-location-base-blank-expected.txt >index 9d8d96651b54543ed28d4891f2142625ac8147c3..c691f846012d62254844d36888e20399d34cd14b 100644 >--- a/LayoutTests/fast/loader/iframe-set-location-base-blank-expected.txt >+++ b/LayoutTests/fast/loader/iframe-set-location-base-blank-expected.txt >@@ -1,17 +1,17 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: Finishing test with a window count of 1 >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-async-delegate-expected.txt b/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-async-delegate-expected.txt >index 5221265c7325cf813f2f3f59bea74fa72fe1edcd..40254b9826830257da68606a8bcc59aa98b61194 100644 >--- a/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-async-delegate-expected.txt >+++ b/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-async-delegate-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did not crash. >diff --git a/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-expected.txt b/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-expected.txt >index 5221265c7325cf813f2f3f59bea74fa72fe1edcd..40254b9826830257da68606a8bcc59aa98b61194 100644 >--- a/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-expected.txt >+++ b/LayoutTests/fast/loader/inner-iframe-loads-data-url-into-parent-on-unload-crash-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did not crash. >diff --git a/LayoutTests/fast/loader/page-dismissal-modal-dialogs-expected.txt b/LayoutTests/fast/loader/page-dismissal-modal-dialogs-expected.txt >index c0cf2220587b30766862fcef6362fb0813d4a132..9823f1b55602bb1997c216eb0c5a4735a375024d 100644 >--- a/LayoutTests/fast/loader/page-dismissal-modal-dialogs-expected.txt >+++ b/LayoutTests/fast/loader/page-dismissal-modal-dialogs-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > CONSOLE MESSAGE: line 8: Use of window.alert is not allowed while unloading a page. > CONSOLE MESSAGE: line 9: Use of window.confirm is not allowed while unloading a page. > CONSOLE MESSAGE: line 10: Use of window.prompt is not allowed while unloading a page. >diff --git a/LayoutTests/fast/loader/ping-error-expected.txt b/LayoutTests/fast/loader/ping-error-expected.txt >index 5fc8dd057033ad7bfff636989449a941dcdb6093..8329fb8d030a83ce858a9a87f3e45c4392faa662 100644 >--- a/LayoutTests/fast/loader/ping-error-expected.txt >+++ b/LayoutTests/fast/loader/ping-error-expected.txt >@@ -1,2 +1,2 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Test for bug 46579: Reproducible crash in appcache code when closing pgatour.com >diff --git a/LayoutTests/fast/loader/plain-text-document-expected.txt b/LayoutTests/fast/loader/plain-text-document-expected.txt >index 598e38d2b9cc6bbb86b9f24b52632fbe7a2f517f..d6d94c6b82300f41f96c6305d93147125b280977 100644 >--- a/LayoutTests/fast/loader/plain-text-document-expected.txt >+++ b/LayoutTests/fast/loader/plain-text-document-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: You should see this message in the browser. > >diff --git a/LayoutTests/fast/loader/refresh-iframe-base-blank-expected.txt b/LayoutTests/fast/loader/refresh-iframe-base-blank-expected.txt >index 41c63d25d3fd009c8a81d9d5c91abdbe281002f3..c0de4b6876df9bee250f7728ecd7542fb151aba1 100644 >--- a/LayoutTests/fast/loader/refresh-iframe-base-blank-expected.txt >+++ b/LayoutTests/fast/loader/refresh-iframe-base-blank-expected.txt >@@ -1,17 +1,17 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/refresh-iframe-base-blank-frame.html >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/refresh-iframe-base-blank-frame.html >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > ALERT: Test finished with 1 windows >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt b/LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt >index afc32573a4508b9035602930dcf78d50b1363969..d8d4095859895a9c06e2827d7154a625f0230817 100644 >--- a/LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt >+++ b/LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt >@@ -79,7 +79,7 @@ Successfully added item: 74 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Adding state objects in iframe > Successfully added item: 0 >diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe-expected.txt b/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe-expected.txt >index 0015ed111981172ca7acfeb9e6e8dc38a750fbc1..ed601576e709a819115ec4e99a95732559896202 100644 >--- a/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe-expected.txt >+++ b/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe-expected.txt >@@ -1,2 +1,2 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > PASS >diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt b/LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt >index 018d833086fe98943245d55997599096eb548b99..3aad9fd11a244edd524747ae10f04a021715bc0c 100644 >--- a/LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt >+++ b/LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt >@@ -78,7 +78,7 @@ Successfully added item: 74 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Adding state objects in iframe > Successfully added item: 0 >diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe-expected.txt b/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe-expected.txt >index bcb4dd3c7018851bd48f633ef1e32128f846686e..5a0121520d12a579fe7d25e990a30a38cc2a1f22 100644 >--- a/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe-expected.txt >+++ b/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe-expected.txt >@@ -1,7 +1,7 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > ALERT: Navigating back... > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > ALERT: onpopstate > PASS >diff --git a/LayoutTests/fast/loader/stop-provisional-loads-expected.txt b/LayoutTests/fast/loader/stop-provisional-loads-expected.txt >index 056f6688d5d76d91af5af5b5872ed2d316e47c9f..99cc2cd00e54844b6e938e67800689a56b602db9 100644 >--- a/LayoutTests/fast/loader/stop-provisional-loads-expected.txt >+++ b/LayoutTests/fast/loader/stop-provisional-loads-expected.txt >@@ -1,3 +1,3 @@ >-frame "<!--framePath //<!--frame0-->-->" - stopping load in didStartProvisionalLoadForFrame callback >+frame "<!--frame1-->" - stopping load in didStartProvisionalLoadForFrame callback > This tests to see if a WebKit app that calls [WebFrame stopLoading] inside of a -webView:didStartProvisionalLoadForFrame: frame load delegate method call crashes. > This test will only work in DRT >diff --git a/LayoutTests/fast/loader/subframe-removes-itself-expected.txt b/LayoutTests/fast/loader/subframe-removes-itself-expected.txt >index fbe733977c999213d9dbfbbe1cb59d7bd6053ce6..2cc31f4daee0456afeb5bf5506fc0077562b08e6 100644 >--- a/LayoutTests/fast/loader/subframe-removes-itself-expected.txt >+++ b/LayoutTests/fast/loader/subframe-removes-itself-expected.txt >@@ -1,7 +1,7 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFailLoadWithError > main frame - didFinishLoadForFrame > This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires. >diff --git a/LayoutTests/fast/loader/subframe-self-close-expected.txt b/LayoutTests/fast/loader/subframe-self-close-expected.txt >index 872b552a246bdf781ffc57c2bbd17de175a67809..116ee86b6f6c876c75acb5b13eeca4eecaca5609 100644 >--- a/LayoutTests/fast/loader/subframe-self-close-expected.txt >+++ b/LayoutTests/fast/loader/subframe-self-close-expected.txt >@@ -4,7 +4,7 @@ That self.close() call should not close this window. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This subframe calls "self.close()" as it's very first action. > That self.close() call should not close the window. >diff --git a/LayoutTests/fast/loader/unload-hyperlink-targeted-expected.txt b/LayoutTests/fast/loader/unload-hyperlink-targeted-expected.txt >index 0015ed111981172ca7acfeb9e6e8dc38a750fbc1..ed601576e709a819115ec4e99a95732559896202 100644 >--- a/LayoutTests/fast/loader/unload-hyperlink-targeted-expected.txt >+++ b/LayoutTests/fast/loader/unload-hyperlink-targeted-expected.txt >@@ -1,2 +1,2 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > PASS >diff --git a/LayoutTests/fast/parser/double-write-from-closed-iframe-expected.txt b/LayoutTests/fast/parser/double-write-from-closed-iframe-expected.txt >index b4612eed69dfd55487ee06b42efcdc29029d76ed..2f5f1c2cdec334bec696d221c11cc2e6b5c2c83b 100644 >--- a/LayoutTests/fast/parser/double-write-from-closed-iframe-expected.txt >+++ b/LayoutTests/fast/parser/double-write-from-closed-iframe-expected.txt >@@ -5,6 +5,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/parser/iframe-sets-parent-to-javascript-url-expected.txt b/LayoutTests/fast/parser/iframe-sets-parent-to-javascript-url-expected.txt >index 72fce4b86aaba26b33b5a8ecc9aa5d223af16787..b33ed79bad3c56915924e1cc4b603c2866c450c9 100644 >--- a/LayoutTests/fast/parser/iframe-sets-parent-to-javascript-url-expected.txt >+++ b/LayoutTests/fast/parser/iframe-sets-parent-to-javascript-url-expected.txt >@@ -5,6 +5,6 @@ ALERT: 4 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/fast/parser/javascript-url-compat-mode-expected.txt b/LayoutTests/fast/parser/javascript-url-compat-mode-expected.txt >index 806d0606a2399ed2cf66041cb20dfbc6e8c3b6c7..ca2a0c0a9a686c835ced0bb0e95b226d15133f7f 100644 >--- a/LayoutTests/fast/parser/javascript-url-compat-mode-expected.txt >+++ b/LayoutTests/fast/parser/javascript-url-compat-mode-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > BackCompat >diff --git a/LayoutTests/fast/parser/move-during-parsing-expected.txt b/LayoutTests/fast/parser/move-during-parsing-expected.txt >index 4861609ac7e059fbbcc6420817270e97bd600329..40d5a333bfc7dadeea2cdb4425e24f955c16daf6 100644 >--- a/LayoutTests/fast/parser/move-during-parsing-expected.txt >+++ b/LayoutTests/fast/parser/move-during-parsing-expected.txt >@@ -7,6 +7,6 @@ Middle of Page > End of Page > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt b/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt >index 0ab9d2c603ae9d388b4c5e6edb0700bdba48d189..c9717d87fd3592d0c2fc096211e4cbd1a9c90ebd 100644 >--- a/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt >+++ b/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt >@@ -1,6 +1,6 @@ > The text inside the 'noscript' tag inside the iframe should render: > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This test case verifies that contents inside are rendered when Javascript is disabled. >diff --git a/LayoutTests/fast/parser/pre-html5-parser-quirks-expected.txt b/LayoutTests/fast/parser/pre-html5-parser-quirks-expected.txt >index 5bccd1c4a4442d710de491ed1278d8a9ea3b60a4..d6f3ccd4547a67fc580ced1c7f933c74747cf776 100644 >--- a/LayoutTests/fast/parser/pre-html5-parser-quirks-expected.txt >+++ b/LayoutTests/fast/parser/pre-html5-parser-quirks-expected.txt >@@ -3,21 +3,21 @@ This tests that certain pre-HTML5 parser rules are applied when the WebKitUsePre > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > AfterAttributeNameState: > Start Tag: PASS > End Tag: PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > AfterAttributeValueQuotedState: > Start Tag: PASS > End Tag: PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > AfterAttributeValueUnquotedState: > Start Tag: PASS >@@ -26,21 +26,21 @@ End Tag: PASS > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > AttributeNameState: > Start Tag: PASS > End Tag: PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > BeforeAttributeNameState: > Start Tag: PASS > End Tag: PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > Document fragment: > Start Tag: PASS >@@ -50,21 +50,21 @@ End Tag: PASS > > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > TagNameState: > Start Tag: PASS > End Tag: PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > Self-closing <script> in head: > Parsing: PASS > External script loading: PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > Self-closing <script> in body: > Parsing: PASS >diff --git a/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt b/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt >index d9c48ed10f064d6fcb263b444106098a64b24db6..88597de6bb0a0f51c966c7e9eb5920bbc3c85f0a 100644 >--- a/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt >+++ b/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: line 1: PASS > This test has to be run as a layout test in order to see if resources were loaded and the test passed. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > <script src=resources/script1.js></script> >diff --git a/LayoutTests/fast/tokenizer/text-plain-expected.txt b/LayoutTests/fast/tokenizer/text-plain-expected.txt >index 34b460ee39b5e46092ffed3c834cad9cea752ecb..228e665b34479da4e85351d8a7cec3c9a5f6b590 100644 >--- a/LayoutTests/fast/tokenizer/text-plain-expected.txt >+++ b/LayoutTests/fast/tokenizer/text-plain-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > hi >diff --git a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt >index 178b1aa918f7c0859d943963886314157938de42..219f011b00f46f2d7781fc2174d92ae174ce2534 100644 >--- a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt >+++ b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt >@@ -4,7 +4,7 @@ CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load xmlhttprequest-no-file-acce > The child iframe cannot paste its textual results into this iframe because it is considered a different domain - that's the point of this test! Therefore, success is denoted by the child iframe calling notifyDone. The test will hang if something goes amiss with the access control checks. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > We're checking we can't read an arbitrary file when we set each file:// URI to have a unique domain. >diff --git a/LayoutTests/fast/xsl/xslt-text-expected.txt b/LayoutTests/fast/xsl/xslt-text-expected.txt >index aa9cca16b746fb62007dd29fd8c04bd9e68e6678..d2229ae497d6899e3aa6bbcc0725fa5cde4a1566 100644 >--- a/LayoutTests/fast/xsl/xslt-text-expected.txt >+++ b/LayoutTests/fast/xsl/xslt-text-expected.txt >@@ -8,7 +8,7 @@ SOURCE XML: <<<&ÑеÑÑ&>>></pre> > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CHARACTERS IN XSLT: <<<&ÑеÑÑ&>>> > SOURCE XML: <<<&ÑеÑÑ&>>> >diff --git a/LayoutTests/http/tests/appcache/x-frame-options-prevents-framing-expected.txt b/LayoutTests/http/tests/appcache/x-frame-options-prevents-framing-expected.txt >index 696ebfac0ee3d44bbea7ba9995198c51c7f4901b..88d854d209fafff774fb5be0ae02d2a29e8e1ead 100644 >--- a/LayoutTests/http/tests/appcache/x-frame-options-prevents-framing-expected.txt >+++ b/LayoutTests/http/tests/appcache/x-frame-options-prevents-framing-expected.txt >@@ -5,6 +5,6 @@ It also had "x-frame-options: deny" set, so it should not actually show up in th > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url-expected.txt b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url-expected.txt >index fd8d2a9079bfa7ecff5040f25f444bcb269dc972..de8ac49ab04641818c81b37335814a575dd57691 100644 >--- a/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url-expected.txt >+++ b/LayoutTests/http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url-expected.txt >@@ -3,6 +3,6 @@ This test verifies that a link redirected by a document which is loaded with Con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page-expected.txt b/LayoutTests/http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page-expected.txt >index 97f2a76658c20cdb856e9c83fd25bb8ee3a5c4a8..75e165c3d4168b4486157596c3c05ebff146627a 100644 >--- a/LayoutTests/http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page-expected.txt >+++ b/LayoutTests/http/tests/cookies/same-site/fetch-after-navigating-iframe-in-cross-origin-page-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Tests that Same-Site cookies for 127.0.0.1 are not sent with a frame navigation for a frame embedded in a page with a different origin. > >diff --git a/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-iframe-expected.txt b/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-iframe-expected.txt >index 926c30dac238bd8a70e12e63fd3d1e82f17f278c..9ed840ae1d71f10b902892d80e19268c781abe88 100644 >--- a/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-iframe-expected.txt >+++ b/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-iframe-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Tests that Same-Site cookies for 127.0.0.1 are not sent with a request initiated from a iframe with a different origin. > >diff --git a/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-service-worker-expected.txt b/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-service-worker-expected.txt >index 2ee7c210a17724d38b2ecbdee71b121b3e8dfe9d..86fc3a5b69245a8416c8354498634902a8aaf35d 100644 >--- a/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-service-worker-expected.txt >+++ b/LayoutTests/http/tests/cookies/same-site/fetch-in-cross-origin-service-worker-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Tests that Same-Site cookies for 127.0.0.1 are not sent with a request initiated from an iframe- and processed by a service worker- with a different origin. > >diff --git a/LayoutTests/http/tests/cookies/same-site/fetch-in-same-origin-service-worker-expected.txt b/LayoutTests/http/tests/cookies/same-site/fetch-in-same-origin-service-worker-expected.txt >index 4fb70b7aa9d33d16370c28815280d77afa02677e..4d61a69aaa848d60080da716454ceb041fab857c 100644 >--- a/LayoutTests/http/tests/cookies/same-site/fetch-in-same-origin-service-worker-expected.txt >+++ b/LayoutTests/http/tests/cookies/same-site/fetch-in-same-origin-service-worker-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Tests that Same-Site cookies for 127.0.0.1 are sent with a request initiated from an iframe- and processed by a service worker- with the same origin. > >diff --git a/LayoutTests/http/tests/from-origin/document-from-origin-same-accepted-expected.txt b/LayoutTests/http/tests/from-origin/document-from-origin-same-accepted-expected.txt >index 8d705790ee63119d89553cadb18806934894e9e6..1387d5624e6233366963bf2b3d45e64936091b98 100644 >--- a/LayoutTests/http/tests/from-origin/document-from-origin-same-accepted-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-from-origin-same-accepted-expected.txt >@@ -9,6 +9,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The iframe >diff --git a/LayoutTests/http/tests/from-origin/document-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/document-from-origin-same-blocked-expected.txt >index 135e430193bffc35fa29e78d6c1e3d95d0414670..221bfdb4c13a97c7cec29dbea36de4b8b65d23ee 100644 >--- a/LayoutTests/http/tests/from-origin/document-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-from-origin-same-blocked-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/document-from-origin-same-site-accepted-expected.txt b/LayoutTests/http/tests/from-origin/document-from-origin-same-site-accepted-expected.txt >index ea7ee63561ec456b274220f1f1811299954819a3..bec0fefb39cdb597428e1274a297955745ae881c 100644 >--- a/LayoutTests/http/tests/from-origin/document-from-origin-same-site-accepted-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-from-origin-same-site-accepted-expected.txt >@@ -9,6 +9,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The iframe >diff --git a/LayoutTests/http/tests/from-origin/document-from-origin-same-site-blocked-expected.txt b/LayoutTests/http/tests/from-origin/document-from-origin-same-site-blocked-expected.txt >index 28b97d452a29c6d9f6cc158e67e4f0ef218635f8..e1dbf6d05f0b8c72a22965e5652dd9577483d7a9 100644 >--- a/LayoutTests/http/tests/from-origin/document-from-origin-same-site-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-from-origin-same-site-blocked-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-accepted-expected.txt b/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-accepted-expected.txt >index 1ac9b3b7d407b9b53bc3bbd443cc8468269ca134..b049c4192216b46811a220db5c75462e6de29b0b 100644 >--- a/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-accepted-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-accepted-expected.txt >@@ -9,13 +9,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The outer iframe, loading a nested 127.0.0.1 iframe. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > The iframe >diff --git a/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-blocked-expected.txt >index 6cef629f8f60934c4c5173566088766b54ab8491..f9663b4da3d7b0938502b7008cb9f5c811584851 100644 >--- a/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/document-nested-from-origin-same-blocked-expected.txt >@@ -10,13 +10,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The outer iframe, loading a nested localhost iframe. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt >index 8fc51cd06222a25643374573c2add2d466f18019..6cb9d39d148695d7566928ca8dd31868b93d4a3b 100644 >--- a/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt >@@ -12,6 +12,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The iframe making a 127.0.0.1 fetch call. >diff --git a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-accepted-expected.txt b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-accepted-expected.txt >index 23c874436a1cd2c8fdf211817114a634e8c11435..786196182ee8333fc56c05ae35d41679718dac56 100644 >--- a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-accepted-expected.txt >+++ b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-accepted-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The iframe making a 127.0.0.1 fetch call. >diff --git a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt >index 12bd4acd1ed2ab31ac2dd956798c11225df8dab1..952a90d6b7b1f4c81aaf00e0c422af34290152e7 100644 >--- a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt >@@ -14,11 +14,11 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The iframe making a localhost fetch call. > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > The iframe making a 127.0.0.1 fetch call. >diff --git a/LayoutTests/http/tests/from-origin/redirect-document-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/redirect-document-from-origin-same-blocked-expected.txt >index 051c7058cbf7e70e57d3811203f9424ee82675e1..a47453b3cd2c918fca8cd61affeea53774ad70cf 100644 >--- a/LayoutTests/http/tests/from-origin/redirect-document-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/redirect-document-from-origin-same-blocked-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-from-origin-same-blocked-expected.txt >index 946da80854ac36762dc13113109fb741e2faf933..6e7d9da2b2f9f8d718b69825a91ff4500b084351 100644 >--- a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-from-origin-same-blocked-expected.txt >@@ -11,6 +11,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-cross-origin-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-cross-origin-from-origin-same-blocked-expected.txt >index 3d989aa95f7442ebd632aa57bd8ca4c20f931c1b..1d432aeaadf6a401aa20e3de9eb31c7242bf39af 100644 >--- a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-cross-origin-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-cross-origin-from-origin-same-blocked-expected.txt >@@ -10,13 +10,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The outer iframe, loading a nested localhost iframe. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-same-origin-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-same-origin-from-origin-same-blocked-expected.txt >index 93be80aab181a8394a97698ee57045d67306d01b..5b0746e36d725a67533a427788fad4cddfc97687 100644 >--- a/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-same-origin-from-origin-same-blocked-expected.txt >+++ b/LayoutTests/http/tests/from-origin/sandboxed-sub-frame-nested-same-origin-from-origin-same-blocked-expected.txt >@@ -10,13 +10,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The outer iframe, loading a nested 127.0.0.1 iframe. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt b/LayoutTests/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >index 9f04d16b2c28e5a91feafaca3dfac2b8703bb0a8..8b7e9d49ae39c8cb1bc6a6bf39b820b71ce6a066 100644 >--- a/LayoutTests/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >+++ b/LayoutTests/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >@@ -1,22 +1,22 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-1-redirect-to-auth.php - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-3-output-credentials-then-finish.php >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-3-output-credentials-then-finish.php >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > This test causes an HTTP authentication challenge in the middle of a redirect chain. > It then loads a new page after that challenge, and the new page should *not* get any credentials passed to it. > See bug 78003 for more details. >@@ -24,7 +24,7 @@ See bug 78003 for more details. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No HTTP authentication credentials > >diff --git a/LayoutTests/http/tests/loading/basic-auth-remove-credentials-expected.txt b/LayoutTests/http/tests/loading/basic-auth-remove-credentials-expected.txt >index e380901df6528cb076c13a4d8c38dacb6e138d7c..e4c7bbd0b750398b7dde684e0ffa340c9cdc2761 100644 >--- a/LayoutTests/http/tests/loading/basic-auth-remove-credentials-expected.txt >+++ b/LayoutTests/http/tests/loading/basic-auth-remove-credentials-expected.txt >@@ -1,20 +1,20 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with first:first-pw >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with second:second-pw >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > This test verifies that we are able to remove credentials, by checking that we get an authenticaton. > challenge for a path we normally would not get a challenge for, after having removed all credentials. > The first frame's path is /loading/resources/protected-resource.php, and we should get a challenge for it. >@@ -24,11 +24,11 @@ It will be authorized with second/second-pw. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: first password: first-pw > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Authenticated as user: second password: second-pw >diff --git a/LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt b/LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >index 4ef6ab6d03fd6a63d3997651f02ae8ec0e0880dd..5d95a32a5ef54aba338c772eee597196c864ae6d 100644 >--- a/LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >+++ b/LayoutTests/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >@@ -3,27 +3,27 @@ main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/test2/protected-resource.php - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/test2/basic-auth-testing.php?username=correctusername&password=correctpassword - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > This test makes sure that once WebCore preemptively sends out Basic credentials it thinks apply to a new resource, and that resource response with a 401 challenge, that it doesn't try to send the same wrong credentials a second time. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: wrongusername password: wrongpassword > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Authenticated as user: correctusername password: correctpassword >diff --git a/LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt b/LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt >index 5f23a3dbb6ed34e156902a3b86e82096406701e4..8e0d068b74fd4bb87b896bc8b78aae70c8d1119f 100644 >--- a/LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt >+++ b/LayoutTests/http/tests/loading/basic-credentials-sent-automatically-expected.txt >@@ -3,28 +3,28 @@ main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/subresources/protected-resource.php - didReceiveAuthenticationChallenge - Responding with first:first-pw >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/protected-resource.php - didReceiveAuthenticationChallenge - Responding with second:second-pw >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame3-->" - didStartProvisionalLoadForFrame >+frame "<!--frame3-->" - didCommitLoadForFrame >+frame "<!--frame3-->" - didFinishDocumentLoadForFrame >+frame "<!--frame3-->" - didHandleOnloadEventsForFrame >+frame "<!--frame3-->" - didFinishLoadForFrame >+frame "<!--frame4-->" - didStartProvisionalLoadForFrame >+frame "<!--frame4-->" - didCommitLoadForFrame >+frame "<!--frame4-->" - didFinishDocumentLoadForFrame >+frame "<!--frame4-->" - didHandleOnloadEventsForFrame >+frame "<!--frame4-->" - didFinishLoadForFrame > This test makes sure that once an HTTP Basic Auth. protected path is authenticated once, urls that emanate from that path automatically have their credentials sent without a challenge. > The first frame's path is /loading/resources/subresources/protected-resource.php, and we should get a challenge for it. > It will be authorized with first/first-pw. >@@ -37,21 +37,21 @@ It will be authorized with second/second-pw. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: first password: first-pw > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Authenticated as user: second password: second-pw > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Authenticated as user: second password: second-pw > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Authenticated as user: second password: second-pw >diff --git a/LayoutTests/http/tests/loading/pdf-commit-load-callbacks-expected.txt b/LayoutTests/http/tests/loading/pdf-commit-load-callbacks-expected.txt >index bf3afc2ade91fae18a1eb46546a29cf461dbc6e0..3c8ae9a7526bd939e1b5f31068c35e66404fec19 100644 >--- a/LayoutTests/http/tests/loading/pdf-commit-load-callbacks-expected.txt >+++ b/LayoutTests/http/tests/loading/pdf-commit-load-callbacks-expected.txt >@@ -1,11 +1,11 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/http/tests/loading/redirect-with-no-location-crash-expected.txt b/LayoutTests/http/tests/loading/redirect-with-no-location-crash-expected.txt >index d1c6439b7d71e1be7d33b110a2546bcb330e9576..88f20964786faf48b4d1ffae7bcac4a23861177a 100644 >--- a/LayoutTests/http/tests/loading/redirect-with-no-location-crash-expected.txt >+++ b/LayoutTests/http/tests/loading/redirect-with-no-location-crash-expected.txt >@@ -1,12 +1,12 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didReceiveTitle: Test for https://bugs.webkit.org/show_bug.cgi?id=29293 >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt b/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >index 16f9372d7c4eb1a7b18c4e9fdb85cc3285780a95..070ffa96b09ce5f24160b7552f6f398ce45561a2 100644 >--- a/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >+++ b/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >@@ -1,29 +1,29 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html - didFinishLoading > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect-result.html, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect.php, http status code 301> >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200> >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame. > > >diff --git a/LayoutTests/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt b/LayoutTests/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >index b0a9833b3aee969a5d1f59af0c0d562a10ead95e..516e0d6f711f952b6b03381795fc47fbc8a276d7 100644 >--- a/LayoutTests/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >+++ b/LayoutTests/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >@@ -7,21 +7,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username '' and password '' >diff --git a/LayoutTests/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt b/LayoutTests/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >index 7ddbd8c7b67a5bfdc298be4f8b190bc359ea52ae..df1d842a6cd8c562f9f94cd269801c5b613f2046 100644 >--- a/LayoutTests/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >+++ b/LayoutTests/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >@@ -7,21 +7,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' >diff --git a/LayoutTests/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt b/LayoutTests/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >index 784ae6843cb789b7ca071e5793446908111f63b1..963b580c2fcb46dcbb61e124a93388a685620993 100644 >--- a/LayoutTests/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >+++ b/LayoutTests/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >@@ -8,21 +8,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' >diff --git a/LayoutTests/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt b/LayoutTests/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >index b27daf8fd7426fc718bcfe95866565f4e46fc1e1..441b1195348a0c8142ed0d26f8be76e09e3cf06b 100644 >--- a/LayoutTests/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >+++ b/LayoutTests/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >@@ -6,6 +6,6 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/misc/authentication-redirect-4/resources/auth-echo.php loaded with HTTP authentication username 'testUser' and password 'testPassword' >diff --git a/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt b/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt >index 35c80f230d387a137646dbb3ff976d50cc6a9c8c..da7414a723fa7fe17c610148cd582bdf9d316c9b 100644 >--- a/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt >+++ b/LayoutTests/http/tests/misc/last-modified-parsing-expected.txt >@@ -1,36 +1,36 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Fri, 21 Nov 2008 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Fri, 21 Nov 2008 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Fri, 21 Nov 1997 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Fri, 21 Nov 2008 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Thu, 21 Feb 2008 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > Sun, 03 Feb 2008 01:03:33 GMT > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > Mon, 03 Mar 2008 01:03:33 GMT >diff --git a/LayoutTests/http/tests/misc/policy-delegate-called-twice-expected.txt b/LayoutTests/http/tests/misc/policy-delegate-called-twice-expected.txt >index 644c734fdda9f8c6f705a01be122278e07f222fa..3248fd57658fb9c65c28d17aaa9a390a4ba3b4dc 100644 >--- a/LayoutTests/http/tests/misc/policy-delegate-called-twice-expected.txt >+++ b/LayoutTests/http/tests/misc/policy-delegate-called-twice-expected.txt >@@ -3,6 +3,6 @@ This page has an iframe which will navigate itself. The policy delegate callback > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > You've reached the second page. Congratulations. >diff --git a/LayoutTests/http/tests/misc/redirect-to-external-url-expected.txt b/LayoutTests/http/tests/misc/redirect-to-external-url-expected.txt >index c9e412836e3942caf43943c2c4f8dcb8803693ac..872ebc4203cefd1a6a84332eaf44b25cf9411c02 100644 >--- a/LayoutTests/http/tests/misc/redirect-to-external-url-expected.txt >+++ b/LayoutTests/http/tests/misc/redirect-to-external-url-expected.txt >@@ -1,12 +1,12 @@ > Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/redirect-to-external-url.php with navigation type 'link clicked' originating from HTML > #document > Policy delegate: attempt to load spaceballs://the-flamethrower/ with navigation type 'link clicked' originating from HTML > #document >-Policy delegate: unable to implement policy with error domain 'WebKitErrorDomain', error code 101, in frame '<!--framePath //<!--frame0-->-->' >+Policy delegate: unable to implement policy with error domain 'WebKitErrorDomain', error code 101, in frame '<!--frame1-->' > This page has an iframe. It loads then navigates to an http url which redirects to an externally handled url. > The navigation policy delegate should be consulted about the http url and the external url. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is a page with a link in it. When the link it clicked it will navigate to another page. That page redirects to an externally handled URL. > The policy delegate should be asked about the initial navigation and the redirect. >diff --git a/LayoutTests/http/tests/misc/webtiming-origins-expected.txt b/LayoutTests/http/tests/misc/webtiming-origins-expected.txt >deleted file mode 100644 >index 5fd77c892581f6623845e700a946be78b5beda72..0000000000000000000000000000000000000000 >--- a/LayoutTests/http/tests/misc/webtiming-origins-expected.txt >+++ /dev/null >@@ -1,106 +0,0 @@ >- >- >--------- >-Frame: '<!--framePath //<!--frame0-->-->' >--------- >-Web Timing should report zeros for redirects and unload since there was no preceding page. >- >-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >- >- >-PASS timing.connectEnd is non-zero. >-PASS timing.connectStart is non-zero. >-PASS timing.domComplete is non-zero. >-PASS timing.domContentLoadedEventEnd is non-zero. >-PASS timing.domContentLoadedEventStart is non-zero. >-PASS timing.domInteractive is non-zero. >-PASS timing.domLoading is non-zero. >-PASS timing.domainLookupEnd is non-zero. >-PASS timing.domainLookupStart is non-zero. >-PASS timing.fetchStart is non-zero. >-PASS timing.loadEventEnd is 0 >-PASS timing.loadEventStart is non-zero. >-PASS timing.navigationStart is non-zero. >-PASS timing.redirectEnd is 0 >-PASS timing.redirectStart is 0 >-PASS timing.requestStart is non-zero. >-PASS timing.responseEnd is non-zero. >-PASS timing.responseStart is non-zero. >-PASS timing.secureConnectionStart is 0 >-PASS timing.unloadEventEnd is 0 >-PASS timing.unloadEventStart is 0 >-PASS navigation.redirectCount is 0 >-PASS successfullyParsed is true >- >-TEST COMPLETE >- >- >--------- >-Frame: '<!--framePath //<!--frame1-->-->' >--------- >-Web Timing should zero out redirect stats after a cross-origin redirect. >- >-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >- >- >-PASS timing.connectEnd is non-zero. >-PASS timing.connectStart is non-zero. >-PASS timing.domComplete is non-zero. >-PASS timing.domContentLoadedEventEnd is non-zero. >-PASS timing.domContentLoadedEventStart is non-zero. >-PASS timing.domInteractive is non-zero. >-PASS timing.domLoading is non-zero. >-PASS timing.domainLookupEnd is non-zero. >-PASS timing.domainLookupStart is non-zero. >-PASS timing.fetchStart is non-zero. >-PASS timing.loadEventEnd is 0 >-PASS timing.loadEventStart is non-zero. >-PASS timing.navigationStart is non-zero. >-PASS timing.redirectEnd is 0 >-PASS timing.redirectStart is 0 >-PASS timing.requestStart is non-zero. >-PASS timing.responseEnd is non-zero. >-PASS timing.responseStart is non-zero. >-PASS timing.secureConnectionStart is 0 >-PASS timing.unloadEventEnd is 0 >-PASS timing.unloadEventStart is 0 >-PASS navigation.redirectCount is 0 >-PASS successfullyParsed is true >- >-TEST COMPLETE >- >- >--------- >-Frame: '<!--framePath //<!--frame2-->-->' >--------- >-If the destination and previous page have the same origin, then Web Timing should report unload timing. >- >-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". >- >- >-PASS timing.connectEnd is non-zero. >-PASS timing.connectStart is non-zero. >-PASS timing.domComplete is non-zero. >-PASS timing.domContentLoadedEventEnd is non-zero. >-PASS timing.domContentLoadedEventStart is non-zero. >-PASS timing.domInteractive is non-zero. >-PASS timing.domLoading is non-zero. >-PASS timing.domainLookupEnd is non-zero. >-PASS timing.domainLookupStart is non-zero. >-PASS timing.fetchStart is non-zero. >-PASS timing.loadEventEnd is 0 >-PASS timing.loadEventStart is non-zero. >-PASS timing.navigationStart is non-zero. >-PASS timing.redirectEnd is 0 >-PASS timing.redirectStart is 0 >-PASS timing.requestStart is non-zero. >-PASS timing.responseEnd is non-zero. >-PASS timing.responseStart is non-zero. >-PASS timing.secureConnectionStart is 0 >-PASS timing.unloadEventEnd is 0 >-PASS timing.unloadEventStart is 0 >-PASS navigation.redirectCount is 0 >-PASS successfullyParsed is true >- >-TEST COMPLETE >- >diff --git a/LayoutTests/http/tests/navigation/back-to-slow-frame-expected.txt b/LayoutTests/http/tests/navigation/back-to-slow-frame-expected.txt >index 786701eb6e978b0d560d2ddd570e81a83cb493a9..e632c0b7d63bcf05e53b88487e46eecbb84a2352 100644 >--- a/LayoutTests/http/tests/navigation/back-to-slow-frame-expected.txt >+++ b/LayoutTests/http/tests/navigation/back-to-slow-frame-expected.txt >@@ -6,6 +6,6 @@ If testing manually click here. > ============== Back Forward List ============== > http://127.0.0.1:8000/navigation/back-to-slow-frame.html **nav target** > curr-> http://127.0.0.1:8000/navigation/resources/back-to-slow-frame-2.html **nav target** >- http://127.0.0.1:8000/navigation/resources/slow-resource-1-sec.pl (in frame "<!--framePath //<!--frame0-->-->") >+ http://127.0.0.1:8000/navigation/resources/slow-resource-1-sec.pl (in frame "<!--frame1-->") > http://127.0.0.1:8000/navigation/resources/back-to-slow-frame-3.html **nav target** > =============================================== >diff --git a/LayoutTests/http/tests/navigation/forward-and-cancel-expected.txt b/LayoutTests/http/tests/navigation/forward-and-cancel-expected.txt >index 69bd361c8b5847ce16f8cc40760cda51963887a8..54285289f6aafabd9758c3a50e8b4df87fcda475 100644 >--- a/LayoutTests/http/tests/navigation/forward-and-cancel-expected.txt >+++ b/LayoutTests/http/tests/navigation/forward-and-cancel-expected.txt >@@ -3,11 +3,11 @@ > ============== Back Forward List ============== > http://127.0.0.1:8000/navigation/forward-and-cancel.html **nav target** > http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames-container.html **nav target** >- http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--framePath //<!--frame0-->-->") >+ http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--frame1-->") > about:blank (in frame "frame1") >- http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--framePath //<!--frame1-->-->") >+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--frame2-->") > curr-> http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames-container.html >- http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--framePath //<!--frame0-->-->") >+ http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--frame1-->") > http://127.0.0.1:8000/navigation/resources/slow-resource.pl?delay=250 (in frame "frame1") **nav target** >- http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--framePath //<!--frame1-->-->") >+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--frame2-->") > =============================================== >diff --git a/LayoutTests/http/tests/navigation/image-load-in-subframe-unload-handler-expected.txt b/LayoutTests/http/tests/navigation/image-load-in-subframe-unload-handler-expected.txt >index d62869f0183c5a88d7de9a3a58cf33b15d2dc69e..dc1bc0e94f6eb2f02565c066ea00159fb25a46ba 100644 >--- a/LayoutTests/http/tests/navigation/image-load-in-subframe-unload-handler-expected.txt >+++ b/LayoutTests/http/tests/navigation/image-load-in-subframe-unload-handler-expected.txt >@@ -1,2 +1,2 @@ >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > This test triggers an unload handler that starts an image load in a different frame (and deletes both frames), but ensures the main frame is not destroyed. We pass if we don't crash. >diff --git a/LayoutTests/http/tests/navigation/lockedhistory-iframe-expected.txt b/LayoutTests/http/tests/navigation/lockedhistory-iframe-expected.txt >index 85e2f5f8d58e1b1fc25b7602152d731f273e3f27..558eca86eb20decf7dd7a97c74672dd505ffca2d 100644 >--- a/LayoutTests/http/tests/navigation/lockedhistory-iframe-expected.txt >+++ b/LayoutTests/http/tests/navigation/lockedhistory-iframe-expected.txt >@@ -4,5 +4,5 @@ This test verifies that setting the iframe.src through javascript to # does not > > ============== Back Forward List ============== > curr-> http://127.0.0.1:8000/navigation/lockedhistory-iframe.html **nav target** >- about:blank (in frame "<!--framePath //<!--frame0-->-->") >+ about:blank (in frame "<!--frame1-->") > =============================================== >diff --git a/LayoutTests/http/tests/navigation/post-frames-expected.txt b/LayoutTests/http/tests/navigation/post-frames-expected.txt >index c00e5f235dcde2b9c544f2eb26790b09733a642a..d5c68645e38041292d7852a84d535b950d29f448 100644 >--- a/LayoutTests/http/tests/navigation/post-frames-expected.txt >+++ b/LayoutTests/http/tests/navigation/post-frames-expected.txt >@@ -3,7 +3,7 @@ Tests that a POST request in a frame is handled correctly. If this test passes, > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page was requested with the HTTP method POST. > >@@ -14,7 +14,7 @@ submitwithpost = Submit with POST > > ============== Back Forward List ============== > http://127.0.0.1:8000/navigation/post-frames.html **nav target** >- http://127.0.0.1:8000/navigation/resources/page-that-posts.html (in frame "<!--framePath //<!--frame0-->-->") >+ http://127.0.0.1:8000/navigation/resources/page-that-posts.html (in frame "<!--frame1-->") > curr-> http://127.0.0.1:8000/navigation/post-frames.html >- http://127.0.0.1:8000/navigation/resources/form-target.pl (in frame "<!--framePath //<!--frame0-->-->") **nav target** >+ http://127.0.0.1:8000/navigation/resources/form-target.pl (in frame "<!--frame1-->") **nav target** > =============================================== >diff --git a/LayoutTests/http/tests/navigation/reload-subframe-frame-expected.txt b/LayoutTests/http/tests/navigation/reload-subframe-frame-expected.txt >index 9214593db26e3594da9f7b130e179a114264e9b3..49da63a908dfbf1386b7fba909ef547211c125b3 100644 >--- a/LayoutTests/http/tests/navigation/reload-subframe-frame-expected.txt >+++ b/LayoutTests/http/tests/navigation/reload-subframe-frame-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Pass >diff --git a/LayoutTests/http/tests/navigation/reload-subframe-iframe-expected.txt b/LayoutTests/http/tests/navigation/reload-subframe-iframe-expected.txt >index 9214593db26e3594da9f7b130e179a114264e9b3..49da63a908dfbf1386b7fba909ef547211c125b3 100644 >--- a/LayoutTests/http/tests/navigation/reload-subframe-iframe-expected.txt >+++ b/LayoutTests/http/tests/navigation/reload-subframe-iframe-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Pass >diff --git a/LayoutTests/http/tests/navigation/reload-subframe-object-expected.txt b/LayoutTests/http/tests/navigation/reload-subframe-object-expected.txt >index 9214593db26e3594da9f7b130e179a114264e9b3..49da63a908dfbf1386b7fba909ef547211c125b3 100644 >--- a/LayoutTests/http/tests/navigation/reload-subframe-object-expected.txt >+++ b/LayoutTests/http/tests/navigation/reload-subframe-object-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Pass >diff --git a/LayoutTests/http/tests/preload/download_resources_from_header_iframe-expected.txt b/LayoutTests/http/tests/preload/download_resources_from_header_iframe-expected.txt >index 62fd64f7d2fa18a5c58ed7277602fccef699b986..4cea025f5aef078cfe6bdbe9a8b65cad8cd1a9a3 100644 >--- a/LayoutTests/http/tests/preload/download_resources_from_header_iframe-expected.txt >+++ b/LayoutTests/http/tests/preload/download_resources_from_header_iframe-expected.txt >@@ -3,7 +3,7 @@ CONSOLE MESSAGE: <link rel=preload> must have a valid `as` value > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS internals.isPreloaded('../resources/dummy.js'); is true > PASS internals.isPreloaded('../resources/dummy.css'); is true >diff --git a/LayoutTests/http/tests/preload/download_resources_from_invalid_headers-expected.txt b/LayoutTests/http/tests/preload/download_resources_from_invalid_headers-expected.txt >index 0eab277a97b345891a9a03c04a6811301521e8d9..56ce6540e3bd6c352d38de7e033cf3c989010706 100644 >--- a/LayoutTests/http/tests/preload/download_resources_from_invalid_headers-expected.txt >+++ b/LayoutTests/http/tests/preload/download_resources_from_invalid_headers-expected.txt >@@ -3,7 +3,7 @@ CONSOLE MESSAGE: <link rel=preload> must have a valid `as` value > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS internals.isPreloaded('../resources/dummy.js'); is true > PASS internals.isPreloaded('../ÞéÃÂÃâÃâ¢ÃÂ/dummy.css'); is false >diff --git a/LayoutTests/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt b/LayoutTests/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >index 39014ec177fa2a7fcc3ba74e6ce5a8a8fe4c0084..cb5de031bb78fa5db9acc094ace36938180b4dbf 100644 >--- a/LayoutTests/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >+++ b/LayoutTests/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >@@ -3,6 +3,6 @@ CONSOLE MESSAGE: Refused to load data:text/css,body::after { content: 'FAIL'; } > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt b/LayoutTests/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >index bb0c97837c25a42a76494fd639c98d881ca3a1da..cde42b3066343094e718fc357428995c478e2b9b 100644 >--- a/LayoutTests/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >+++ b/LayoutTests/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >@@ -5,12 +5,12 @@ This test verifies that loading a cross-origin iframe is blocked when created by > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/quicklook/document-domain-is-empty-string-expected.txt b/LayoutTests/http/tests/quicklook/document-domain-is-empty-string-expected.txt >index 344705e2ecd3e13bc23e8218af0f41bb1aa61dee..c8aaa7224d08a8d1e0ebae692a7e1029c1f8bd8d 100644 >--- a/LayoutTests/http/tests/quicklook/document-domain-is-empty-string-expected.txt >+++ b/LayoutTests/http/tests/quicklook/document-domain-is-empty-string-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: line 1: Viewport argument value "612;" for key "width" was trun > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS document.domain is . >diff --git a/LayoutTests/http/tests/quicklook/external-stylesheet-blocked-expected.txt b/LayoutTests/http/tests/quicklook/external-stylesheet-blocked-expected.txt >index 39014ec177fa2a7fcc3ba74e6ce5a8a8fe4c0084..cb5de031bb78fa5db9acc094ace36938180b4dbf 100644 >--- a/LayoutTests/http/tests/quicklook/external-stylesheet-blocked-expected.txt >+++ b/LayoutTests/http/tests/quicklook/external-stylesheet-blocked-expected.txt >@@ -3,6 +3,6 @@ CONSOLE MESSAGE: Refused to load data:text/css,body::after { content: 'FAIL'; } > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/http/tests/quicklook/hide-referer-on-navigation-expected.txt b/LayoutTests/http/tests/quicklook/hide-referer-on-navigation-expected.txt >index 62c5a6c22f5012d7d87e4100abe596a3ea39ea50..5ad70325893317b61361e2e0a29927fcc5a377c5 100644 >--- a/LayoutTests/http/tests/quicklook/hide-referer-on-navigation-expected.txt >+++ b/LayoutTests/http/tests/quicklook/hide-referer-on-navigation-expected.txt >@@ -4,6 +4,6 @@ This test verifies that the HTTP referrer is hidden when navigating from a Micro > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/quicklook/rtf-document-domain-is-empty-string-expected.txt b/LayoutTests/http/tests/quicklook/rtf-document-domain-is-empty-string-expected.txt >index ecd7468ec34b670a4187b63fe8c3199076ba2445..d931fc303f653d8de58b34b2184e29fca4faaed6 100644 >--- a/LayoutTests/http/tests/quicklook/rtf-document-domain-is-empty-string-expected.txt >+++ b/LayoutTests/http/tests/quicklook/rtf-document-domain-is-empty-string-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS document.domain is . >diff --git a/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt b/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt >index 5d07e461b5a639231ebc53ddc2c4af852ced42ad..3514f2ac866d3c60e0753efa290580f774475886 100644 >--- a/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt >+++ b/LayoutTests/http/tests/quicklook/same-origin-xmlhttprequest-allowed-expected.txt >@@ -4,6 +4,6 @@ CONSOLE MESSAGE: line 1: PASS: XMLHttpRequest allowed > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/http/tests/quicklook/top-navigation-blocked-expected.txt b/LayoutTests/http/tests/quicklook/top-navigation-blocked-expected.txt >index b9c90dcf911346e7fde8fad64ab71285d41ae1ad..6a364b71d0feb553b806f88b48854e328c5d2d8b 100644 >--- a/LayoutTests/http/tests/quicklook/top-navigation-blocked-expected.txt >+++ b/LayoutTests/http/tests/quicklook/top-navigation-blocked-expected.txt >@@ -5,6 +5,6 @@ CONSOLE MESSAGE: SecurityError: The operation is insecure. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-expected.txt >index 3386c577eb6859d2332878d95ad2ca1e50f4771e..afef9cd26e861b0fdb14f5dc0b0a1600f4e8dad4 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-expected.txt >@@ -9,7 +9,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -17,7 +17,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Redirect case 1, should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -25,7 +25,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -33,7 +33,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Redirect case 2, should receive no cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -41,13 +41,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Try to set third-party cookie in blocked mode. > > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > After attempted cookie creation, should receive no cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -55,7 +55,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > Redirect case 3, after attempted cookie creation, should receive no cookie. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/add-partitioning-to-redirect-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/add-partitioning-to-redirect-expected.txt >index 4f636db2ed6a08d0eb031dd95cc0e24e309957e4..5ad72987ace38a50a5ac3c6242e4128f0ef1d0d2 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/add-partitioning-to-redirect-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/add-partitioning-to-redirect-expected.txt >@@ -9,7 +9,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -17,7 +17,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Redirect case, should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -25,7 +25,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -33,7 +33,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Redirect case, should receive no cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -41,13 +41,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Set partitioned, third-party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > Should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -55,7 +55,7 @@ Received cookie named 'partitionedCookie'. > Client-side document.cookie: partitionedCookie=value > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > Redirect case, should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt >index 74e311dc048eac1d6bc1984323790060f3747638..fc3c3d4794f3c848808125ee24101eb686b84091 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt >@@ -4,7 +4,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive one cookie. > Received cookie named 'firstPartyCookie'. >@@ -12,13 +12,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Setting partitioned, third party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should receive one partitioned, third party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -26,7 +26,7 @@ Received cookie named 'partitionedCookie'. > Client-side document.cookie: partitionedCookie=value > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > After user interaction, should receive one non-partitioned, first party cookie. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt >index 77f2e39c15381b36f281d623e764ed27ec30c149..24cdd2c7b066e90d71f99b89f09aa10410057f8a 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt >@@ -9,7 +9,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -17,13 +17,13 @@ Did not receive cookie named 'thirdPartyCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Setting partitioned, third party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should only receive partitioned, third party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -31,7 +31,7 @@ Received cookie named 'thirdPartyCookie'. > Client-side document.cookie: thirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > After removal, should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -39,7 +39,7 @@ Did not receive cookie named 'thirdPartyCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > After user interaction, should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt >index afdbda4e38bf355b5f57fcdff6a46e7d8e7e8a86..a53351128d056f513fbe15577d3fd222c1e04bad 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt >@@ -4,7 +4,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -12,13 +12,13 @@ Did not receive cookie named 'thirdPartyCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Setting partitioned, third-party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should only receive partitioned, third-party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -26,7 +26,7 @@ Received cookie named 'thirdPartyCookie'. > Client-side document.cookie: thirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > After first user interaction, should only receive un-partitioned cookie. > Received cookie named 'firstPartyCookie'. >@@ -34,7 +34,7 @@ Did not receive cookie named 'thirdPartyCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Should only receive partitioned, third-party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -42,7 +42,7 @@ Received cookie named 'thirdPartyCookie'. > Client-side document.cookie: thirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > After second user interaction, should only receive un-partitioned cookie. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt >index 87e7e5ad4798bf7b261cf4f0da3a5ffb3aadf5d4..ee90c6ac2461be71371ec148583fc7068cafc34a 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt >@@ -4,7 +4,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive no cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -12,13 +12,13 @@ Did not receive cookie named 'thirdPartyCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Setting partitioned, third party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Should only receive partitioned, third party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -26,7 +26,7 @@ Received cookie named 'thirdPartyCookie'. > Client-side document.cookie: thirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > After user interaction, should only receive non-partitioned, first party cookie. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt >index f23a6568710681231ad3c0c9ea3f86ea945866c3..0c22b622fe197e3233bdedc649d7f3e2a9321032 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/remove-blocking-in-redirect-expected.txt >@@ -9,7 +9,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -17,7 +17,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Redirect case 1, should receive first-party cookie for 127.0.0.1. > Received cookie named 'firstPartyCookie'. >@@ -25,13 +25,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=127.0.0.1 > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Set partitioned, third-party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Should receive no cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -39,7 +39,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Redirect case 2, should receive first-party cookie for 127.0.0.1. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/remove-partitioning-in-redirect-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/remove-partitioning-in-redirect-expected.txt >index f9527ad06d3fe81f0e33e183a5bc3b9c8aa89df6..03f0255ff4fbe868fd8787e0ff0d3e9a126de074 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/remove-partitioning-in-redirect-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/remove-partitioning-in-redirect-expected.txt >@@ -9,7 +9,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -17,7 +17,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Redirect case 1, should receive first-party cookie for 127.0.0.1. > Received cookie named 'firstPartyCookie'. >@@ -25,13 +25,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=127.0.0.1 > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Set partitioned, third-party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -39,7 +39,7 @@ Received cookie named 'partitionedCookie'. > Client-side document.cookie: partitionedCookie=value > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > Redirect case 2, should receive first-party cookie for 127.0.0.1. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-expected.txt >index e4d588de65f68445e551c13bcf2d6b2e9d012c62..d3ca3b498f4e08d0290b97c0ffeed7637257879f 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-expected.txt >index ab1ac498af9039fde04ff25eb4f1706afe99aba1..34776eaa1d272cf37329b2573d91d50948df007c 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-expected.txt >@@ -11,6 +11,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt >index d3ce08182ab7c62358101beb2f12fd499378f956..1b384a874747b9f215b02766e0fc9bc613780e66 100644 >--- a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt >+++ b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt >@@ -4,13 +4,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Setting cookie as third party. > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Should receive both the cookie set in a first-party context and in a third-party context. > Received cookie named 'firstPartyCookie'. >@@ -19,13 +19,13 @@ Did not receive cookie named 'partitionedThirdPartyCookie'. > Client-side document.cookie: firstPartyCookie=value,thirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Setting partitioned, third party cookie. > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Should only receive partitioned, third party cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -34,7 +34,7 @@ Received cookie named 'partitionedThirdPartyCookie'. > Client-side document.cookie: partitionedThirdPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > After user interaction, should receive non-partitioned cookies set in a first-party context and in a third-party context. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >index 2bd603741cae2c51b799a8aa59474bb15b3877a1..951a6ab83d926faca16af24adf47353112cb0bfb 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >@@ -6,6 +6,6 @@ The frame below should load, and 'ALLOWALL' should be accepted as a valid header > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This text should show up. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >index 0c046434fbb8e1146c12a9c895eacd29e4188b37..6e5a89da2dc797167eaa13c0662d030d738169a3 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >@@ -9,6 +9,6 @@ There should be no content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >index 53e43d5ac9d92df7afbe39def328921c7530402a..af532681e3a562123e4a711c8bf2ea337b8332cd 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >@@ -8,6 +8,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should be displayed. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >index 252724fcf3330bef16dd8d5a1ec3610dc7d6e647..b091b705f72095903de1b4ace623b605ebdd089d 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >@@ -8,7 +8,7 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should be displayed. > >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >index a7de95ac4f25d50f0b065d7deb37f3dbe0da049e..33dd91d5cf2c6aeb248f073d68d12e22e3c89576 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >@@ -8,6 +8,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up as the parent is in the same origin. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >index 3bf245c876b2e4d5b99133ac295bc3cd05bf1cd2..912af6d271db3cc48adcde15475953e8a67a97fd 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >@@ -9,6 +9,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up even though the parent is not in the same origin because we should be ignoring the meta tag. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >index 4a6d75d9e802a7a0821bedb3d3b408bff625b77d..9b9a3ef4dec3b9c210e334d765b7405bded264dd 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >@@ -7,6 +7,6 @@ The frame below should load, and a console message should be generated that note > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This text should show up. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >index 0eedd1e4f42a820f933baf06795dc9449929e07b..3eb11ddba64b74810de2b487bc1e64080cf048f0 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >@@ -8,6 +8,6 @@ The frame below should not load, and a console message should be generated that > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >index b2d79066e3c317b4eed7901d623e81762cc588fb..f35990945fedcf7ac43731c59bb20728dc66444f 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >@@ -6,6 +6,6 @@ The frame below should load, proving that 'sameorigin, sameorigin' === 'sameorig > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page should load iff it's same origin with it's parent. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >index f0228f8a65a676348ee37772c76f1947d753c2e0..359d962a9620d6ae530ad1a8ba65aca832486705 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >@@ -9,6 +9,6 @@ The frame below should not load, proving that 'sameorigin, sameorigin' === 'same > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >index f96cd69a20904fb993fcf2830392512da6e7b800..6cb68226adaae3d19939eb18d5811634887a6a8b 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >@@ -6,6 +6,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up as the parent is in the same origin. >diff --git a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >index b6caf7d7fda7552ac397762646043a7484549c6b..22cba614db01a8b13cb914a6631c5ff4f9db01b9 100644 >--- a/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >+++ b/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >@@ -9,6 +9,6 @@ There should be no content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt >index 29980617e2064b7d66bd0008d0ae2889be86ba3f..877d428432d4a12be2d6173c6eb659f642db1670 100644 >--- a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt >+++ b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt >@@ -5,11 +5,11 @@ Code injected into window: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page doesn't do anything special (except signal that it has finished loading). > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > SUCCESS: Window remained in original SecurityOrigin. >diff --git a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt >index f10074ca343a8ad390a29ddf48eb519a3c1fbca7..43781bbbb3875e2400894f2bb122e3b2481ec032 100644 >--- a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt >+++ b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url-expected.txt >@@ -5,11 +5,11 @@ Code injected into window: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page doesn't do anything special (except signal that it has finished loading). > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > SUCCESS: Window remained in original SecurityOrigin. >diff --git a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt >index ce884afcdec80ac956f66e858b7143bf038073c9..c0b698db69d3e28849952a39b25e0b09c706a32b 100644 >--- a/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt >+++ b/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt >@@ -9,11 +9,11 @@ setTimeout(function() { if (window.testRunner) testRunner.globalFlag = true; }, > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page doesn't do anything special. > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > SUCCESS: Window remained in original SecurityOrigin. >diff --git a/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt b/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt >index aff25b096acc59491b645b24173f508150a5ade5..00329217608d3552b8d2ae6e567acd65c11db0f3 100644 >--- a/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt >+++ b/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt >@@ -1,9 +1,10 @@ >+CONSOLE MESSAGE: line 1: ApplicationCache is deprecated. Please use ServiceWorkers instead. > CONSOLE MESSAGE: line 31: Application cache not loaded > This test passes if the application cache does not load while in private browsing > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt b/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt >index aaec7c2a63eb56e3a2551c9e1e87dffe09bd6a3e..e39d94da36a6e779f2865acf369146a5a291b313 100644 >--- a/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt >+++ b/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt >@@ -6,6 +6,6 @@ This test passes if the application cache does not load while in private browsin > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/canvas-cors-with-two-hosts-expected.txt b/LayoutTests/http/tests/security/canvas-cors-with-two-hosts-expected.txt >index ed7109df54b0cbc8d2d0948b93cb0f2cde3a1382..ee210207eaea441873f9a1eca9af63d9ce15c3f6 100644 >--- a/LayoutTests/http/tests/security/canvas-cors-with-two-hosts-expected.txt >+++ b/LayoutTests/http/tests/security/canvas-cors-with-two-hosts-expected.txt >@@ -1,13 +1,13 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-meta-element-ignored-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-meta-element-ignored-expected.txt >index 51d9966a4572d3ea49da37f444c4f00fd38ac04c..4e10e1194548c1c5703849a595bd8fa1ee01e390 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-meta-element-ignored-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-meta-element-ignored-expected.txt >@@ -4,6 +4,6 @@ Tests that loading a page in an <iframe> with Content Security Policy "frame-anc > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-report-only-ignored-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-report-only-ignored-expected.txt >index 84561e2a6c2fa271e7aa223c6b19869ca53479aa..2d9e465f321cba6d234a7d0ab2ef9630a1f3b28b 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-report-only-ignored-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-in-report-only-ignored-expected.txt >@@ -4,6 +4,6 @@ Tests that loading a page in an <iframe> with a report-only Content Security Pol > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-allow-same-origin-sandboxed-cross-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-allow-same-origin-sandboxed-cross-url-allow-expected.txt >index eefcad6f493abae70a897d226ea44332b2237952..4898c73826357c351ceb29e4237e83137767cec5 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-allow-same-origin-sandboxed-cross-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-allow-same-origin-sandboxed-cross-url-allow-expected.txt >@@ -9,13 +9,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://127.0.0.1:8000 http://localhost:8080" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000 http://localhost:8080". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt >index 1d9930dfe4b143b563d04802c5a9ceed7729760c..a441af821414c9ed545b0955440b30ab792dd17e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-none-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'none' should block rendering in > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "'none'" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt >index 2a732b55e78ed0d1bf29363e52af523997915178..8ccc6e8ff99b77440d95e46d5a509459528bdb15 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-self-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'same' should block render in sam > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "'self'" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt >index 4c8129282ac81bc39eec26f8abe154f1784785d5..765374dbc7343ea2c5c6502d3be6b3118d6ec49c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-star-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value '*' should render in nested frame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "*" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt >index 9f01b7402278e8c10bd46a573a80c2a5f56115b7..91180a33667a747a634e51cf34f0690c9e13d6de 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://127.0.0.1:8000 http://localhost:8080" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000 http://localhost:8080". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt >index 30597787373a513737f8f1679e1b504eb1276782..78b7ba8a7c530c2067b59b59fa162f60ddba0150 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-cross-url-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://localhost:8080" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt >index 1520356f88e873a3251aa6790e38c16e93bdc60b..71ce8a1ca06a7854aaec65d9571efe32f85223a2 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-none-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'none' should block rendering in > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "'none'" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt >index 0c3733e7316a486ae228e489b9297fdb99ad6018..00d2267e90e2712e3f7b8d77ae761d93829501b5 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-self-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'same' should block render in sam > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "'self'" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt >index 9a5cdbbcec9c1acc98c2c46de95b761180c5b75e..cf440356d634fbeb037015fcb915b6b1d53589d2 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value '*' should render in nested frame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "*" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt >index d987d5d7fa40316d23ae7a50e3a50d692a911977..27258a0e1c13dbe1807528d8ad318e0e4c1479c4 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://127.0.0.1:8000 http://localhost:8080" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000 http://localhost:8080". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt >index 065126d7fe425ec279330ae3dc46bcf281f5d3f6..2a94b3b205feb87f095a88aebf8df90355300395 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://localhost:8080" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block-expected.txt >index 8c7b541a4fc12f31057b40d5588814c6d6f7b9b7..01f7bbc690fbc21c2f56d57570104ca37a5efc28 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-cross-in-sandboxed-cross-url-block-expected.txt >@@ -10,13 +10,13 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a cross-origin child with a policy of "http://127.0.0.1:8000 http://localhost:8080" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt >index add2bef9c6cca4ce84f3f5204bf98726230f3377..6aaf8030f947139a0ba146db15962f62dbbd3f47 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-none-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'none' should block rendering in > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "'none'" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt >index 2a11e91dfb23444718df3860c325f4b23401369d..14bce238dbe041d70014f3415461a7f310e97be8 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-self-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'same' should block render in sam > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "'self'" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt >index 160b5e4755480b431bd6ecab42b16e84a4a36ea0..e60c4928dcdcdf4f97655385d7005aed0dfd548c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-star-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value '*' should render in nested frame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "*" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt >index 49bb80f74f2488bc1b13dce90b90797b4e86dc6c..09b6c400db4c646d4468f7dbbe44eb037b18de1b 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "http://127.0.0.1:8000 http://localhost:8080" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000 http://localhost:8080". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt >index 2528ea69873f26d39ea89e3ca903f5d0268a2603..3508aee9ceb6f422d232cb5f5487880a93b992a3 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-cross-url-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "http://127.0.0.1:8000" nested in a cross-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt >index c5299df51e2fc7130d026c56f3119d7a37ec9ce8..bbbfc64fafbf69d8ee5c44855eaffa7c79cce6eb 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-none-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a value 'none' should block rendering in > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "'none'" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt >index 607b0a0b0b53d175566981095799831fbf157067..092bd867f9cecaf78174324a3e13cb583f3a96bf 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-self-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value 'same' should block render in sam > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "'self'" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors 'self'". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt >index 966c2baf8c8a191be6676f37f0f0caed352b1069..4b55a1c3dcf6efd3c3767dddf5fff14c67cd1d57 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-star-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value '*' should render in nested frame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "*" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt >index 64ebe9ea62a2a390197537a74d7b9bafcfe98ee0..546859f0b20af36fc38a3195fab191375d7cec73 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "http://127.0.0.1:8000" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt >index 0759a37ce442d886ae742e6c854f1c75f5a06948..181f35aa821452a5d88a59f4804fe60192e040bb 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-nested-same-in-same-url-block-expected.txt >@@ -4,13 +4,13 @@ A 'frame-ancestors' CSP directive with a URL value should block or allow renderi > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "http://localhost:8080" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt >index 96890896545ca1239973a1e7ca9097c851bb13db..9d03209fbdd04494ab6a1e89bfd339e882152bf1 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-none-block-expected.txt >@@ -4,6 +4,6 @@ A 'frame-ancestors' CSP directive with a value 'none' should block rendering. Th > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-protocolless-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-protocolless-allow-expected.txt >index 37baa0aa583761dc72d0e880cb265adf810a2022..699ddee68d8d230612b1c532e2d1764cc6d07a6a 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-protocolless-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-protocolless-allow-expected.txt >@@ -3,13 +3,13 @@ A 'frame-ancestors' CSP directive with a value '*.0.0.1' should allow render in > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Testing a same-origin child with a policy of "*.0.0.1:8000" nested in a same-origin parent. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *.0.0.1:8000". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt >index 744b36a1bde779c98ce2b54415320a0e8c79aff2..f34f3f15ea424fa044831867afe66119077d4fa4 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-allow-expected.txt >@@ -3,6 +3,6 @@ A 'frame-ancestors' CSP directive with a value 'self' should allow rendering. Th > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors 'self'". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt >index 306fa881d6d7ea922bc469d7448b0b6896fe3085..d6f46091787886f39fe7ab1deaa736ea2a50ec27 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-self-block-expected.txt >@@ -4,6 +4,6 @@ A 'frame-ancestors' CSP directive with a value 'self' should allow rendering. Th > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt >index 61a596ef545c28d10b87e0c23acadb6ec908471c..ca4b2e0eab1c60e096f2a0a9c3ef76501582d038 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-crossorigin-expected.txt >@@ -3,6 +3,6 @@ A 'frame-ancestors' CSP directive with '*' should allow rendering. Note that we > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt >index 82fba7132092b59997f7d91389f8ec66af44665e..c1cb1cfa374d8ed6375fc5c90944cf98fa449145 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-star-allow-sameorigin-expected.txt >@@ -3,6 +3,6 @@ A 'frame-ancestors' CSP directive with '*' should allow rendering. This test PAS > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors *". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt >index 49c2eed2ea096d75ce904b08b2edc0374861e710..9e78dd0bd5998f83b4ad3b9dd8d0c2fe74f8a4b3 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-allow-expected.txt >@@ -3,6 +3,6 @@ A 'frame-ancestors' CSP directive with a URL matching this origin should allow r > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is an IFrame sending a Content Security Policy header containing "frame-ancestors http://127.0.0.1:8000". >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt >index 4f7845318f0216b56e390a4c83012e72859ea2c1..1c7a98a628e1e78df7a0da47f527d53e2f4663c3 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-url-block-expected.txt >@@ -4,6 +4,6 @@ A 'frame-ancestors' CSP directive with a URL which doesn't match this origin sho > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-blocked-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-blocked-expected.txt >index b1d0f4bcbd95ce6359003e504e1227b2a058d365..5722c7b635ede62ae4bf3bbe06f48d35c9324c1c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-blocked-expected.txt >@@ -5,26 +5,26 @@ Only the first two of these scripts should execute even though there are parse e > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >index e184d35b0c68bcbee70d9bed3dc5c7f6d0766574..5bccf7adbcf44f0b24ce20a73de0b60a26209378 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >@@ -4,7 +4,7 @@ CONSOLE MESSAGE: line 11: Refused to execute a script because its hash, its nonc > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script with nonce. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >index 5613fa5d10f365b039ea60a1ecde97170743078a..90ca3f2b44d74c39b1094f86dc6ca4c03c066d09 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: The Content Security Policy 'object-src 'none'' was delivered i > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script. >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-invalidnonce-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-invalidnonce-expected.txt >index d07866043854329589a2b0bd93f6b17560ff5f4f..d992b150823d22277748faa7d9f636420cc48148 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-invalidnonce-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/module-scriptnonce-invalidnonce-expected.txt >@@ -25,51 +25,51 @@ None of these scripts should execute, as all the nonces are invalid. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame9-->-->' >+Frame: '<!--frame10-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid-expected.txt >index be785936b7de578d3978e52c2f7a37cd6884d18c..0ef1a2dbdc13a01c83e27cdf79d035df9723c07d 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid-expected.txt >@@ -29,47 +29,47 @@ This tests our handling of invalid `plugin-types` CSP directives. Consider this > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01-expected.txt >index fb68d60dad4dae7c20347be67a14423eff59010d..0ff10a4a52aa63c1ebbdcfbeff9bb6298612d1c6 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01-expected.txt >@@ -3,27 +3,27 @@ This tests our handling of `data:` URLs, given a `plugin-types` CSP directive. C > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS. > > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS. > > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS. > > > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02-expected.txt >index 1b99ddd42fe8dec422c7b98fd6a575e605d0829e..3c5f74b5a73536876e33bd61924a4efea5949fff 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02-expected.txt >@@ -6,16 +6,16 @@ This tests our handling of non-`data:` URLs, given a `plugin-types` CSP directiv > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy-expected.txt >index 60bd32701d9ce415227c90c80a9dbcb71e72bdad..357be4c3319341b52f9a92d8bfef3571d05421c6 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy-expected.txt >@@ -4,7 +4,7 @@ PASS did execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy2-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy2-expected.txt >index d4034e6940c5b0885b370f952809f8fb5f093ae8..f3953b915ed72464dd5eb35ffb274677c3e0dbbd 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy2-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-enforced-policy-and-blocked-by-report-policy2-expected.txt >@@ -4,7 +4,7 @@ PASS did execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >index 010d34e348d6443fa2db2a280cbbb19bc87288a0..dee8e127d5b0a6d13583b20453cdbd55ef2b701e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >@@ -4,7 +4,7 @@ PASS did execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >index 16c3adecf126317755907abccb573ba10891d9ba..d5157021ee9b9a2184977936c04bf32194fe3579 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-allowed-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >@@ -4,7 +4,7 @@ PASS did execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >index 50cdd59b124ac5cf2095fa9273dc0dde35627c65..5e2eb2ed2187a25118f5463c2dd9bd640adb6059 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >@@ -6,7 +6,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >index ded01dd6abc63103052bfb2a0fc33aa69132626c..b2ffaa743e3ec65fd8a159e8c691065d56f4bc16 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >@@ -6,7 +6,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >index b059b3ef5888f52040d284938135bdb4a2087119..80d29dc5223fe4ddc22f38fd149abfb3450b2f52 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >@@ -5,7 +5,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >index 193dadf42c49b6969523320c655e37ae026acab6..b6d8ecd9c3cd4012fbd962f12e8976573fb08a9c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >@@ -5,7 +5,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-enforced-policy-and-not-in-report-only-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-enforced-policy-and-not-in-report-only-expected.txt >index 4dd20ca94aa3df66aca0427c7752c72b938540cb..cced774a0df2721e26d39cdeadbd0351d0582098 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-enforced-policy-and-not-in-report-only-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-enforced-policy-and-not-in-report-only-expected.txt >@@ -5,7 +5,7 @@ CONSOLE MESSAGE: line 7: Refused to execute a script because its hash, its nonce > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script with hash. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >index 5613fa5d10f365b039ea60a1ecde97170743078a..90ca3f2b44d74c39b1094f86dc6ca4c03c066d09 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: The Content Security Policy 'object-src 'none'' was delivered i > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script. >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >index c380f83e200dc50e2dfa9ecbfe59685d56d48fd6..f5891aad4235b070c92a7565753e9dde1a2b3e06 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-enforced-policy-and-allowed-by-report-policy-expected.txt >@@ -7,7 +7,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >index 015cdf32752ce2cfc521fe534bd71292363ed818..00110bcaa5fbfb7d731160845c03f9a825ac3fb6 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-allowed-by-report-policy-expected.txt >@@ -7,7 +7,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >index 533816ec19d8f7544dc5ca566e70fab6d732b4b4..d2a425fe0cac47c55cba7ac6da615896991e1328 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy-expected.txt >@@ -5,7 +5,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >index 2d433afdc3fcdea24dccca88e92e422d131fae94..dafd25f3d1ebe96fae0b6b701272cd411baf145f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-by-legacy-enforced-policy-and-blocked-by-report-policy2-expected.txt >@@ -5,7 +5,7 @@ PASS did not execute script. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-expected.txt >index b1d0f4bcbd95ce6359003e504e1227b2a058d365..5722c7b635ede62ae4bf3bbe06f48d35c9324c1c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-blocked-expected.txt >@@ -5,26 +5,26 @@ Only the first two of these scripts should execute even though there are parse e > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >index 66d7dfe14919c770cc316c7d91aff53c5fd828fa..b6f682b0ec2259bf07d2158a4eb9f899206f172a 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-enforced-policy-and-not-in-report-only-expected.txt >@@ -4,7 +4,7 @@ CONSOLE MESSAGE: line 9: Refused to execute a script because its hash, its nonce > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script with nonce. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >index 5613fa5d10f365b039ea60a1ecde97170743078a..90ca3f2b44d74c39b1094f86dc6ca4c03c066d09 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-in-one-enforced-policy-neither-in-another-enforced-policy-nor-report-policy-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: The Content Security Policy 'object-src 'none'' was delivered i > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS did execute script. >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-invalidnonce-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-invalidnonce-expected.txt >index d07866043854329589a2b0bd93f6b17560ff5f4f..d992b150823d22277748faa7d9f636420cc48148 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-invalidnonce-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scriptnonce-invalidnonce-expected.txt >@@ -25,51 +25,51 @@ None of these scripts should execute, as all the nonces are invalid. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame9-->-->' >+Frame: '<!--frame10-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt >index e8541102dd55af8b1772b03a6e8f8784c88918b0..5209e8ed2f6829675d39c863be05753bafa4f442 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-https-expected.txt >@@ -2,7 +2,7 @@ CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/resources/abe.pn > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Check that a SecurityPolicyViolationEvent is fired upon blocking an image. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/WebAssembly-blocked-in-subframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/WebAssembly-blocked-in-subframe-expected.txt >index f5b5437fb6959f082cdce9d58ac8414236008c20..568309230f7f86e72ea08993e4af79e1cfecbef3 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/WebAssembly-blocked-in-subframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/WebAssembly-blocked-in-subframe-expected.txt >@@ -15,6 +15,6 @@ Tests that WebAssembly is blocked in a subframe that disallows WebAssembly when > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >index 2c77637a47f4e305ee4b049e3e5d45c228e31632..c2536fe40754f4930e6fe17041d13e9f6d744e9e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >@@ -3,13 +3,13 @@ main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test opens a window and loads an insecure iframe using a data URL. We should *not* trigger a mixed content block because the data URL cannot be corrupted by an active network attacker. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >index d40ac1a94ed0a7574c0fc46ae506d0504844da01..a9966d20482c932a095a5bf3ebcad462abb7b7b8 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >@@ -1,19 +1,19 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure stylesheet. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This background color should be white. > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >index 5a43bb34180a5364ad89a076ccfaf499f0b1a7c2..582eaf1b5fda1c2c37340985134f222c40d073a1 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >@@ -1,26 +1,26 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [Report Only] Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: line 9: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php was not allowed to run insecure content from http://127.0.0.1:8000/security/mixedContent/resources/style.css. > >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: https://127.0.0.1:8443/security/contentSecurityPolicy/resources/echo-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: https://127.0.0.1:8443/security/contentSecurityPolicy/resources/echo-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure stylesheet. We should trigger a mixed content block even though the child frame has a report only CSP block-all-mixed-content directive because an active network attacker can use CSS3 to breach the confidentiality of the HTTPS security origin. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >index 2d9745a8e39689013daf2fa4e06a69da3ae0f3a1..c010ef57bc85377cce08fcb69c36ed498b82fa47 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >@@ -1,25 +1,25 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure iframe. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >index 878db2617f5d7183c8fa84d0221b3ef90bbccc49..c503f614fe70b15dd5a877076647f8329d42f960 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >@@ -3,9 +3,9 @@ main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >index 07fc3930147b7c2e4c2f94a7fec4e3209c90a58e..b29df803a18226e29de6f8e3620bcb1306e4ff36 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >index fc9ba5f6d7fe3cf91882f3d9e97b791a35855469..38e8ffb60e7ecd6b65fbf7060477ad4e13cff04d 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >@@ -1,20 +1,20 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame > CONSOLE MESSAGE: The Content Security Policy 'block-all-mixed-content' was delivered in report-only mode, but does not specify a 'report-uri'; the policy will have no effect. Please either add a 'report-uri' directive, or deliver the policy via the 'Content-Security-Policy' header. >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: [Report Only] Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame has an CSP directive block-all-mixed-content in an enforced policy. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >index 17472eec44b8df19036d67148c5dc66d9e690ad7..7d1b1706b986e18b9b294f9f997f0cc50f5a4222 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 1: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >index 27c59b1a3c2beb9f82f78435278913cffd7aa223..8c43c1895bd5e3eafa0db96b8658c6843289805b 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >@@ -1,25 +1,25 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image inside a JavaScript URL iframe. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content and a JavaScript URL executes in the same origin as its embedding document. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >index 2a133451683f92f5f5e084e1c0fd33ba6bcc7003..0ed28a1d4a9594ad7096de960e4a1e1d39428c1f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >@@ -1,19 +1,19 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > CONSOLE MESSAGE: line 2: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image from an XSLT transformed document. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >index 74420afdaa4a0c790a570b04fd16688ee5145c90..88be2ecbe4e0f6442ea0f0fe51649e43fcd7d101 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf because 'block-all-mixed-content' appears in the Content Security Policy. > This test loads a secure iframe that loads an insecure plugin. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. >@@ -12,7 +12,7 @@ This test loads a secure iframe that loads an insecure plugin. We should trigger > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-plugin.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >index 0b4ff6bf0f919e42d7d0f3fbcb9dc7ca595eae2a..19a99403165c7b97d0baf33d3b21940fcc38b0e8 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/script.js because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure external script. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-script.html > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >index 860be8af05cfb136c8673aadf936a5c6c7add59f..8fbb233c6713bef01e99d32acac04cf8ff0b487e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure external script. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >index dcdec790c01275c890ea8cbd9d7569abbff9c918..694903cf1a1f66c8be4eba9641928ba3216b8612 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >@@ -1,20 +1,20 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: line 30: Not allowed to request resource > CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads insecure data via asynchronous XHR. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html?asynchronous > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >index 137b39cbde4175c3409d713179540c9a17730e71..67b81d5094adf1d66011637039a901438f310474 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads insecure data via synchronous XHR. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe.html >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >index 967c3718f2b34f879538966ac908ca06fce7ef27..82795b8165c0b6eafef1506b5a371c20359d54af 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >@@ -1,17 +1,17 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should *not* trigger a mixed content block even though the child frame has CSP directive block-all-mixed-content because the insecure image is upgraded to a secure image as the child frame has CSP directive upgrade-insecure-requests. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > PASS did load image. >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >index a633bdd8fbc7dd054839689ae5b558eb6ff9ee5c..1ddc1b6c46095eaf4fd0bca5934d472981a8ea03 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >@@ -1,17 +1,17 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image via a redirect. We should *not* trigger a mixed content block even though the child frame has CSP directive block-all-mixed-content because the redirected insecure image is upgraded to a secure image as the child frame has CSP directive upgrade-insecure-requests. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > PASS did load image. >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01-expected.txt >index 9fab0cabdb7fdb3f4214b1495fdfbfed7ed79951..eced6bb0d70a838a28f77959fd20688f150abf11 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01-expected.txt >@@ -5,6 +5,6 @@ This script should not execute even though there are parse errors in the policy. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02-expected.txt >index 94247a48de63bb02678bbe1432b8fe0915dac274..8f518af9ae7a405af54a93359a83298ce7523f29 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02-expected.txt >@@ -6,6 +6,6 @@ This script should not execute even though there are parse errors in the policy. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03-expected.txt >index f85e62c33e85e37bf8706b5374b81b1eae4a9458..7705abe427c2ddff791659472b4ab786a7eaeb7f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03-expected.txt >@@ -6,6 +6,6 @@ This script should not execute even though there are parse errors in the policy. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04-expected.txt >index 77bb775ea1aa1776a7d35ae42e49fb609c05700d..bdede64d2de771ea0d23345af8d0cb0dc2e25274 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04-expected.txt >@@ -5,6 +5,6 @@ A warning should be logged to the console, as `script-src: 'none'` shouldn't con > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05-expected.txt >index dc9c3c24a49c74d03509cc8276a719e7718803b1..0d4ec1465c2a3ce0183e2201b4ca0b5ec99c2790 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05-expected.txt >@@ -5,6 +5,6 @@ Directives starting with an invalid character should be logged and ignored. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-multiple-headers-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-multiple-headers-expected.txt >index c10e92eddf0df03bbb980f937580debcef282087..592b56de642b23237a391aec4050b92c6ff4829e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-multiple-headers-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-multiple-headers-expected.txt >@@ -5,6 +5,6 @@ This script should not execute even through the second CSP header would allow it > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/eval-blocked-in-subframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/eval-blocked-in-subframe-expected.txt >index 12190da7f09346b47bd5b87315f2e9855d47b750..a71e8faa22d1e07aea97cdfbf3f63edab23e38fe 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/eval-blocked-in-subframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/eval-blocked-in-subframe-expected.txt >@@ -39,6 +39,6 @@ Tests that eval() is blocked in a subframe that disallows eval() when the parent > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed-expected.txt >index 7e4ba421eea23cdec6690be150c999e8d2d1bd47..ac50289be0f48331fe5394e36062e24161a42f1e 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS! > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked-expected.txt >index 374151406a46d3236239cddff7aa0500b0112051..e9b389483bf99fd8727e04107cec12f5d30be3fa 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load data:application/x-webkit-test-netscape,logiflo > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/report-status-code-zero-when-using-https-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/report-status-code-zero-when-using-https-expected.txt >index ad5597f31411af591aab6b14ca0c09a3804c6e3d..2b22206f9f840dd817eb78586d8644bb3dc74c5c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/report-status-code-zero-when-using-https-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/report-status-code-zero-when-using-https-expected.txt >@@ -4,7 +4,7 @@ This tests that the status-code is 0 in the Content Security Policy violation re > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt >index a8191e40b8103ef12b4ed3bb5c3445480c9f61a6..941ae55ffd779e8933ac41b4b94c8924b40dacf0 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt >@@ -2,7 +2,7 @@ CONSOLE MESSAGE: line 1: Refused to execute a script because its hash, its nonce > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src-expected.txt >index c371a81032cc1c975016094dcb68d728e5f604ed..a02cf9fe7147cbb9afc34dacfdd6c961addf0bcf 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src-expected.txt >@@ -3,6 +3,6 @@ CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'script-img'. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-in-iframe-expected.txt >index ab8ccc21fd1ba15e43573a9a280b0c90558b3080..376cd0503ed771568f220670d87098470bb567bb 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-in-iframe-expected.txt >@@ -5,11 +5,11 @@ Loads an iframe (a) which loads an iframe (b) which in turns tries to load an ex > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-expected.txt >index 9cfcfd42f3a1c4d9c5c94f4fda563fe5a3984ce6..e7182d31b7ceb4763e6adfaab7ac21bb5aa66384 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-expected.txt >@@ -5,6 +5,6 @@ Loads an iframe which in turns tries to load an external script. The iframe has > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-inline-event-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-inline-event-expected.txt >index e6b9be663c2a10e239f2909a0e1815524b0e1651..d34a530e473e8f76cd3d072547113144f793ff91 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-inline-event-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none-inline-event-expected.txt >@@ -2,11 +2,11 @@ CONSOLE MESSAGE: line 3: Refused to execute a script for an inline event handler > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-parsing-implicit-and-explicit-port-number-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-parsing-implicit-and-explicit-port-number-expected.txt >index e08102b679daec9e7ccdd4f9fbbbcb4a4e07c105..9fd07a179c810c6fc243fecb7173159109e2bf5a 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-parsing-implicit-and-explicit-port-number-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-parsing-implicit-and-explicit-port-number-expected.txt >@@ -3,26 +3,26 @@ Tests script-src source expression matching with implicit and explicit default p > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-redirect-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-redirect-expected.txt >index b141f0e1c03657593551581d368b333d5eceff24..3d8fcc3a9ca423e556fbaff39c1b3f2ecc87f426 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-redirect-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-redirect-expected.txt >@@ -5,11 +5,11 @@ Loads an iframe which in turns tries to load an external script. The request for > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01-expected.txt >index a2e7ec7d297e3b84ab08d1ed749fc6225e149d6d..f84d89a02e3278d01671c51459fb3dd1a3a7d3ab 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load http://localhost:8000/security/contentSecurityP > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02-expected.txt >index 7f01199a57ba11fe7fd16b5e87cb4e744af51664..8546a61fb23ac7188239f0636c94892eed3bf5b7 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load http://127.0.0.1:8080/security/contentSecurityP > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03-expected.txt >index 827da48fcd9326e34af73a7f95c7b11c15f1cd87..c192cc16ec883644c1c27ae37212d9ac33082503 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load https://127.0.0.1:8443/security/contentSecurity > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-01-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-01-expected.txt >index a995e98cc6e9c93bcf7edf8fa3e7d33771cfae81..0c76cc2ff778cbc65866fa9a4f6d79a6be37cc47 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-01-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-01-expected.txt >@@ -6,21 +6,21 @@ None of these scripts should execute even though there are parse errors in the p > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-02-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-02-expected.txt >index 3b051ae1fc02b152d8d0e13f273d30c76f495705..5df7e2b54d334dfe76f3f43f57015b4f0a999f8d 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-02-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-02-expected.txt >@@ -3,21 +3,21 @@ These scripts should execute even though there are parse errors in the policy. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-03-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-03-expected.txt >index df207588d05aed1ee4bce41f0288d1aca05666c3..b02f492684c44cd9e0154ad469f1cb207486ffdd 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-03-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-03-expected.txt >@@ -5,16 +5,16 @@ None of these scripts should execute. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-04-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-04-expected.txt >index 3ed8e2dcc604da79f0bde30851542aaf74f59046..0189269994a06292882df1ce63226253a061e784 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-04-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-04-expected.txt >@@ -6,21 +6,21 @@ None of these scripts should execute even though there are parse errors in the p > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-05-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-05-expected.txt >index 906c95078699820a9e161e146b14262902539e6b..75b2acecc27b2b6f5b82c8672768f85f58c2c390 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-05-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-05-expected.txt >@@ -17,51 +17,51 @@ Paths should be ignored when evaluating sources. This test passes if FAIL does n > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame9-->-->' >+Frame: '<!--frame10-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-06-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-06-expected.txt >index 906c95078699820a9e161e146b14262902539e6b..75b2acecc27b2b6f5b82c8672768f85f58c2c390 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-06-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-06-expected.txt >@@ -17,51 +17,51 @@ Paths should be ignored when evaluating sources. This test passes if FAIL does n > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame9-->-->' >+Frame: '<!--frame10-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-07-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-07-expected.txt >index 6a1af5d1ee7873f280b495994cf7fa8daecadfed..e367ba1702e331e0ce93046b58fc969ada1a7205 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-07-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-07-expected.txt >@@ -20,46 +20,46 @@ Invalid source expressions should log a console warning, and be ignored. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame8-->-->' >+Frame: '<!--frame9-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-08-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-08-expected.txt >index c54cdb22bfc27ebf4e876c5e512890b3a1d1877e..0834a0f59648bd85e2083c35f7ccbbf7a4314844 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-08-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-08-expected.txt >@@ -5,16 +5,16 @@ Test proper handling of data: URLs. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-09-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-09-expected.txt >index 1d01574cfbaea1e75a50a9b258a86957169e4436..60832ab1d801c5d937419012b2e0d638efa3ed1c 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-09-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-09-expected.txt >@@ -3,21 +3,21 @@ Host wildcards should work correctly. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-10-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-10-expected.txt >index 3da125b389cbadebfc4c4c213c792c1044affd17..bc1f2018c64737dd7da12476c42ec9ace67c02c0 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-10-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-10-expected.txt >@@ -3,11 +3,11 @@ None of these scripts should execute even though there are parse errors in the p > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-deprecated-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-deprecated-expected.txt >index 19cb944169da494e81be6c848bacb076dea8f00a..c818d009a531d2fa57fa1c214e3f0d0cdd25a3d4 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-deprecated-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-deprecated-expected.txt >@@ -6,16 +6,16 @@ Test that directives that predate the CSP 1.0 standard generate proper warnings > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon-expected.txt >index 4c3a10ab440d44e84baddea99fae256eb7bd20cf..f9675088c6e33f107fd39d7b1ccb7eec4d82f4d5 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-no-semicolon-expected.txt >@@ -9,11 +9,11 @@ If a web author forgets a semicolon, we should do our best to warn them that the > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt >index 7c2d7fd3d3ad8b67386183b170c0a535e1dab01c..581eb095f9401aee34deb1ce5f25d538d724faec 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt >@@ -4,6 +4,6 @@ Sources containing non-ascii characters should be ignored, and should generate w > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-none-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-none-expected.txt >index 88ff4dcf436297886d3f131c02571d5e97fd728f..ac044d656b98bb70a0ce10ede9b59097efca0c5f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-none-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-none-expected.txt >@@ -11,26 +11,26 @@ CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityP > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt >index 7f3bfc0e9c587581eb91c783fab4ab33feae4a40..3f7563b75150a7320b0baa14cf4a068d5a185d55 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt >@@ -8,41 +8,41 @@ Resources should be rejected unless they match a whitelisted path. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt >index ceed1663a1667ed7842b87a8cb66a4ff32520b7f..be698af0af4b5cbb00fcc2dbb6721559d42d7e65 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt >@@ -11,41 +11,41 @@ Resources should be rejected unless they match a whitelisted path. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame5-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame6-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame6-->-->' >+Frame: '<!--frame7-->' > -------- > PASS > > -------- >-Frame: '<!--framePath //<!--frame7-->-->' >+Frame: '<!--frame8-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >index f768e4a24b458c802b491a30245da829b972ffd7..255530829f6e82268a3666fdbc04a3977779c0d9 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >@@ -1,18 +1,18 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: PASS >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame > ALERT: PASS > ALERT: PASS >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe with the 'upgrade-insecure-requests' header. The secure frame has an insecure script reference, which will get upgraded. The secure frame does a secure load of another frame. This other frame specifies an insecure load of this same script. If the nested subresource logic is working properly, the non-secure load in the second nested frame should be upgraded, even though that frame does not use the 'upgrade-insecure-requests' header, because it had been previously upgraded by an enclosing context. The frame two-layers deep also loads a second script using HTTP. This should also be upgraded to HTTPS, since the nested frame inherits the 'upgrade-insecure-request' from its parent. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >index 90307b416b3355a45367fcbfdf3655920b5383ce..f9f1ddda75999b995407489975ff64be13fd5c75 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure style sheet. We should upgrade the CSS request to HTTPS, and thereby avoid triggering a mixed content callback. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >index 39aec1d76fb4347460b34b5babd81788ed7d91a0..394b844e9e4f2e15858110b37c133097db6dbfaf 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should upgrade the script request, and thereby avoid triggering a mixed content callback. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >index a2c0f6ba28daa433c59fb33963f93e44c9cbebbc..462fdc98d3afd26ab4ff8554c5deb0e45918f3ee 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should upgrade the relevant requests. > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed-expected.txt >index 991e636b31e1f1a70e9276f7a351c036ac3757be..889df3ba1fb22c096feda3603a31cd4b2ef9114f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed-expected.txt >@@ -2,6 +2,6 @@ ALERT: PASS > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed2-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed2-expected.txt >index 991e636b31e1f1a70e9276f7a351c036ac3757be..889df3ba1fb22c096feda3603a31cd4b2ef9114f 100644 >--- a/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed2-expected.txt >+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/xsl-redirect-allowed2-expected.txt >@@ -2,6 +2,6 @@ ALERT: PASS > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/cookies/first-party-cookie-allow-xslt-expected.txt b/LayoutTests/http/tests/security/cookies/first-party-cookie-allow-xslt-expected.txt >index d28026f626c6cef5b0cbc8527c5912d75592e1b2..610cfe910f5034a7ab206264e019abc3dd44f9d2 100644 >--- a/LayoutTests/http/tests/security/cookies/first-party-cookie-allow-xslt-expected.txt >+++ b/LayoutTests/http/tests/security/cookies/first-party-cookie-allow-xslt-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Cookie is set >diff --git a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-redirect-expected.txt b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-redirect-expected.txt >index 33eaaa08fbfc143c05cbbd669d6619c5e1b85462..d58ab8da5e69e7afa29fc29660da038d0a4106ec 100644 >--- a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-redirect-expected.txt >+++ b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-redirect-expected.txt >@@ -4,6 +4,6 @@ This test PASS if you can see the text "FAILED: Cookie not set". > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > FAILED: Cookie not set >diff --git a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-xslt-expected.txt b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-xslt-expected.txt >index 5a6dd970e166c3ee6dde8cc8f134bc26715624f0..492c51218c528fcfa09729198a03a1998ef46f3e 100644 >--- a/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-xslt-expected.txt >+++ b/LayoutTests/http/tests/security/cookies/third-party-cookie-blocking-xslt-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Cookie is NOT set >diff --git a/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt >index 47319fb832d89b78915ab86439b0f7cf21aad079..a22b990223196f18a94937b1ff767f9946c1ede2 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt >+++ b/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt >@@ -4,6 +4,6 @@ Test that a child frame can't define a function and the use it to access parent > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: canGet('parentWindow.location.href') should be 'false' and is. >diff --git a/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt >index 4af0177da6f92474579d2269e069622a375d052b..ba26e9a5254ec340f6a0dc5ffbf123fb5c8952ce 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt >+++ b/LayoutTests/http/tests/security/cross-frame-access-delete-expected.txt >@@ -16,7 +16,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > ----- tests for deleting the properties of window, window.history, and window.location cross-domain ----- >diff --git a/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt >index 4dcb9b91d91a39e22ffc3c50fcea74ffa7ba926a..128134794acd4b412187e8b6ea0e75a11af9d656 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt >+++ b/LayoutTests/http/tests/security/cross-frame-access-frameelement-expected.txt >@@ -4,11 +4,11 @@ This test checks if frameElement is accessible from the same or cross origin ifr > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > [object HTMLIFrameElement] > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > null >diff --git a/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt >deleted file mode 100644 >index bb89c166c8f1fc456e139a4fcc4aade2407de8b9..0000000000000000000000000000000000000000 >--- a/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt >+++ /dev/null >@@ -1,22 +0,0 @@ >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match. >- >- >- >--------- >-Frame: '<!--framePath //<!--frame0-->-->' >--------- >- >------ tests for putting window.history's properties ----- >- >-PASS: window.history.back should be 'function back() { [native code]}' and is. >-PASS: window.history.forward should be 'function forward() { [native code]}' and is. >-PASS: window.history.go should be 'function go() { [native code]}' and is. >-PASS: window.history.toString should be 'function toString() { [native code]}' and is. >-PASS: window.history.length matched the expected value. >-PASS: window.history.customAttribute should be 'customAttribute' and is. >- >diff --git a/LayoutTests/http/tests/security/cross-frame-access-location-put-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-location-put-expected.txt >index f07b23642a99443f043de455423aa428bd67f002..6f385be384254a33c4727c576dcddc3b21fe59f1 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-location-put-expected.txt >+++ b/LayoutTests/http/tests/security/cross-frame-access-location-put-expected.txt >@@ -6,7 +6,7 @@ SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessin > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > ----- tests for putting window.history and its properties ----- >diff --git a/LayoutTests/http/tests/security/cross-frame-access-private-browsing-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-private-browsing-expected.txt >index 0e18b65ff6a798180301e8331cff64881f5679cf..1fbf238501d0a90d4dbebbeb6a023517e4e791b4 100644 >--- a/LayoutTests/http/tests/security/cross-frame-access-private-browsing-expected.txt >+++ b/LayoutTests/http/tests/security/cross-frame-access-private-browsing-expected.txt >@@ -5,6 +5,6 @@ Attempting to violate the same-origin policy with private browsing enabled. If > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner iframe. >diff --git a/LayoutTests/http/tests/security/cross-origin-appcache-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-appcache-allowed-expected.txt >index 6bbaa2946189aba0fe142891efb1e882a91bb3ac..3120a6a23c962b2ef6111e98501d8fc4baedc116 100644 >--- a/LayoutTests/http/tests/security/cross-origin-appcache-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-appcache-allowed-expected.txt >@@ -8,11 +8,11 @@ This iframe should have a cache: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Cache found > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Cache found >diff --git a/LayoutTests/http/tests/security/cross-origin-appcache-expected.txt b/LayoutTests/http/tests/security/cross-origin-appcache-expected.txt >index 151bad739d9aa9ef0f4a17f364f030366f15b9ee..942b673d8b292a6e69ed47d3685c331ace081049 100644 >--- a/LayoutTests/http/tests/security/cross-origin-appcache-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-appcache-expected.txt >@@ -8,11 +8,11 @@ This iframe should have a cache: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Cache not found > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Cache found >diff --git a/LayoutTests/http/tests/security/cross-origin-css-primitive-expected.txt b/LayoutTests/http/tests/security/cross-origin-css-primitive-expected.txt >index bbb8e66f701a2edc74ff5d2f3ead1f80d701a215..012f60c3498e32314f235da7612833822013f2c8 100644 >--- a/LayoutTests/http/tests/security/cross-origin-css-primitive-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-css-primitive-expected.txt >@@ -2,7 +2,7 @@ Test that primitive value wrappers are not shared accross documents. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED > PASSED >diff --git a/LayoutTests/http/tests/security/cross-origin-indexeddb-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-indexeddb-allowed-expected.txt >index d2501ba8d74366ad961f886834f31120f6c545b6..d4227b2dc54da65b9bdf06856c8ea0881362dd0e 100644 >--- a/LayoutTests/http/tests/security/cross-origin-indexeddb-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-indexeddb-allowed-expected.txt >@@ -3,14 +3,14 @@ Both of these frames should successfully open the database: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Successfully called window.indexedDB.deleteDatabase(). > Successfully called window.indexedDB.open(). > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Successfully called window.indexedDB.deleteDatabase(). > Successfully called window.indexedDB.open(). >diff --git a/LayoutTests/http/tests/security/cross-origin-indexeddb-expected.txt b/LayoutTests/http/tests/security/cross-origin-indexeddb-expected.txt >index a1e3770eec63d210885b245f28bc0c669a5f68cf..a4dc1251e8b386a1eeefa41bca8ec31e467a3761 100644 >--- a/LayoutTests/http/tests/security/cross-origin-indexeddb-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-indexeddb-expected.txt >@@ -3,14 +3,14 @@ The first iframe below should return a security error, and the second should suc > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > window.indexedDB.deleteDatabase() threw an exception: SecurityError > window.indexedDB.open() threw an exception: SecurityError > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Successfully called window.indexedDB.deleteDatabase(). > Successfully called window.indexedDB.open(). >diff --git a/LayoutTests/http/tests/security/cross-origin-plugin-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-plugin-allowed-expected.txt >index 1a086e72e6cde0374111a32601690a256713753a..b7ee343946aea55bf2b4faf995277729338ff467 100644 >--- a/LayoutTests/http/tests/security/cross-origin-plugin-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-plugin-allowed-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/cross-origin-plugin-expected.txt b/LayoutTests/http/tests/security/cross-origin-plugin-expected.txt >index 39e6ad8ae0925d1b6d5f0ce91b251b7f4b26ceb8..2a05967f7ef218c1169e2ee4fdbee0e5ed1af5ad 100644 >--- a/LayoutTests/http/tests/security/cross-origin-plugin-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-plugin-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed-expected.txt >index 1a086e72e6cde0374111a32601690a256713753a..b7ee343946aea55bf2b4faf995277729338ff467 100644 >--- a/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt b/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >index 39e6ad8ae0925d1b6d5f0ce91b251b7f4b26ceb8..2a05967f7ef218c1169e2ee4fdbee0e5ed1af5ad 100644 >--- a/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/cross-origin-session-storage-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-session-storage-allowed-expected.txt >index 9946bb40e5a12530c1ea0014a0f32dfd86c45231..4d05764c313cc966dcc754ba7bcc89cb4076f793 100644 >--- a/LayoutTests/http/tests/security/cross-origin-session-storage-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-session-storage-allowed-expected.txt >@@ -6,11 +6,11 @@ This iframe should not return any errors: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > No exception >diff --git a/LayoutTests/http/tests/security/cross-origin-session-storage-third-party-blocked-expected.txt b/LayoutTests/http/tests/security/cross-origin-session-storage-third-party-blocked-expected.txt >index 9946bb40e5a12530c1ea0014a0f32dfd86c45231..4d05764c313cc966dcc754ba7bcc89cb4076f793 100644 >--- a/LayoutTests/http/tests/security/cross-origin-session-storage-third-party-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-session-storage-third-party-blocked-expected.txt >@@ -6,11 +6,11 @@ This iframe should not return any errors: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > No exception >diff --git a/LayoutTests/http/tests/security/cross-origin-websql-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-websql-allowed-expected.txt >index 9946bb40e5a12530c1ea0014a0f32dfd86c45231..4d05764c313cc966dcc754ba7bcc89cb4076f793 100644 >--- a/LayoutTests/http/tests/security/cross-origin-websql-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-websql-allowed-expected.txt >@@ -6,11 +6,11 @@ This iframe should not return any errors: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > No exception >diff --git a/LayoutTests/http/tests/security/cross-origin-websql-expected.txt b/LayoutTests/http/tests/security/cross-origin-websql-expected.txt >index eb3fdb7b61180b5dcc62d3634875e4d39a3d5ae9..d006cfb4051028ae56ecb02feda3700eb38cff85 100644 >--- a/LayoutTests/http/tests/security/cross-origin-websql-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-websql-expected.txt >@@ -6,11 +6,11 @@ This iframe should not return any errors: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > No exception >diff --git a/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-allowed-expected.txt >index 055e18422dde5cb2a69cb1afb39d800889beabff..37ffb9cfad775a1098bdb72857062f29f1b05d4d 100644 >--- a/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-allowed-expected.txt >@@ -3,14 +3,14 @@ Both of these frames should successfully open the database: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Successfully called self.indexedDB.deleteDatabase(). > Successfully called self.indexedDB.open(). > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Successfully called self.indexedDB.deleteDatabase(). > Successfully called self.indexedDB.open(). >diff --git a/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-expected.txt b/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-expected.txt >index ebb93ff7b6c1285751e8957f69080678f509d5a5..72925aaab114e7be03c00aa3733dac9b20eea222 100644 >--- a/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-expected.txt >+++ b/LayoutTests/http/tests/security/cross-origin-worker-indexeddb-expected.txt >@@ -3,14 +3,14 @@ The first iframe below should return a security error, and the second should suc > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > self.indexedDB.deleteDatabase() threw an exception: SecurityError > self.indexedDB.open() threw an exception: SecurityError > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Successfully called self.indexedDB.deleteDatabase(). > Successfully called self.indexedDB.open(). >diff --git a/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt b/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt >index 6c8d269b0f6741cd81a849826f43c94493b5d9f4..39e81b87b535b2fb2a420c0419ac1cafe91fd55f 100644 >--- a/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt >+++ b/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-2-level-expected.txt >@@ -12,6 +12,6 @@ Inner iframe. > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner-inner iframe. >diff --git a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt >index 5d8a0064ed6ba754e5e866f21592b363e28930a9..8b5be3c2e7071f08a8daec24e8a1a9a219bf6b87 100644 >--- a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt >+++ b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-expected.txt >@@ -6,7 +6,7 @@ PASS: Cross frame access to a data: URL embed in a frame on a foreign domain den > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner iframe on a foreign domain. > >diff --git a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt >index 088f77f9da98c6a69b4964c58866ddcf54405d80..ea8011a99d6d52911caaafe289ef733ae139190e 100644 >--- a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt >+++ b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change-expected.txt >@@ -6,7 +6,7 @@ PASS: Cross frame access to a data: URL embed in a frame on a foreign domain den > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Cross frame access from a frame on a foreign domain denied! > >diff --git a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt >index f4e89ce639bb9517b31f36a438df28ff47405cd4..ee4a69ee55018f1f92691711007b72fd1b914a18 100644 >--- a/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt >+++ b/LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level-expected.txt >@@ -13,7 +13,7 @@ Inner iframe. > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Cross frame access to a data: URL 2 levels deep was denied. > >diff --git a/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt b/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt >index 06e8706a775e27bbd972de4ba5c2255b6fbd716b..6ec2acd2218606c744a02ae963a81124ee588ba9 100644 >--- a/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt >+++ b/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt >@@ -5,7 +5,7 @@ This tests that documents can navigate the location of any of it's sub-frames re > Perform Test > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > localhost > >diff --git a/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt b/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt >index 5ea3eef10512e46cad328e93f9024c59083cd453..8d97ff36c36f7b196ebe55a1c46cfb91be19286c 100644 >--- a/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt >+++ b/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt >@@ -3,7 +3,7 @@ CONSOLE MESSAGE: Unsafe JavaScript attempt to initiate navigation for frame with > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > Frame-with-plugin-to-navigate >diff --git a/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt b/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt >index b55b7240cf741e8ef4e23b61af5c6b568d2766ea..56ee4594dd678a33c8ce4d61b55bc526422309b6 100644 >--- a/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt >+++ b/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt >@@ -5,7 +5,7 @@ CONSOLE MESSAGE: line 31: Unsafe JavaScript attempt to initiate navigation for f > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Frame-with-link-to-navigate > >diff --git a/LayoutTests/http/tests/security/history-pushState-replaceState-from-sandboxed-iframe-expected.txt b/LayoutTests/http/tests/security/history-pushState-replaceState-from-sandboxed-iframe-expected.txt >index 3429f12058c2fd04f8b6a8096b25c1ab2a06fb39..104054ccbc4079ec8cbecdf8a535cadceb83384a 100644 >--- a/LayoutTests/http/tests/security/history-pushState-replaceState-from-sandboxed-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/history-pushState-replaceState-from-sandboxed-iframe-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Tests history.replaceState(), history.pushState() from a sandboxed iframe > >diff --git a/LayoutTests/http/tests/security/http-0.9/default-port-plugin-blocked-expected.txt b/LayoutTests/http/tests/security/http-0.9/default-port-plugin-blocked-expected.txt >index 23e78912121eb9a042745a239811d434fbfa25a2..4bcb0a1a17b3a11d1fd99834c690dc7d60d56617 100644 >--- a/LayoutTests/http/tests/security/http-0.9/default-port-plugin-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/default-port-plugin-blocked-expected.txt >@@ -4,6 +4,6 @@ This tests that loading of a plugin is blocked in a HTTP 0.9 response served ove > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Plugin did not load. >diff --git a/LayoutTests/http/tests/security/http-0.9/default-port-script-blocked-expected.txt b/LayoutTests/http/tests/security/http-0.9/default-port-script-blocked-expected.txt >index 6f682b320dd1fafe352b728e46a989f6c7d33f9d..bc9881a865665a2c055c2429883a7edc47383c87 100644 >--- a/LayoutTests/http/tests/security/http-0.9/default-port-script-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/default-port-script-blocked-expected.txt >@@ -5,6 +5,6 @@ This tests that JavaScript is blocked in a HTTP 0.9 response served over port 80 > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This content should be visible, but script should not execute. >diff --git a/LayoutTests/http/tests/security/http-0.9/iframe-blocked-expected.txt b/LayoutTests/http/tests/security/http-0.9/iframe-blocked-expected.txt >index b6e4b9ae3a33daa5fad616a81aaf7818194e4ba3..cf2391fa480ac1ce93bb0d655a57199307522182 100644 >--- a/LayoutTests/http/tests/security/http-0.9/iframe-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/iframe-blocked-expected.txt >@@ -1,11 +1,11 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-default-port-page-allowed-expected.txt b/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-default-port-page-allowed-expected.txt >index 8a2261a2fc92369054cd1b26328f26318e1757cf..13ee14413fb936d6cfda14d753c6ec2a8b14b4da 100644 >--- a/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-default-port-page-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-default-port-page-allowed-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Sandboxing 'http://127.0.0.1:8000/security/http-0.9/resources/n > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-page-blocked-expected.txt b/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-page-blocked-expected.txt >index 08b95423b2098c5ba536a0c436afab689596f828..a7dc33ad3eb5b0e381e16f1727cea539d697e5fd 100644 >--- a/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-page-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/image-on-HTTP-0.9-page-blocked-expected.txt >@@ -8,6 +8,6 @@ http://127.0.0.1:8080/security/http-0.9/resources/nph-image.pl - didFailLoadingW > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/http-0.9/sandbox-should-not-persist-on-navigation-expected.txt b/LayoutTests/http/tests/security/http-0.9/sandbox-should-not-persist-on-navigation-expected.txt >index f230c2ac03d455eb647a5893b15fcdfe29e197eb..c871cc5553fdde2522559326a478e33cdf8daad7 100644 >--- a/LayoutTests/http/tests/security/http-0.9/sandbox-should-not-persist-on-navigation-expected.txt >+++ b/LayoutTests/http/tests/security/http-0.9/sandbox-should-not-persist-on-navigation-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Sandboxing 'http://127.0.0.1:8000/security/http-0.9/resources/n > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level-expected.txt >index cf629e7b8c3b04ee54721efab51efd00ec324d83..16db39d34837e9154c90ff0c917de166a2a3084e 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level-expected.txt >@@ -10,6 +10,6 @@ Frame: 'aFrame' > Inner iframe. > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner-inner iframe. >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-to-javscript-url-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-to-javscript-url-expected.txt >index 5d82fd038b4280ef2f46952455d8c4d41348af3a..7b8c6e8f5db7914c78dc9c941a1f81b290696117 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-to-javscript-url-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-to-javscript-url-expected.txt >@@ -9,7 +9,7 @@ Frame: 'aFrame' > Inner iframe. > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Cross frame access from a javascript: URL was allowed! > >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-from-javscript-url-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-from-javscript-url-expected.txt >index 66f56eafa4360367bff5cd31fa1bb8a898ec6b75..b148cf35de38e9e0eb495e369bd3d50827e70c84 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-from-javscript-url-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-from-javscript-url-expected.txt >@@ -11,6 +11,6 @@ PASS: Cross frame access from a javascript: URL was allowed! > Inner iframe. > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner-inner iframe. >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level-expected.txt >index 725e9e2d8fcb53e7addabc7789e7b1059c12b632..bafc8ac8726e14ea6dbd6e2cc091547fd31f5e6e 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level-expected.txt >@@ -11,7 +11,7 @@ Frame: 'aFrame' > Inner iframe. > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Cross frame access to a javascript: URL 2 levels deep was allowed! > >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-subframe-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-subframe-expected.txt >index 67159eb5b05f2ea642606c48ac6572a3188036e4..43bfba1576b659cf1837e02ac222e03178f07427 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-subframe-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-subframe-expected.txt >@@ -5,7 +5,7 @@ The scenario for this test is that you have an iframe with content from a foreig > Pass: Cross frame access from a javascript: URL on a different domain was denied. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner iframe on a foreign domain. > >diff --git a/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe-expected.txt b/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe-expected.txt >index eba4b10b05c386bb9a1fbf3889042c36f0a767d9..8cba984249e621383b8034ec6d6daa4d911fca92 100644 >--- a/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe-expected.txt >+++ b/LayoutTests/http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe-expected.txt >@@ -6,7 +6,7 @@ PASS: Cross frame access to a javascript: URL embed in a frame on a foreign doma > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Inner iframe on a foreign domain. > >diff --git a/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >index 0eec9abb445750ead6a22375cc7d1bdcdd03beda..b513b99580945af4d6aeba109f25d29f78abc74c 100644 >--- a/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >@@ -3,16 +3,16 @@ main frame - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/http/tests/security/mixedContent/blob-url-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/blob-url-in-iframe-expected.txt >index f2f38d05e2cff9e652eefaa289b97bd43b9f5128..2f6ebb1fb41da104b3f219b81ac8cbe0674f25d4 100644 >--- a/LayoutTests/http/tests/security/mixedContent/blob-url-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/blob-url-in-iframe-expected.txt >@@ -2,6 +2,6 @@ > This tests that blob URLs created in a secure context are treated as secure origins. This test passes if the iframe renders PASS correctly, and no console warning appears. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS (1/1) >diff --git a/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >index 4887045550850c8450398a0dd32ec7e0476f203a..fa294b55f064d7988adb915eb5b2309a9146334d 100644 >--- a/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >@@ -3,12 +3,12 @@ main frame - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test opens a window iframe that loads a data URL iframe. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by active network attackers. >diff --git a/LayoutTests/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >index 2ec30451ae84147dfb9a0e69079370241397ea13..e1b5a9310d6d6aa6277dcda0613454aeab74bb6b 100644 >--- a/LayoutTests/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads a data URL script. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by an active network attacker. > >diff --git a/LayoutTests/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >index aaec844897024007647bd95b0be382891548d391..28d0a0d7fa095f2a0634499e1d36bcc751d39f69 100644 >--- a/LayoutTests/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads a plugin without a URL. We should *not* get a mixed content callback because the plug-in cannot be controlled by an active network attacker. > >diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >index ef9f3b2187005bf585e967f2c82d3a08053c7371..884b058d42cf03ead5dfd0e61ec1a102d7e9c413 100644 >--- a/LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >@@ -1,12 +1,12 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure style sheet. We should trigger a mixed content callback because an active network attacker can use CSS3 to breach the confidentiality of the HTTPS security origin. > >diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >index 6e7bd91a9e4c405d57a286e06f045600eeae29f7..7b12e2add8678a1cce5b7e5886b091520f4c804d 100644 >--- a/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that has a form with an insecure action. We should *not* get a mixed content callback because the main frame is HTTP and the form doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >index 49f89c5f491b530a7d9d31f5885012a745474139..08396ddb4711518141cf7fd8f66eb6f6efe99df8 100644 >--- a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >@@ -1,15 +1,15 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure iframe. We should *not* get a mixed content callback becase the main frame is HTTP and the grandchild iframe doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >index 57f4ae9c1ecc8d97a1054a500a8adc58b10c860b..8319919990aa0669541e16de8f50b71bb88baa02 100644 >--- a/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >@@ -3,10 +3,10 @@ main frame - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html. > >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >index 590945e53eba0fe88b98c310781443e371ca9271..28a60858bf082ce47df22e9600e5295069b038d2 100644 >--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >@@ -1,10 +1,10 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should *not* get a mixed content callback becase the main frame is HTTP and the image doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >index 9a0465d8c62047d6556be11abe0c4b8204a4f0e3..5a1bd4a8f24186f8cca90c439f3aa3f2a66c3254 100644 >--- a/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >@@ -3,10 +3,10 @@ main frame - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/boring.html. > >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >index b2dbc7ca11232eaae4b21e22137ed665f224c0a5..b84844c9193e77465c694e1c9bfc0bfaf8d5d2f8 100644 >--- a/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >@@ -1,12 +1,12 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-script.html was not allowed to run insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker could have redirected the script load to https://attacker.com. > >diff --git a/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >index 5fe0d6370b5dc133dc46df6e194552f4931e6495..0238b0f50fc2856e26e69fdf3c1d25e14f9fae18 100644 >--- a/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >@@ -3,11 +3,11 @@ main frame - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html. > > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker. >diff --git a/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >index 57d0c6657fcf8e69a6bed19879d2604229cfad33..6780683cc0a4a05bbdcac9a9b42865186a3ce42d 100644 >--- a/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >+++ b/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >@@ -1,12 +1,12 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker can end up controling the script. > >diff --git a/LayoutTests/http/tests/security/private-browsing-http-auth-expected.txt b/LayoutTests/http/tests/security/private-browsing-http-auth-expected.txt >index cf3edecfad5b3ea87bc125a49cf37c4a7e785729..ca689f72ba4a4d9d27ea2b60c890431a5e1b6e9c 100644 >--- a/LayoutTests/http/tests/security/private-browsing-http-auth-expected.txt >+++ b/LayoutTests/http/tests/security/private-browsing-http-auth-expected.txt >@@ -2,11 +2,11 @@ http://127.0.0.1:8000/security/resources/basic-auth.php?username=webkit&password > This test makes sure that auth credentials cached during a private browsing session do not leak out after private browsing is disabled. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: webkit password: rocks > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username '' and password '' >diff --git a/LayoutTests/http/tests/security/referrer-policy-always-expected.txt b/LayoutTests/http/tests/security/referrer-policy-always-expected.txt >index 87ea25885b58ad13cfe90e757e78b3e528e1a594..2feae71f3de7aa815ddef8c130577780b50f6a1e 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-always-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-always-expected.txt >@@ -3,7 +3,7 @@ This test checks the always referrer policy when navigating from an insecure URL > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?always > Referrer is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?always >diff --git a/LayoutTests/http/tests/security/referrer-policy-default-expected.txt b/LayoutTests/http/tests/security/referrer-policy-default-expected.txt >index 1124260e8e794f0ae04cb59d3c232b9d7b9034f9..738afd6f62f0f37d32175fa599bed796dfdda9f1 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-default-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-default-expected.txt >@@ -3,7 +3,7 @@ This test checks the default referrer policy when navigating from an insecure UR > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?default > Referrer is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?default >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-always-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-always-expected.txt >index 5e51de12591c1d1688f57c620371863c1f6dd54a..fc79c98c7c6d45bf5088bf2b0c4142dffe46093e 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-always-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-always-expected.txt >@@ -3,7 +3,7 @@ This test checks the always referrer policy when navigating from a secure URL to > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is https://127.0.0.1:8443/security/resources/referrer-policy-start.html?always > Referrer is https://127.0.0.1:8443/security/resources/referrer-policy-start.html?always >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-default-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-default-expected.txt >index e476c2655d4bb1b580b6d50bc40664f2ced13490..a1469559373ce606f0d8736c26f2b9f4035a68e2 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-default-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-default-expected.txt >@@ -3,7 +3,7 @@ This test checks the default referrer policy when navigating from a secure URL t > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-never-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-never-expected.txt >index 6c12ec92ad3b10f782da547a6cde7473f1b9930a..86f312fae1688ea484b754e426318398710cd6c4 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-never-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-never-expected.txt >@@ -3,7 +3,7 @@ This test checks the never referrer policy when navigating from a secure URL to > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-expected.txt >index e476c2655d4bb1b580b6d50bc40664f2ced13490..a1469559373ce606f0d8736c26f2b9f4035a68e2 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-expected.txt >@@ -3,7 +3,7 @@ This test checks the default referrer policy when navigating from a secure URL t > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-when-downgrade-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-when-downgrade-expected.txt >index e476c2655d4bb1b580b6d50bc40664f2ced13490..a1469559373ce606f0d8736c26f2b9f4035a68e2 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-when-downgrade-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-no-referrer-when-downgrade-expected.txt >@@ -3,7 +3,7 @@ This test checks the default referrer policy when navigating from a secure URL t > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-origin-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-origin-expected.txt >index c0f9b81fbda07cbc220bc8f07c4141c727397862..d60f555bb8392abf5cccc44b343f3bdd615aead1 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-origin-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-origin-expected.txt >@@ -3,7 +3,7 @@ This test checks the origin referrer policy when navigating from a secure URL to > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is https://127.0.0.1:8443/ > Referrer is https://127.0.0.1:8443/ >diff --git a/LayoutTests/http/tests/security/referrer-policy-https-unsafe-url-expected.txt b/LayoutTests/http/tests/security/referrer-policy-https-unsafe-url-expected.txt >index e62d48c0ea871b79c81f8f28b774c2a2501d43e2..5b05006d9703000aeeee2c4ad4843f49057f2d4d 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-https-unsafe-url-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-https-unsafe-url-expected.txt >@@ -3,7 +3,7 @@ This test checks the always referrer policy when navigating from a secure URL to > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is https://127.0.0.1:8443/security/resources/referrer-policy-start.html?unsafe-url > Referrer is https://127.0.0.1:8443/security/resources/referrer-policy-start.html?unsafe-url >diff --git a/LayoutTests/http/tests/security/referrer-policy-invalid-expected.txt b/LayoutTests/http/tests/security/referrer-policy-invalid-expected.txt >index 3011eaf726922420e9313e4a2b9cf73c72ef1f25..21866ae7a862af922f8122b984641077962ddca9 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-invalid-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-invalid-expected.txt >@@ -4,7 +4,7 @@ This test checks an invalid referrer policy when navigating from an insecure URL > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-never-expected.txt b/LayoutTests/http/tests/security/referrer-policy-never-expected.txt >index 2f04f7aa6f1adbac496b6a3a92ccf9712dbaf26b..9ea20eb81cead57afb1837eca711aa3a90691077 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-never-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-never-expected.txt >@@ -3,7 +3,7 @@ This test checks the never referrer policy when navigating from an insecure URL > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-no-referrer-expected.txt b/LayoutTests/http/tests/security/referrer-policy-no-referrer-expected.txt >index 2f04f7aa6f1adbac496b6a3a92ccf9712dbaf26b..9ea20eb81cead57afb1837eca711aa3a90691077 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-no-referrer-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-no-referrer-expected.txt >@@ -3,7 +3,7 @@ This test checks the never referrer policy when navigating from an insecure URL > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/referrer-policy-no-referrer-when-downgrade-expected.txt b/LayoutTests/http/tests/security/referrer-policy-no-referrer-when-downgrade-expected.txt >index 46d7d69840efb448804308a0df67af23e23b7240..e6f0a718d071bc4e4a285c8dae2b443aec0c1c99 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-no-referrer-when-downgrade-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-no-referrer-when-downgrade-expected.txt >@@ -3,7 +3,7 @@ This test checks the default referrer policy when navigating from an insecure UR > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?no-referrer-when-downgrade > Referrer is http://127.0.0.1:8000/security/resources/referrer-policy-start.html?no-referrer-when-downgrade >diff --git a/LayoutTests/http/tests/security/referrer-policy-origin-expected.txt b/LayoutTests/http/tests/security/referrer-policy-origin-expected.txt >index bff723c8a1731ee5173b89c90915d542607839ba..5ca707bc92dbc59581e03bcf86d94c6099c2e3fa 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-origin-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-origin-expected.txt >@@ -3,7 +3,7 @@ This test checks the origin referrer policy when navigating from an insecure URL > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/ > Referrer is http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/security/referrer-policy-redirect-expected.txt b/LayoutTests/http/tests/security/referrer-policy-redirect-expected.txt >index 3d1c9750f61abcd6acdfeecffd0608e14425cd0b..dca1f2eea225e0b3e41125c0744ccdba13707034 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-redirect-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-redirect-expected.txt >@@ -3,7 +3,7 @@ This test checks the referrer policy is obeyed along the redirect chain. The tes > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/ > Referrer is http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/security/referrer-policy-rel-noreferrer-expected.txt b/LayoutTests/http/tests/security/referrer-policy-rel-noreferrer-expected.txt >index 1920c1a54e57dcd863eb67376e0376f87100b7c1..8e0f3d425ce2e781c4b2cd8b6a05323fd34b3139 100644 >--- a/LayoutTests/http/tests/security/referrer-policy-rel-noreferrer-expected.txt >+++ b/LayoutTests/http/tests/security/referrer-policy-rel-noreferrer-expected.txt >@@ -3,7 +3,7 @@ This test navigates a frame by clicking on a link with rel=noreferrer. It passes > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > HTTP Referer header is empty > Referrer is empty >diff --git a/LayoutTests/http/tests/security/same-origin-appcache-blocked-expected.txt b/LayoutTests/http/tests/security/same-origin-appcache-blocked-expected.txt >index 66dfea80f997f5b1dab7a7b089a1a05104d438cb..1c3cc51b9b24ef755c6a5bce6aae8413babc378b 100644 >--- a/LayoutTests/http/tests/security/same-origin-appcache-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/same-origin-appcache-blocked-expected.txt >@@ -4,6 +4,6 @@ This iframe should not have a cache: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Cache not found >diff --git a/LayoutTests/http/tests/security/same-origin-document-domain-storage-allowed-expected.txt b/LayoutTests/http/tests/security/same-origin-document-domain-storage-allowed-expected.txt >index 9946bb40e5a12530c1ea0014a0f32dfd86c45231..4d05764c313cc966dcc754ba7bcc89cb4076f793 100644 >--- a/LayoutTests/http/tests/security/same-origin-document-domain-storage-allowed-expected.txt >+++ b/LayoutTests/http/tests/security/same-origin-document-domain-storage-allowed-expected.txt >@@ -6,11 +6,11 @@ This iframe should not return any errors: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > No exception >diff --git a/LayoutTests/http/tests/security/same-origin-storage-blocked-expected.txt b/LayoutTests/http/tests/security/same-origin-storage-blocked-expected.txt >index 2a2c51f9b9efd5fbd99a9b2f79519ec9eaa6d948..339ef5b239d66e36d6e79f4d97cbe9662835adc5 100644 >--- a/LayoutTests/http/tests/security/same-origin-storage-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/same-origin-storage-blocked-expected.txt >@@ -6,11 +6,11 @@ This iframe should return a security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > SecurityError >diff --git a/LayoutTests/http/tests/security/same-origin-websql-blocked-expected.txt b/LayoutTests/http/tests/security/same-origin-websql-blocked-expected.txt >index d66f5a1ef5e884712a6acac54fb3303951ff7806..814c69eb30f44e299804d456cd00eab6d3d7ae14 100644 >--- a/LayoutTests/http/tests/security/same-origin-websql-blocked-expected.txt >+++ b/LayoutTests/http/tests/security/same-origin-websql-blocked-expected.txt >@@ -3,6 +3,6 @@ This iframe should return a security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError >diff --git a/LayoutTests/http/tests/security/sandboxed-iframe-document-cookie-expected.txt b/LayoutTests/http/tests/security/sandboxed-iframe-document-cookie-expected.txt >index ea17cfb862f0f4cdad15d5b8fc12ffc23b18551f..18d4bb51f4df456e1d3626c00b6ab37e2054a658 100644 >--- a/LayoutTests/http/tests/security/sandboxed-iframe-document-cookie-expected.txt >+++ b/LayoutTests/http/tests/security/sandboxed-iframe-document-cookie-expected.txt >@@ -3,6 +3,6 @@ This test checks that a SECURITY_ERR exception is raised while accessing documen > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-getCurrentPosition-expected.txt b/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-getCurrentPosition-expected.txt >index 322d6977ab0264aa67d06f62b040555c4d0f4fd2..ba05b4ba9acf31a267028c986acfff29c8162814 100644 >--- a/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-getCurrentPosition-expected.txt >+++ b/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-getCurrentPosition-expected.txt >@@ -3,7 +3,7 @@ Tests that navigator.geolocation.getCurrentPosition() returns error POSITION_UNA > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS error.code is error.POSITION_UNAVAILABLE. > PASS error.message is "Origin does not have permission to use Geolocation service". >diff --git a/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-watchPosition-expected.txt b/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-watchPosition-expected.txt >index b6489439804632a642a2a30139b8c70f3e654683..964f3eaf701c89faebce2036884bdc7d9ff51c70 100644 >--- a/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-watchPosition-expected.txt >+++ b/LayoutTests/http/tests/security/sandboxed-iframe-geolocation-watchPosition-expected.txt >@@ -3,7 +3,7 @@ Tests that navigator.geolocation.watchPosition() returns error POSITION_UNAVAILA > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS error.code is error.POSITION_UNAVAILABLE. > PASS error.message is "Origin does not have permission to use Geolocation service". >diff --git a/LayoutTests/http/tests/security/srcdoc-inherits-referrer-expected.txt b/LayoutTests/http/tests/security/srcdoc-inherits-referrer-expected.txt >index 39ca8dcb7aa8d89a58a2ba6587a9e5035360f658..9a822f853aa5c0895d6c235c212a5b26c43919a8 100644 >--- a/LayoutTests/http/tests/security/srcdoc-inherits-referrer-expected.txt >+++ b/LayoutTests/http/tests/security/srcdoc-inherits-referrer-expected.txt >@@ -1,13 +1,13 @@ > The srcdoc iframe below should use this document's URL as its referrer. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This iframe logs information about its referrer: > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > HTTP Referer header is http://127.0.0.1:8000/security/srcdoc-inherits-referrer.html > Referrer is http://127.0.0.1:8000/security/srcdoc-inherits-referrer.html >diff --git a/LayoutTests/http/tests/security/srcdoc-inherits-referrer-for-forms-expected.txt b/LayoutTests/http/tests/security/srcdoc-inherits-referrer-for-forms-expected.txt >index 8408f6ac3ddf547a696e73dddd946587c0d6058e..dc22260b3754296ed25f149763b96251e7720dd4 100644 >--- a/LayoutTests/http/tests/security/srcdoc-inherits-referrer-for-forms-expected.txt >+++ b/LayoutTests/http/tests/security/srcdoc-inherits-referrer-for-forms-expected.txt >@@ -1,7 +1,7 @@ > The srcdoc iframe below should use this document's URL as its referrer. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This iframe logs information about its referrer: > >diff --git a/LayoutTests/http/tests/security/storage-blocking-loosened-local-storage-expected.txt b/LayoutTests/http/tests/security/storage-blocking-loosened-local-storage-expected.txt >index 84403d09b9c76e0dcf90901c73243d48640d59f7..c7426cb01b766c963e7e30b68757a0eead346cf2 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-loosened-local-storage-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-loosened-local-storage-expected.txt >@@ -3,7 +3,7 @@ This iframe should return only one security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError > >diff --git a/LayoutTests/http/tests/security/storage-blocking-loosened-plugin-expected.txt b/LayoutTests/http/tests/security/storage-blocking-loosened-plugin-expected.txt >index b98ee4f8e8537c664e222e3b1e795910256a96fe..97e231bce375eddb1eaa40776eaa8c938fba8df9 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-loosened-plugin-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-loosened-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/storage-blocking-loosened-private-browsing-plugin-expected.txt b/LayoutTests/http/tests/security/storage-blocking-loosened-private-browsing-plugin-expected.txt >index 209e7b6dd66461d22bb5e08a62c651d5e5b38866..e36763987c870fc24e43f3dd07e5edab4cda0f56 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-loosened-private-browsing-plugin-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-loosened-private-browsing-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > true >diff --git a/LayoutTests/http/tests/security/storage-blocking-loosened-websql-expected.txt b/LayoutTests/http/tests/security/storage-blocking-loosened-websql-expected.txt >index 84403d09b9c76e0dcf90901c73243d48640d59f7..c7426cb01b766c963e7e30b68757a0eead346cf2 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-loosened-websql-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-loosened-websql-expected.txt >@@ -3,7 +3,7 @@ This iframe should return only one security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError > >diff --git a/LayoutTests/http/tests/security/storage-blocking-strengthened-local-storage-expected.txt b/LayoutTests/http/tests/security/storage-blocking-strengthened-local-storage-expected.txt >index 2de2a0664eba87538ce9042b5869ae7a0124563c..f4d346613c0e18920dc7fc6ff705948e61fccfcc 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-strengthened-local-storage-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-strengthened-local-storage-expected.txt >@@ -3,7 +3,7 @@ This iframe should return only one security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > >diff --git a/LayoutTests/http/tests/security/storage-blocking-strengthened-plugin-expected.txt b/LayoutTests/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >index 94d8ecefa7e38713d447ec843bea121444a2c8ae..3da548d65a39f9f5aabb059876b6dd3a4dca4920 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt b/LayoutTests/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >index 94d8ecefa7e38713d447ec843bea121444a2c8ae..3da548d65a39f9f5aabb059876b6dd3a4dca4920 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > false >diff --git a/LayoutTests/http/tests/security/storage-blocking-strengthened-websql-expected.txt b/LayoutTests/http/tests/security/storage-blocking-strengthened-websql-expected.txt >index 2de2a0664eba87538ce9042b5869ae7a0124563c..f4d346613c0e18920dc7fc6ff705948e61fccfcc 100644 >--- a/LayoutTests/http/tests/security/storage-blocking-strengthened-websql-expected.txt >+++ b/LayoutTests/http/tests/security/storage-blocking-strengthened-websql-expected.txt >@@ -3,7 +3,7 @@ This iframe should return only one security error: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No exception > >diff --git a/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-redirects-in-private-mode-expected.txt b/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-redirects-in-private-mode-expected.txt >index a4b67492b240ab3a5f8604231294f8dc7c3276ce..a46933f1981931998b9f3825478d0b572f561c21 100644 >--- a/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-redirects-in-private-mode-expected.txt >+++ b/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-redirects-in-private-mode-expected.txt >@@ -10,6 +10,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-requests-in-private-mode-expected.txt b/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-requests-in-private-mode-expected.txt >index d3b648989f03d9eb52be6ae81d1d78874848b916..9427e5f2fc21c9d6e05627517ecd291e606bd3ec 100644 >--- a/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-requests-in-private-mode-expected.txt >+++ b/LayoutTests/http/tests/security/strip-referrer-to-origin-for-third-party-requests-in-private-mode-expected.txt >@@ -11,6 +11,6 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/ >diff --git a/LayoutTests/http/tests/security/window-properties-clear-domain-expected.txt b/LayoutTests/http/tests/security/window-properties-clear-domain-expected.txt >index 394be5bc1fbf4a83e60c9df993af8edcc53f4d5f..fb86f34abaa21f0b0563fde124fea4804b14eeba 100644 >--- a/LayoutTests/http/tests/security/window-properties-clear-domain-expected.txt >+++ b/LayoutTests/http/tests/security/window-properties-clear-domain-expected.txt >@@ -1,6 +1,6 @@ > Test that window properties set for initial document are reset if domain security check fails > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/window-properties-clear-port-expected.txt b/LayoutTests/http/tests/security/window-properties-clear-port-expected.txt >index 754c462aa8270311deb48a37a7685718fb2d96af..a3d995093f2b79bd9ced94d2e501bed820091478 100644 >--- a/LayoutTests/http/tests/security/window-properties-clear-port-expected.txt >+++ b/LayoutTests/http/tests/security/window-properties-clear-port-expected.txt >@@ -1,6 +1,6 @@ > Test that window properties set for initial document are reset if port security check fails > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/window-properties-pass-expected.txt b/LayoutTests/http/tests/security/window-properties-pass-expected.txt >index 052d417561fa152081b8dd5da60871df923938f3..3a537fdd827c632ab26a7daf8535d4846e977a05 100644 >--- a/LayoutTests/http/tests/security/window-properties-pass-expected.txt >+++ b/LayoutTests/http/tests/security/window-properties-pass-expected.txt >@@ -1,6 +1,6 @@ > Test that window properties set for initial document are kept if security check passes > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt b/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt >index 4d9f5caeec46d143cb5a9a54a6868b5bd054c0a2..b0e45e4e27087c9973adb91305c0c63830c4472f 100644 >--- a/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt >+++ b/LayoutTests/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: line 13: Blocked a frame with origin "http://127.0.0.1:8000" fr > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > You can see the contents of this file. >diff --git a/LayoutTests/http/tests/security/xss-DENIED-defineProperty-expected.txt b/LayoutTests/http/tests/security/xss-DENIED-defineProperty-expected.txt >index 7039719eebb822201158069edaa0dd9407eb6966..092ad5cf2ed786c2f975e7209cad1531c1cf4424 100644 >--- a/LayoutTests/http/tests/security/xss-DENIED-defineProperty-expected.txt >+++ b/LayoutTests/http/tests/security/xss-DENIED-defineProperty-expected.txt >@@ -8,7 +8,7 @@ PASS: cross-site assignment of location.reload not allowed > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match. > SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match. >diff --git a/LayoutTests/http/tests/security/xssAuditor/faux-script1-expected.txt b/LayoutTests/http/tests/security/xssAuditor/faux-script1-expected.txt >index b091b5404f67fb5767616bf20d3fd8f37ea10855..c779b1707ee0c4cfb5501f115d864dd12409f621 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/faux-script1-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/faux-script1-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > <"script">alert('innocent code') >diff --git a/LayoutTests/http/tests/security/xssAuditor/faux-script2-expected.txt b/LayoutTests/http/tests/security/xssAuditor/faux-script2-expected.txt >index 70fdeab5a04e92e01cb89fdc90d7bdc0f0b0377e..7ca58c4b8449c1d09ae78ad3a86d50c8af79a52d 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/faux-script2-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/faux-script2-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > <'script'>alert('innocent code') >diff --git a/LayoutTests/http/tests/security/xssAuditor/faux-script3-expected.txt b/LayoutTests/http/tests/security/xssAuditor/faux-script3-expected.txt >index 2a7b766786dad12eb5a916bc6051eecfbe3f430e..62a4e5a494ae3e882be25197fe43bbf16833a8ee 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/faux-script3-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/faux-script3-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > "<[whatever]script>alert('innocent code') >diff --git a/LayoutTests/http/tests/security/xssAuditor/malformed-HTML-expected.txt b/LayoutTests/http/tests/security/xssAuditor/malformed-HTML-expected.txt >index 55cbbc333b1310474590679e41f4ded64f4b7d01..b898fb5ddfbd1405de4da57add7b9d8394dd7b5c 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/malformed-HTML-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/malformed-HTML-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http:// > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/http/tests/security/xssAuditor/non-block-javascript-url-frame-expected.txt b/LayoutTests/http/tests/security/xssAuditor/non-block-javascript-url-frame-expected.txt >index e8c22b857b9180585d92835dc07b405e7181f160..a6800284a71072cfb2d8a949a348b9a8aa514ca2 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/non-block-javascript-url-frame-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/non-block-javascript-url-frame-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS >diff --git a/LayoutTests/http/tests/security/xssAuditor/reflection-in-path-expected.txt b/LayoutTests/http/tests/security/xssAuditor/reflection-in-path-expected.txt >index a5664b014f42963c962e4398b59da50b3a8b904f..9ff910af948b50555d508ac5c555d5bcb7847410 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/reflection-in-path-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/reflection-in-path-expected.txt >@@ -2,7 +2,7 @@ CONSOLE MESSAGE: line 5: The XSS Auditor refused to execute a script in 'http:// > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is an iframe with a injected form > >diff --git a/LayoutTests/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt b/LayoutTests/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >index e5a47364217f2c052deec83f2cc77de3aae154fc..4e623b903c3a031366fd827b0f8b16305eba1105 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >@@ -1,11 +1,11 @@ >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?test=/security/xssAuditor/script-tag-with-callbacks.html&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E' because its source code was found within the request. The auditor was enabled because the server did not send an 'X-XSS-Protection' header. > didDetectXSS >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/http/tests/security/xssAuditor/svg-animate-expected.txt b/LayoutTests/http/tests/security/xssAuditor/svg-animate-expected.txt >index cac10cd3f62467842190932d248b5e58abc584e7..f8292dd2a061c0647c57946ad4562506d8b154d3 100644 >--- a/LayoutTests/http/tests/security/xssAuditor/svg-animate-expected.txt >+++ b/LayoutTests/http/tests/security/xssAuditor/svg-animate-expected.txt >@@ -4,7 +4,7 @@ This test passes if the element displayed in the frame below has a 'values' attr > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > animate => animate > * attributeName: xlink:href >diff --git a/LayoutTests/http/tests/ssl/media-stream/get-user-media-different-host-expected.txt b/LayoutTests/http/tests/ssl/media-stream/get-user-media-different-host-expected.txt >index 00c91ef88449cd5f79600e391d21976748c2f3de..5326d22fdec46a48d5a74daa5c4322f5f845f52f 100644 >--- a/LayoutTests/http/tests/ssl/media-stream/get-user-media-different-host-expected.txt >+++ b/LayoutTests/http/tests/ssl/media-stream/get-user-media-different-host-expected.txt >@@ -8,7 +8,7 @@ URL: https://127.0.0.1:8443/ssl/media-stream/get-user-media-different-host.html > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > URL: https://localhost:8443/ssl/media-stream/resources/get-user-media-frame.html?fail;1 > >diff --git a/LayoutTests/http/tests/ssl/media-stream/get-user-media-nested-expected.txt b/LayoutTests/http/tests/ssl/media-stream/get-user-media-nested-expected.txt >index f54eb9d922453d9b6630674f6a96a15c2ab1f868..b8811b21a76c984928609cf61b94212b5ef7184c 100644 >--- a/LayoutTests/http/tests/ssl/media-stream/get-user-media-nested-expected.txt >+++ b/LayoutTests/http/tests/ssl/media-stream/get-user-media-nested-expected.txt >@@ -8,19 +8,19 @@ URL: https://127.0.0.1:8443/ssl/media-stream/get-user-media-nested.html > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > URL: https://localhost:8443/ssl/media-stream/resources/get-user-media-frame.html?fail;3 > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > URL: https://localhost:8443/ssl/media-stream/resources/get-user-media-frame.html?fail;2 > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame3-->' > -------- > URL: https://localhost:8443/ssl/media-stream/resources/get-user-media-frame.html?fail;1 > >diff --git a/LayoutTests/http/tests/ssl/media-stream/get-user-media-secure-connection-expected.txt b/LayoutTests/http/tests/ssl/media-stream/get-user-media-secure-connection-expected.txt >index 613395fb345e79c5f69fa6d3638fc88a5b787321..2160c216944bbc1a8a0c52674f23af4197b5d18f 100644 >--- a/LayoutTests/http/tests/ssl/media-stream/get-user-media-secure-connection-expected.txt >+++ b/LayoutTests/http/tests/ssl/media-stream/get-user-media-secure-connection-expected.txt >@@ -7,7 +7,7 @@ URL: https://127.0.0.1:8443/ssl/media-stream/get-user-media-secure-connection.ht > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > URL: https://127.0.0.1:8443/ssl/media-stream/resources/get-user-media-frame.html?succeed;1 > >diff --git a/LayoutTests/http/tests/ssl/ping-with-unsafe-redirect-expected.txt b/LayoutTests/http/tests/ssl/ping-with-unsafe-redirect-expected.txt >index a8f7d539377240d3bfa7f63dfdd4cc956eda35a9..31b6ec478b1f0d47d1bc7f4cf24e3268c4148d03 100644 >--- a/LayoutTests/http/tests/ssl/ping-with-unsafe-redirect-expected.txt >+++ b/LayoutTests/http/tests/ssl/ping-with-unsafe-redirect-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Should not crash when closed. > > >diff --git a/LayoutTests/http/tests/storageAccess/deny-storage-access-under-opener-expected.txt b/LayoutTests/http/tests/storageAccess/deny-storage-access-under-opener-expected.txt >index 5d644c673e9aa42a0f7c7fdba1089eaad25bd645..8b4a645d4d073b0a6a20317d70b092e1c32e9181 100644 >--- a/LayoutTests/http/tests/storageAccess/deny-storage-access-under-opener-expected.txt >+++ b/LayoutTests/http/tests/storageAccess/deny-storage-access-under-opener-expected.txt >@@ -10,7 +10,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should not receive first-party cookie. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt >index 8ec4d34e66ab0eb611f589aff47f6cc5cd0c5e8e..5fe43c77130f251f4024f7cd5bbd2a7b3783f8bf 100644 >--- a/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt >+++ b/LayoutTests/http/tests/storageAccess/grant-storage-access-under-opener-expected.txt >@@ -10,7 +10,7 @@ TEST COMPLETE > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame-expected.txt b/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame-expected.txt >index 1a60d12f10a139ea6f9ca2930b201a79aeeda4f4..bb328b64d43715d2b85919a5090faeb8d05a1c61 100644 >--- a/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame-expected.txt >+++ b/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-and-try-access-from-right-frame-expected.txt >@@ -18,7 +18,7 @@ Received cookie named 'partitionedCookie'. > Client-side document.cookie: partitionedCookie=value > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -26,7 +26,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame2-->' > -------- > Should not receive cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -34,13 +34,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame3-->' > -------- > > > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame4-->' > -------- > Should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame-expected.txt b/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame-expected.txt >index dbc8f3444457b329e465f31915b51dfa36a9402d..b1e6628047d2a14cc4c83a4172c437243fdab9de 100644 >--- a/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame-expected.txt >+++ b/LayoutTests/http/tests/storageAccess/request-and-grant-storage-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-non-recent-user-interaction-but-try-access-from-wrong-frame-expected.txt >@@ -15,7 +15,7 @@ Frame: 'theIframe' > > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame1-->' > -------- > Should receive first-party cookie. > Received cookie named 'firstPartyCookie'. >@@ -23,7 +23,7 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: firstPartyCookie=value > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame2-->' > -------- > Should not receive cookies. > Did not receive cookie named 'firstPartyCookie'. >@@ -31,13 +31,13 @@ Did not receive cookie named 'partitionedCookie'. > Client-side document.cookie: > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame3-->' > -------- > > > > -------- >-Frame: '<!--framePath //<!--frame4-->-->' >+Frame: '<!--frame4-->' > -------- > Should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >@@ -45,7 +45,7 @@ Received cookie named 'partitionedCookie'. > Client-side document.cookie: partitionedCookie=value > > -------- >-Frame: '<!--framePath //<!--frame5-->-->' >+Frame: '<!--frame5-->' > -------- > Should receive partitioned cookie. > Did not receive cookie named 'firstPartyCookie'. >diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-expected.txt >index 420cb746322eceabfca78ed69a0e7903d83b9677..e7302fcdfe857e32d17f32cc9726aa348aa72c65 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-expected.txt >@@ -3,7 +3,7 @@ This test verifies that sandboxed iframe has XmlHttpRequest access to the server > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Sandboxed iframe XHR access allowed. > >diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt >index 420cb746322eceabfca78ed69a0e7903d83b9677..e7302fcdfe857e32d17f32cc9726aa348aa72c65 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt >@@ -3,7 +3,7 @@ This test verifies that sandboxed iframe has XmlHttpRequest access to the server > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Sandboxed iframe XHR access allowed. > >diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt >index 31d29b1b3718ca813fa5b3cab34e2a3ecd4aab7a..183f404e1141d1ddff527ce22a0a194978063551 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt >@@ -5,6 +5,6 @@ This test verifies that sandboxed iframe does not have XmlHttpRequest access to > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [ A network error occurred.]. >diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt >index 9ba289ef2cddb351383bf8be3728f8aee5a381f1..9fc5a9aa621a51c64824c994ff13663516a68f2b 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt >@@ -7,6 +7,6 @@ This test will print "PASS" on success. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [ A network error occurred.]. >diff --git a/LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt b/LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt >index 8e51248660f26ee3e68f5be4301dae64017387d0..f5700d4e530db1ba8db49a1020538353adf566f1 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Test for bug 11450 REGRESSION: XMLHttpRequest::didFinishLoading() should immediately return if the request has already been aborted > > If a frame has an active XMLHttpRequest that is still receiving data, and that frame is destroyed >diff --git a/LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash-expected.txt b/LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash-expected.txt >index 6bba9b052d69cfd798e8d91de634bb3a87fefe2c..e3072fe6d43233db66c92a7dbe58f4be106dc840 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > Test for bug 25394: crash in DocumentLoader::addResponse due to bad |this| pointer > > You should see a few messages followed by PASSED once. >diff --git a/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt b/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt >index b0314f96d656faabd8f260a17eb2064f762c559c..c6f81de613e5c02b9572afc7bab939eac3f7e270 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt >@@ -91,7 +91,7 @@ CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhtt > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Check that exact matching is used when comparing a request's originating url and the value provided by Access-Control-Allow-Origin. > >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-004-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-004-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-004-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-004-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-005-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-005-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-005-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-005-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-006-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-007-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-008-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-008-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-008-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-008-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-009-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-009-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-009-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-009-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-010-expected.txt b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-010-expected.txt >index 9800c662767141b9b46e4de156ffa304268cbdc3..dbe3ce7b57758ee116486eb19c5bc4a00160097a 100644 >--- a/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-010-expected.txt >+++ b/LayoutTests/http/tests/xmlhttprequest/uri-resolution-opera-open-010-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASSED >diff --git a/LayoutTests/http/tests/xsl/xslt-transform-with-javascript-disabled-expected.txt b/LayoutTests/http/tests/xsl/xslt-transform-with-javascript-disabled-expected.txt >index 4b64a2c64df80bdb1a8182b136026ee38406491f..75585e14b73ffed08d0b0e8345fec0e1729eee83 100644 >--- a/LayoutTests/http/tests/xsl/xslt-transform-with-javascript-disabled-expected.txt >+++ b/LayoutTests/http/tests/xsl/xslt-transform-with-javascript-disabled-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This is the first paragraph > >diff --git a/LayoutTests/imported/blink/fast/plugins/empty-url-object-expected.txt b/LayoutTests/imported/blink/fast/plugins/empty-url-object-expected.txt >index 9eb021858ee1287fed02584e71cc895372ce0989..eaa58110a86ad98885aaedff7ebbab4d78412a10 100644 >--- a/LayoutTests/imported/blink/fast/plugins/empty-url-object-expected.txt >+++ b/LayoutTests/imported/blink/fast/plugins/empty-url-object-expected.txt >@@ -1,6 +1,6 @@ > This text should only appear once. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-expected.txt >index a552f606e80e48b34b6a71646da2037cf9942e0c..a230eb73da1adab946fe18531817ccc4972be27e 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS Cross-origin navigation started from unload handler > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-expected.txt >index f5446f76c78e9505123d1b5e69807cabc8dcdcc8..ee2a5f9c58cac99cecc35cde90116984c28e1e79 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS Navigation from unload whilst traversing history > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-expected.txt >index a90bb1ef38dfc5ea26cd43adb12d02c4f276124e..4de40e09c8c4d8e88d88ea583cb3b1db9fe69fb5 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS Same-origin navigation started from unload handler > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-expected.txt >index a90bb1ef38dfc5ea26cd43adb12d02c4f276124e..4de40e09c8c4d8e88d88ea583cb3b1db9fe69fb5 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS Same-origin navigation started from unload handler > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >index 1973de710b063b8a1f31e5347e83f877d1190f51..2dc2bd29fd6294fd933b888ebb5699514308a586 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > CONSOLE MESSAGE: line 21: TypeError: do_test is not a function. (In 'do_test()', 'do_test' is undefined) > > FAIL document.open in unload assert_equals: expected "0123456789" but got "012389" >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002-expected.txt >index ab70476b5b4d31ee01922422fe09de73d2e396cf..52d12fb8cf99c7ab07ce5c1103d914cc7330469c 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/002-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > FAIL document.open in unload assert_equals: expected "0123456789Z" but got "016789Z" > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003-expected.txt >index 8e92195e5f58f99badcf600ea1955b9419441e75..42eaf968ebb41269527c1baa05705b4c19576b69 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/003-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS document.open in beforeunload with link > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004-expected.txt >index 6d407822c51154e60e72fde53308f8aa2a123599..8f3097438502e364ca879747482e7439d963ac7f 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > Harness Error (TIMEOUT), message = null > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005-expected.txt >index 2ffe9156950f3037cc45a74ab8d939c0ca2a94b0..95f858c23e924d25524b8d2a43c62c3358c53ba7 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/005-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS document.open in pagehide in iframe > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-expected.txt >index 5d0ba266c38443e17f65e095d019636d25eddaa6..33f279800b302aa269f601f16eb1485d0b5b3545 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS unload event properties > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-expected.txt >index 1c46d62e22ee5021d0a76fd6b849ee0dfc7eb0fd..deaeb808cc2977f514905cb10c7ee09bbf50c294 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS pagehide / unload event order > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-expected.txt >index 37712c5fb1e84b79c67a9180b51dc38cade48332..7406d5052c3ddc2d09a48b8ccd7b1a48a17164a4 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-expected.txt >@@ -1,5 +1,5 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS salvagable state of document after setting unload listener > >diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-expected.txt >index 5229b82c94ebd9871eb33013b7bad19ca8f848fa..40bfef4e2238d54653301ff406c9207e92c78738 100644 >--- a/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-expected.txt >+++ b/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-expected.txt >@@ -1,4 +1,4 @@ >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > PASS unload IDL attribute > >diff --git a/LayoutTests/loader/stateobjects/pushstate-size-iframe-expected.txt b/LayoutTests/loader/stateobjects/pushstate-size-iframe-expected.txt >index 982d31b5c3898f6eeb37de6b76ecafbc0f41ce22..f87ec07af683f024a61b99cd90225b7591ad9930 100644 >--- a/LayoutTests/loader/stateobjects/pushstate-size-iframe-expected.txt >+++ b/LayoutTests/loader/stateobjects/pushstate-size-iframe-expected.txt >@@ -14,7 +14,7 @@ Parent frame successfully added item: 10 times > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > iFrame successfully added item: 1 times > iFrame successfully added item: 2 times >diff --git a/LayoutTests/loader/stateobjects/replacestate-size-iframe-expected.txt b/LayoutTests/loader/stateobjects/replacestate-size-iframe-expected.txt >index 54011943403040eed7732ccc22600aa0a8b7e302..05234443988b291b83da8625d19d6f2cb7756579 100644 >--- a/LayoutTests/loader/stateobjects/replacestate-size-iframe-expected.txt >+++ b/LayoutTests/loader/stateobjects/replacestate-size-iframe-expected.txt >@@ -6,7 +6,7 @@ It fit. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > The total payload is currently 60+mb. Pushing a 1mb object brings that 61+mb. > It fit. >diff --git a/LayoutTests/media/auto-play-in-sandbox-with-allow-scripts-expected.txt b/LayoutTests/media/auto-play-in-sandbox-with-allow-scripts-expected.txt >index 661d0096b954ce910daa46c404479f1320f8e34f..4705d219a8fd91b89c6801ade02eab9c035d8710 100644 >--- a/LayoutTests/media/auto-play-in-sandbox-with-allow-scripts-expected.txt >+++ b/LayoutTests/media/auto-play-in-sandbox-with-allow-scripts-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > Test that play event fires when "src" set with an autoplay attribute in a sandbox with allows-scripts. >diff --git a/LayoutTests/platform/ios-wk1/http/tests/quicklook/top-navigation-blocked-expected.txt b/LayoutTests/platform/ios-wk1/http/tests/quicklook/top-navigation-blocked-expected.txt >index 61ed4d873067b73684aed5a48ca9d514573d25d0..0f1d84f39af3befa443eea687013704e5be71474 100644 >--- a/LayoutTests/platform/ios-wk1/http/tests/quicklook/top-navigation-blocked-expected.txt >+++ b/LayoutTests/platform/ios-wk1/http/tests/quicklook/top-navigation-blocked-expected.txt >@@ -4,6 +4,6 @@ CONSOLE MESSAGE: line 38: Unsafe JavaScript attempt to initiate navigation for f > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt b/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >index c2218e216c077c4d69e7c683d9bd9a82d5bd99d4..698a321656730ce74d75f04f2cc5dcaf6e7b5e5c 100644 >--- a/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >+++ b/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/001-expected.txt >@@ -1,5 +1,5 @@ > main frame - has 1 onunload handler(s) >-frame "<!--framePath //<!--frame0-->-->" - has 1 onunload handler(s) >+frame "<!--frame1-->" - has 1 onunload handler(s) > > FAIL document.open in unload assert_equals: expected "0123456789" but got "012389" > >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >index ba874ef164765d1494d00672a661f79bd7bf10af..6c72609aec5bc4327f509d5f61eb93a53c4d6270 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/at-import-stylesheet-blocked-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load data:text/css,body::after { content: 'FAIL'; } > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >index eacad2dd236e7c61319ea4d0a5bc585160d4a881..915e6bfc395eb88b0b30136ecf195fe4db4ae7f2 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/cross-origin-iframe-blocked-expected.txt >@@ -4,12 +4,12 @@ This test verifies that loading a cross-origin iframe is blocked when created by > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/document-domain-is-empty-string-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/document-domain-is-empty-string-expected.txt >index ecd7468ec34b670a4187b63fe8c3199076ba2445..d931fc303f653d8de58b34b2184e29fca4faaed6 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/document-domain-is-empty-string-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/document-domain-is-empty-string-expected.txt >@@ -1,6 +1,6 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS document.domain is . >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/external-stylesheet-blocked-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/external-stylesheet-blocked-expected.txt >index ba874ef164765d1494d00672a661f79bd7bf10af..6c72609aec5bc4327f509d5f61eb93a53c4d6270 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/external-stylesheet-blocked-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/external-stylesheet-blocked-expected.txt >@@ -2,6 +2,6 @@ CONSOLE MESSAGE: Refused to load data:text/css,body::after { content: 'FAIL'; } > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/hide-referer-on-navigation-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/hide-referer-on-navigation-expected.txt >index 2f14afe24c3e9aa8a6e9af63909fc8f40e5e415a..d62c8e1a63f74173772edb8abebe3840724f7642 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/hide-referer-on-navigation-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/hide-referer-on-navigation-expected.txt >@@ -3,6 +3,6 @@ This test verifies that the HTTP referrer is hidden when navigating from a Micro > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/ios/http/tests/quicklook/top-navigation-blocked-expected.txt b/LayoutTests/platform/ios/http/tests/quicklook/top-navigation-blocked-expected.txt >index e1afe5502704f0e24edd407c230196457d49030c..c091198c1a12e5cb408a3585b7aab1eca637636e 100644 >--- a/LayoutTests/platform/ios/http/tests/quicklook/top-navigation-blocked-expected.txt >+++ b/LayoutTests/platform/ios/http/tests/quicklook/top-navigation-blocked-expected.txt >@@ -4,6 +4,6 @@ CONSOLE MESSAGE: SecurityError: The operation is insecure. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Run test >diff --git a/LayoutTests/platform/ios/quicklook/excel-expected.txt b/LayoutTests/platform/ios/quicklook/excel-expected.txt >index ea3034f39ae12f35688adfee0aa557dcb933fd7b..a2a42ee0b103525840ab2c69183ee1fb713800bd 100644 >--- a/LayoutTests/platform/ios/quicklook/excel-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/excel-expected.txt >@@ -39,7 +39,7 @@ iframe { > .s4.s4.s4 {font-family:Lucida Grande; font-weight:bold;color:#003300;font-size:16px; white-space:normal; vertical-align:top; padding-bottom:0; border-style:solid;border-width:thin;border-color:black; padding-right:2; padding-left:2; padding-top:0;} > </style></head><body><div><table style="width:657;" class="worksheet"><colgroup><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"></colgroup><tbody><tr><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td></tr><tr height="20;"><td class="s2"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="170;"><td class="s2"> </td><td class="s4"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="338;"><td class="s2"> </td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="158;"><td class="s2"> </td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/excel-legacy-expected.txt b/LayoutTests/platform/ios/quicklook/excel-legacy-expected.txt >index 5bb253c6e26744c9b17d2d4f3f8cc96122a9eeee..b688e53cde0d89beccba69d82d09506efc1dd1cd 100644 >--- a/LayoutTests/platform/ios/quicklook/excel-legacy-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/excel-legacy-expected.txt >@@ -39,7 +39,7 @@ iframe { > .s4.s4.s4 {font-family:Lucida Grande; font-weight:bold; color:#003300;font-size:16px; white-space:normal; vertical-align:top; padding-bottom:0; border-style:solid;border-width:thin;border-color:black; padding-right:2; padding-left:2; padding-top:0;} > </style></head><body><div><table style="width:648;" class="worksheet"><colgroup><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"></colgroup><tbody><tr><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td></tr><tr height="20;"><td class="s2"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="170;"><td class="s2"> </td><td class="s4"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="338;"><td class="s2"> </td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="158;"><td class="s2"> </td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/excel-macro-enabled-expected.txt b/LayoutTests/platform/ios/quicklook/excel-macro-enabled-expected.txt >index 42f48789de2382723e874534dde9b58c6d6d7d2c..2f495e710fa503aa954e594a71369c6d078d148f 100644 >--- a/LayoutTests/platform/ios/quicklook/excel-macro-enabled-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/excel-macro-enabled-expected.txt >@@ -39,7 +39,7 @@ iframe { > .s4.s4.s4 {font-family:Lucida Grande; font-weight:bold;color:#003300;font-size:16px; white-space:normal; vertical-align:top; padding-bottom:0; border-style:solid;border-width:thin;border-color:black; padding-right:2; padding-left:2; padding-top:0;} > </style></head><body><div><table style="width:648;" class="worksheet"><colgroup><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"></colgroup><tbody><tr height="16;"><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td><td class="s1"> </td></tr><tr height="20;"><td class="s2"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="170;"><td class="s2"> </td><td class="s4"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="338;"><td class="s2"> </td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr><tr height="158;"><td class="s2"> </td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td><td class="s3"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/powerpoint-expected.txt b/LayoutTests/platform/ios/quicklook/powerpoint-expected.txt >index b8ba4dbc8bd70089c547498fe48cba6c69d9bcac..c5a16f5b764af1e3c54e9dca969ce848a9817403 100644 >--- a/LayoutTests/platform/ios/quicklook/powerpoint-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/powerpoint-expected.txt >@@ -93,7 +93,7 @@ background:#BBBBBB; > .s2.s2.s2 {margin-top:4px; margin-left:4px; margin-bottom:4px; margin-right:4px; display:table; width:1022; height:56;} > </style><div class="slide" style="top:0; left:0;"><div class="s0"></div><div style="position:absolute; top:355; left:0; width:1022; height:56;"><div class="s2"><div class="s1"><p style="font-family:'Lucida Grande'; font-size:16;"><span style="color:#003400; font-weight:bold; font-size:16; font-family:'Lucida Grande';">Welcome to the website for the WebKit Open Source Project!</span></p><p style="font-family:'(null)'; font-size:18;"><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><a href="http://www.apple.com/safari/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">Safari</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span><a href="http://konqueror.kde.org/features/browser.php" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KHTML</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';"> and KJS libraries from </span><a href="http://kde.org/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KDE</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">.</span></p></div></div></div><img src="x-apple-ql-id://resource.tiff" style="position:absolute; top:116; left:404; width:215; height:174;"></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/powerpoint-legacy-expected.txt b/LayoutTests/platform/ios/quicklook/powerpoint-legacy-expected.txt >index ab6a6d0366e7ef03893985f1fc8ad7683895ee5a..a4d5f7723421932739125c30baa3154e6e948f17 100644 >--- a/LayoutTests/platform/ios/quicklook/powerpoint-legacy-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/powerpoint-legacy-expected.txt >@@ -93,7 +93,7 @@ background:#BBBBBB; > .s2.s2.s2 {margin-top:4px; margin-left:4px; margin-bottom:4px; margin-right:4px; display:table; width:1022; height:56;} > </style><div class="slide" style="top:0; left:0;"><div class="s0"></div><div style="position:absolute; top:355; left:0; width:1022; height:56;"><div class="s2"><div class="s1"><p style="padding-bottom:0px; font-family:'Lucida Grande'; font-size:16;"><span style="color:#003400; font-weight:bold; font-size:16; font-family:'Lucida Grande';">Welcome to the website for the WebKit Open Source Project!</span></p><p style="padding-top:0px; padding-bottom:0px; font-family:'Helvetica Light'; font-size:18;"><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><a href="http://www.apple.com/safari/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">Safari</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span><a href="http://konqueror.kde.org/features/browser.php" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KHTML</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';"> and KJS libraries from </span><a href="http://kde.org/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KDE</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">.</span></p></div></div></div><img src="x-apple-ql-id://resource.png" style="position:absolute; top:116; left:404; width:215; height:174;"></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/word-expected.txt b/LayoutTests/platform/ios/quicklook/word-expected.txt >index 3a86a9b98174b272691f05cb764a986f72aebdde..b3575544e9498d8b76362c92d39736178dd9b1b9 100644 >--- a/LayoutTests/platform/ios/quicklook/word-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/word-expected.txt >@@ -88,7 +88,7 @@ font-size:2.0em; > .s7.s7.s7 {font-weight:normal; font-family:'Lucida Grande'; color:#228711; font-size:12;} > </style><p class="s5"><span class="s6"><span class="bumpedFont15">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span></span><a href="http://www.apple.com/safari/"><span class="s7"><span class="bumpedFont15">Safari</span></span></a><span class="s6"><span class="bumpedFont15">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span></span><a href="http://konqueror.kde.org/features/browser.php"><span class="s7"><span class="bumpedFont15">KHTML</span></span></a><span class="s6"><span class="bumpedFont15"> and KJS libraries from </span></span><a href="http://kde.org/"><span class="s7"><span class="bumpedFont15">KDE</span></span></a><span class="s6"><span class="bumpedFont15">.</span></span></p></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/quicklook/word-legacy-expected.txt b/LayoutTests/platform/ios/quicklook/word-legacy-expected.txt >index f66538d53c0b812d637bc5ec7ebd0b832262d8df..4f43d8453eca2b45624af9cea103fc9b7f68dee9 100644 >--- a/LayoutTests/platform/ios/quicklook/word-legacy-expected.txt >+++ b/LayoutTests/platform/ios/quicklook/word-legacy-expected.txt >@@ -89,7 +89,7 @@ font-size:2.0em; > .s7.s7.s7 {direction:ltr;} > </style><p class="s7"><span>&nbsp;</span></p></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/ios/webarchive/loading/cache-expired-subresource-expected.txt b/LayoutTests/platform/ios/webarchive/loading/cache-expired-subresource-expected.txt >index c247bab8e2843d306aa348f22e992d4cbcaffaf2..e9944b39a72549781f9bedeedbfd7e9bef7ec9ca 100644 >--- a/LayoutTests/platform/ios/webarchive/loading/cache-expired-subresource-expected.txt >+++ b/LayoutTests/platform/ios/webarchive/loading/cache-expired-subresource-expected.txt >@@ -1,19 +1,19 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/cache-expired-subresource.webarchive - willSendRequest <NSURLRequest URL resources/cache-expired-subresource.webarchive, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > cache-expired-subresource.html - didFinishLoading > resources/cache-expired-subresource.webarchive - didReceiveResponse <NSURLResponse resources/cache-expired-subresource.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > http://localhost/pink-bullet.png - willSendRequest <NSURLRequest URL http://localhost/pink-bullet.png, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > resources/cache-expired-subresource.webarchive - didFinishLoading > http://localhost/pink-bullet.png - didReceiveResponse <NSURLResponse http://localhost/pink-bullet.png, http status code 0> > http://localhost/pink-bullet.png - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > layer at (0,0) size 800x600 > RenderView at (0,0) size 800x600 >diff --git a/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-expected.txt >index 45ccd4a4b68a5f08b36206fa347e67c34f27b1e2..75481145a979edcd84dc4bf60ae7477652c73180 100644 >--- a/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-expected.txt >+++ b/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > true > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >index 45ccd4a4b68a5f08b36206fa347e67c34f27b1e2..75481145a979edcd84dc4bf60ae7477652c73180 100644 >--- a/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >+++ b/LayoutTests/platform/mac-wk2/http/tests/security/cross-origin-plugin-private-browsing-toggled-expected.txt >@@ -6,11 +6,11 @@ This iframe should not have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > true > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > false >diff --git a/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-plugin-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >index 209e7b6dd66461d22bb5e08a62c651d5e5b38866..e36763987c870fc24e43f3dd07e5edab4cda0f56 100644 >--- a/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >+++ b/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > true >diff --git a/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >index 209e7b6dd66461d22bb5e08a62c651d5e5b38866..e36763987c870fc24e43f3dd07e5edab4cda0f56 100644 >--- a/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >+++ b/LayoutTests/platform/mac-wk2/http/tests/security/storage-blocking-strengthened-private-browsing-plugin-expected.txt >@@ -3,6 +3,6 @@ This iframe should have private browsing enabled: > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > true >diff --git a/LayoutTests/platform/mac-wk2/plugins/resize-from-plugin-expected.txt b/LayoutTests/platform/mac-wk2/plugins/resize-from-plugin-expected.txt >index 0cc08da5c9f92de4e689132305750fe5ac7fca2a..039ce0b2284952a7ca03a7154a73c95f9bb80853 100644 >--- a/LayoutTests/platform/mac-wk2/plugins/resize-from-plugin-expected.txt >+++ b/LayoutTests/platform/mac-wk2/plugins/resize-from-plugin-expected.txt >@@ -2,7 +2,7 @@ > Please follow this link for a manual test. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > Test for NPP_SetWindow calls sent while a plug-in resizes itself. >diff --git a/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt b/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt >index a0ec78da99ddc200ba40699fabdeb6438753ae5e..5ca26088b550820214aa40a02303e3ab0cda0577 100644 >--- a/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt >+++ b/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt >@@ -2,6 +2,6 @@ The webarchive in this iframe is utf-8 encoded and will only display properly if > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This content is UTF-8 encoded and includes a Hebrew Resh character -> ר >diff --git a/LayoutTests/platform/mac/webarchive/adopt-attribute-styled-body-webarchive-expected.txt b/LayoutTests/platform/mac/webarchive/adopt-attribute-styled-body-webarchive-expected.txt >index b19dcd52ac4707d68de82a0b8725054c0447e990..b5bfe5f8be0b3cf445f7fe72a5ac405d08eae83f 100644 >--- a/LayoutTests/platform/mac/webarchive/adopt-attribute-styled-body-webarchive-expected.txt >+++ b/LayoutTests/platform/mac/webarchive/adopt-attribute-styled-body-webarchive-expected.txt >@@ -102,7 +102,7 @@ if (window.parent.bodyToAdopt) { > > </body><body></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt b/LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt >index 8c7bca86367d7361ada82eeb6e6300c06caae53a..f4f82962ac072876bc36228c54114e8a75e55a56 100644 >--- a/LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt >+++ b/LayoutTests/platform/mac/webarchive/loading/cache-expired-subresource-expected.txt >@@ -1,19 +1,19 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/cache-expired-subresource.webarchive - willSendRequest <NSURLRequest URL resources/cache-expired-subresource.webarchive, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > cache-expired-subresource.html - didFinishLoading > resources/cache-expired-subresource.webarchive - didReceiveResponse <NSURLResponse resources/cache-expired-subresource.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > http://localhost/pink-bullet.png - willSendRequest <NSURLRequest URL http://localhost/pink-bullet.png, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > resources/cache-expired-subresource.webarchive - didFinishLoading > http://localhost/pink-bullet.png - didReceiveResponse <NSURLResponse http://localhost/test.php, http status code 200> > http://localhost/pink-bullet.png - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > layer at (0,0) size 800x600 > RenderView at (0,0) size 800x600 >diff --git a/LayoutTests/platform/mac/webarchive/test-duplicate-resources-expected.txt b/LayoutTests/platform/mac/webarchive/test-duplicate-resources-expected.txt >index a92692f75cb84c9285038389d9678d7c87de6ab0..bc13757376b7fac0ea7cac7f4306216bce3dc13a 100644 >--- a/LayoutTests/platform/mac/webarchive/test-duplicate-resources-expected.txt >+++ b/LayoutTests/platform/mac/webarchive/test-duplicate-resources-expected.txt >@@ -57,7 +57,7 @@ > > </body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/platform/win/plugins/resize-from-plugin-expected.txt b/LayoutTests/platform/win/plugins/resize-from-plugin-expected.txt >index 98c4de91cdc6b6ea17f46eea2b66ed14f61f6343..61d92d4db747b4e7f771ab3c916d546bbb10bc98 100644 >--- a/LayoutTests/platform/win/plugins/resize-from-plugin-expected.txt >+++ b/LayoutTests/platform/win/plugins/resize-from-plugin-expected.txt >@@ -2,7 +2,7 @@ > Please follow this link for a manual test. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > Test for NPP_SetWindow calls sent while a plug-in resizes itself. >diff --git a/LayoutTests/platform/win/webarchive/loading/cache-expired-subresource-expected.txt b/LayoutTests/platform/win/webarchive/loading/cache-expired-subresource-expected.txt >index 5f981fc1cba7c0cef4f22d764f9373b96872dcf5..8bf2825130d503b84a3e3318e6348c5f515d2ef0 100644 >--- a/LayoutTests/platform/win/webarchive/loading/cache-expired-subresource-expected.txt >+++ b/LayoutTests/platform/win/webarchive/loading/cache-expired-subresource-expected.txt >@@ -1,19 +1,19 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/cache-expired-subresource.webarchive - willSendRequest <NSURLRequest URL resources/cache-expired-subresource.webarchive, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > cache-expired-subresource.html - didFinishLoading > resources/cache-expired-subresource.webarchive - didReceiveResponse <NSURLResponse resources/cache-expired-subresource.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > http://localhost/pink-bullet.png - willSendRequest <NSURLRequest URL http://localhost/pink-bullet.png, main document URL cache-expired-subresource.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > resources/cache-expired-subresource.webarchive - didFinishLoading > http://localhost/pink-bullet.png - didReceiveResponse <NSURLResponse http://localhost/test.php, http status code 200> > http://localhost/pink-bullet.png - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > layer at (0,0) size 800x600 > RenderView at (0,0) size 800x600 >diff --git a/LayoutTests/platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt b/LayoutTests/platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt >index 7ee00a5cf1fcce03986c43ca5aa4cfbb44b48685..d49f5f1e504fc27d6c2fe59db88aac61f1db3aba 100644 >--- a/LayoutTests/platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt >+++ b/LayoutTests/platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt >@@ -1,11 +1,11 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didChangeLocationWithinPageForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didChangeLocationWithinPageForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > ALERT: Test finished due to hash change with a window count of 1 > >diff --git a/LayoutTests/platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt b/LayoutTests/platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt >index b06dcafdef613bba3b6497b5679c3c2aae81a3b3..214aa06b09c40f33ac8bbe56caf429e8527ab37e 100644 >--- a/LayoutTests/platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt >+++ b/LayoutTests/platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt >@@ -1,17 +1,17 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: Finishing test with a window count of 1 >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt b/LayoutTests/platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt >index 54613e93a22aa33e604b0a3bdb872986559e3667..ff3fe9f210c8b3305437341bf3cdb15f2e798b40 100644 >--- a/LayoutTests/platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt >+++ b/LayoutTests/platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt >@@ -1,17 +1,17 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: Finishing test with a window count of 1 >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt b/LayoutTests/platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt >index 1fa8028307434ed880c5240c3bf678522256c059..10d8e449cde6c86992930ebbeaae0d5d02a70949 100644 >--- a/LayoutTests/platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt >+++ b/LayoutTests/platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt >@@ -1,17 +1,17 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: resources/refresh-iframe-base-blank-frame.html >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: resources/refresh-iframe-base-blank-frame.html >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > ALERT: Test finished with 1 windows >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/fast/loader/subframe-removes-itself-expected.txt b/LayoutTests/platform/wk2/fast/loader/subframe-removes-itself-expected.txt >index 9e3d09bf6eab7c54ffe7dedb2af11a7228c27114..9f4cc0e94c2087b4e4b5f8f9acfee2ad6fd0fc7d 100644 >--- a/LayoutTests/platform/wk2/fast/loader/subframe-removes-itself-expected.txt >+++ b/LayoutTests/platform/wk2/fast/loader/subframe-removes-itself-expected.txt >@@ -1,7 +1,7 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFailLoadWithError > main frame - didFinishLoadForFrame > This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires. >diff --git a/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >index 91867ff4d864f033fdd0fe3d722b0f2ea6dddabd..59ea275f49a6c346442949137f7faaa172c64d08 100644 >--- a/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt >@@ -1,22 +1,22 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-3-output-credentials-then-finish.php >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: http://localhost:8000/loading/authentication-after-redirect-stores-wrong-credentials/resources/wrong-credential-3-output-credentials-then-finish.php >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > This test causes an HTTP authentication challenge in the middle of a redirect chain. > It then loads a new page after that challenge, and the new page should *not* get any credentials passed to it. > See bug 78003 for more details. >@@ -24,7 +24,7 @@ See bug 78003 for more details. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > No HTTP authentication credentials > >diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >index e71a76e3604b06ff1a3e80256e6e2d51de021b56..607e0d80e81d636d29a8240d3f839418989157ea 100644 >--- a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-resend-wrong-credentials-expected.txt >@@ -3,27 +3,27 @@ main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with wrongusername:wrongpassword >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with correctusername:correctpassword >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > This test makes sure that once WebCore preemptively sends out Basic credentials it thinks apply to a new resource, and that resource response with a 401 challenge, that it doesn't try to send the same wrong credentials a second time. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: wrongusername password: wrongpassword > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Authenticated as user: correctusername password: correctpassword >diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt >index 793053d1a92b6d13a472ba7f7a8d5405b8121bb5..754f507dcfbd8f5274d66c2d307e30ddbd16a2ec 100644 >--- a/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/loading/basic-credentials-sent-automatically-expected.txt >@@ -3,28 +3,28 @@ main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with first:first-pw >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with second:second-pw >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame3-->" - didStartProvisionalLoadForFrame >+frame "<!--frame3-->" - didCommitLoadForFrame >+frame "<!--frame3-->" - didFinishDocumentLoadForFrame >+frame "<!--frame3-->" - didHandleOnloadEventsForFrame >+frame "<!--frame3-->" - didFinishLoadForFrame >+frame "<!--frame4-->" - didStartProvisionalLoadForFrame >+frame "<!--frame4-->" - didCommitLoadForFrame >+frame "<!--frame4-->" - didFinishDocumentLoadForFrame >+frame "<!--frame4-->" - didHandleOnloadEventsForFrame >+frame "<!--frame4-->" - didFinishLoadForFrame > This test makes sure that once an HTTP Basic Auth. protected path is authenticated once, urls that emanate from that path automatically have their credentials sent without a challenge. > The first frame's path is /loading/resources/subresources/protected-resource.php, and we should get a challenge for it. > It will be authorized with first/first-pw. >@@ -37,21 +37,21 @@ It will be authorized with second/second-pw. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Authenticated as user: first password: first-pw > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Authenticated as user: second password: second-pw > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Authenticated as user: second password: second-pw > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Authenticated as user: second password: second-pw >diff --git a/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt >index 7a3dd0d0957ba1a98632e5c336012cf579c1ebfa..02aadfe3d2212aac244d02b66a88651230afd756 100644 >--- a/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt >@@ -2,11 +2,11 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didReceiveTitle: Test for https://bugs.webkit.org/show_bug.cgi?id=29293 > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >index 5e68ee89f31d518f15110bf0ad804814afd45952..a1acf3bf1dfd240de5e06f528b5d4dff18a18743 100644 >--- a/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt >@@ -2,28 +2,28 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null) > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect-result.html, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect.php, http status code 301> >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame >+frame "<!--frame1-->" - didReceiveServerRedirectForProvisionalLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200> >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame. > > >diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >index c822df26a4d4d15fb2a5606469a5aef924a3b56f..74f972bee5e1087579c66230cd63690e9b419ba5 100644 >--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin-expected.txt >@@ -7,21 +7,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username '' and password '' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username '' and password '' >diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >index efe52f7a889a5028822d1ae3af983f2189878176..992031014ef9bf7cd526162189a6e44fc53590bb 100644 >--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin-expected.txt >@@ -7,21 +7,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username 'testUser' and password 'testPassword' >diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >index c3be387e3aeac5095093917702db1ae67c0c0690..a80c80b1fbf5da14f4602ad46e7862426b27c720 100644 >--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-3/authentication-sent-to-redirect-same-origin-with-location-credentials-expected.txt >@@ -8,21 +8,21 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame1-->-->' >+Frame: '<!--frame2-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame2-->-->' >+Frame: '<!--frame3-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' > > -------- >-Frame: '<!--framePath //<!--frame3-->-->' >+Frame: '<!--frame4-->' > -------- > Resource loaded with HTTP authentication username 'redirectuser' and password 'redirectpassword' >diff --git a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >index 58bb992acfbbb971988c87a6e1d7b5f5e4da101c..b72f4b38f2eceeeb67b5f59cf230c48784025585 100644 >--- a/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/misc/authentication-redirect-4/authentication-sent-to-redirect-same-origin-url-expected.txt >@@ -6,6 +6,6 @@ If not running under DRT, enter any credentials when asked. > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > http://127.0.0.1:8000/misc/authentication-redirect-4/resources/auth-echo.php loaded with HTTP authentication username 'testUser' and password 'testPassword' >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >index 77a67b876427d9d68adce6edaf9fbc694262fb1f..524efc4e90e0762015ca22abbbee015b422f6664 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt >@@ -6,6 +6,6 @@ The frame below should load, and 'ALLOWALL' should be accepted as a valid header > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This text should show up. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >index e7f3947de96c80ecd5d07be25f36579a09116de7..678c4c940581436e1c00850febd6b1c9337e798b 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt >@@ -9,6 +9,6 @@ There should be no content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >index f2c06124bb3d2689b1b5fad80130fa8fd85d0b49..7721f2acf112fbffb84d03c4e9ee6fcaa7936664 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt >@@ -8,6 +8,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should be displayed. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >index 7a66ae1148ab2abd32c69ba3ee780a13d915fa5f..3ee2a2e1a248330586fb1fdf9932f91515bde0a4 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt >@@ -8,7 +8,7 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should be displayed. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >index 10ba5f0bc4dd1669f38ce7eb5288a2533f74b675..422e2f4b61370c1b240c6489d38d0562b08f0fea 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt >@@ -8,6 +8,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up as the parent is in the same origin. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >index 2a63779a6fe1aad490e0c65da01fcbe18c39eda9..613e361443b864b4e698c80982b275b60d4ffb79 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt >@@ -9,6 +9,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up even though the parent is not in the same origin because we should be ignoring the meta tag. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >index 949552e9f730dd003ba8e780a0f4ffd3d2390464..db78ccf9fe8377210fcd8686d0682c08e97b190b 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt >@@ -7,6 +7,6 @@ The frame below should load, and a console message should be generated that note > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This text should show up. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >index 07959b88bbf808c9cb721aa9fe7608795314c7ff..3cc854ba6c941cfe8bbd272d2a759cd6781e6490 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt >@@ -8,6 +8,6 @@ The frame below should not load, and a console message should be generated that > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >index 1547b4bf8ce7fad717052565c46af5a61817eb0e..45192f7cd0ab07ebdda303e9fe6935721b2e8e06 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt >@@ -6,6 +6,6 @@ The frame below should load, proving that 'sameorigin, sameorigin' === 'sameorig > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This page should load iff it's same origin with it's parent. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >index 7a750b384c327f333a9be3aef3ad776c3ad23f62..82c9b8c5939f5eedd16eefb352c36b76e68482a1 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt >@@ -9,6 +9,6 @@ The frame below should not load, proving that 'sameorigin, sameorigin' === 'same > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >index 4cba6bfa183fc6679ea97663316f49e5ef376f9b..2e907a8681fc4f655afe3e29360a98bebf743be3 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt >@@ -6,6 +6,6 @@ There should be content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > PASS: This should show up as the parent is in the same origin. >diff --git a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >index ea931615eb4cb184043719d458032c02ccdce55a..b4dff5394baf6bc1227d60746dcc8491f104949a 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt >@@ -9,6 +9,6 @@ There should be no content in the iframe below > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >index b07275959955db6118448255d25b95616675e10e..dd03e56324593550259636a231b85b2411e3b12e 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt >@@ -4,12 +4,12 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test opens a window and loads an insecure iframe using a data URL. We should *not* trigger a mixed content block because the data URL cannot be corrupted by an active network attacker. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >index 0061f8c9d2ab174d98448da858a44b69ae7fd51f..68dabf4f1bb70c1827f9eab16b0840f2f8c08c43 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt >@@ -1,19 +1,19 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure stylesheet. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > This background color should be white. > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >index caf660f6ef3dc87b0f970276463aa139b63dd5b7..8e5f651c05e7a54c4b7df52c22a8aff8e5d2fd0f 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt >@@ -1,26 +1,26 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [Report Only] Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/style.css because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: line 9: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php was not allowed to run insecure content from http://127.0.0.1:8000/security/mixedContent/resources/style.css. > >-frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: https://127.0.0.1:8443/security/contentSecurityPolicy/resources/echo-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - willPerformClientRedirectToURL: https://127.0.0.1:8443/security/contentSecurityPolicy/resources/echo-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCancelClientRedirectForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure stylesheet. We should trigger a mixed content block even though the child frame has a report only CSP block-all-mixed-content directive because an active network attacker can use CSS3 to breach the confidentiality of the HTTPS security origin. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > CSP report received: > CONTENT_TYPE: application/csp-report >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >index 59c422cf36b54b30a80ae9e775a4b5e7d270a63b..fb2aaa0ed2321c55b27ed5640dd82ac7091cedc0 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt >@@ -1,25 +1,25 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure iframe. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >index 04ec7123ef7ea935bf21f6024caf171f3a5b07fb..8f81eca8be17e2375fcc2d506e7d67ce61f43e1f 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt >@@ -4,10 +4,10 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/resources/fail.html because 'block-all-mixed-content' appears in the Content Security Policy. > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > This test opens a window and loads an insecure iframe. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >index 46ca150a60f124adf6068262439b84b95c8ecf6e..169ef270cd4196c560a4584988696d88968a9cf7 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >index fc71e34a520784e5cb70e9b64a43707ab079251c..c2e38b0782207e29559631d41070f46ad509e7ff 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt >@@ -1,20 +1,20 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: The Content Security Policy 'block-all-mixed-content' was delivered in report-only mode, but does not specify a 'report-uri'; the policy will have no effect. Please either add a 'report-uri' directive, or deliver the policy via the 'Content-Security-Policy' header. >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: [Report Only] Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame has an CSP directive block-all-mixed-content in an enforced policy. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >index 6aad4db2986409525d35dda57c3b1ad13065b3cb..8bbd0e5fbae87f5e3802a2c52276c7d0095c1051 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 1: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html was not allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >index 5faf94ba3a3b2007b94593dc09f4aaf239d0f093..147ccce9af984605926b46cbbb9450a2f5a3534f 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt >@@ -1,25 +1,25 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/resources/compass.jpg because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image inside a JavaScript URL iframe. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content and a JavaScript URL executes in the same origin as its embedding document. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >index 221c2aba5624b3710b8b08aef4d0c164e0ea2b22..cc923831185a24a3d428fafbf6506caae7d5ee07 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt >@@ -1,19 +1,19 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > CONSOLE MESSAGE: line 2: [blocked] The page at https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-in-xslt-document.xml was not allowed to display insecure content from http://127.0.0.1:8000/security/resources/compass.jpg. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image from an XSLT transformed document. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >index 88b2f7d420ea7f6d2094a8ee610d75d49c7c7ef2..67145673e045531d818805f8b9b5154eded0db25 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf because 'block-all-mixed-content' appears in the Content Security Policy. > This test loads a secure iframe that loads an insecure plugin. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. >@@ -12,7 +12,7 @@ This test loads a secure iframe that loads an insecure plugin. We should trigger > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-plugin.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >index 9195be2f2f0b86c0cb08645021e1327ea307da53..b9107d23fa2874de88d86edc9d01b8b43699a8b7 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/security/mixedContent/resources/script.js because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure external script. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-script.html > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >index bd9cf7bb986e46cf82a29a500f8b4c9395270f8a..c577ca6f3f07d4807465841a180110ba8566f410 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure external script. We should trigger a mixed content block because the child frame inherited the CSP directive block-all-mixed-content from the main frame. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >index 267d3ac2391966daa237e865d31ab52e7fccd708..c21b53c8e0ef2ebd3c4e58addc2365414a3f3501 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt >@@ -1,20 +1,20 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy. > CONSOLE MESSAGE: line 30: Not allowed to request resource > CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads insecure data via asynchronous XHR. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html?asynchronous > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >index 9feb76df6a0e34aa3f70bc3635a83fbebc806693..36122db1c9355efcb7f0e1f5250beac2d3462056 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy. >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads insecure data via synchronous XHR. We should trigger a mixed content block because the child frame has CSP directive block-all-mixed-content. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html > referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe.html >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >index f651f984f5397481e71f4069e6ee77fc52c065fa..c31aa8ea782c0d1bfbcb5108cafbc98f8da7d6d2 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt >@@ -1,17 +1,17 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should *not* trigger a mixed content block even though the child frame has CSP directive block-all-mixed-content because the insecure image is upgraded to a secure image as the child frame has CSP directive upgrade-insecure-requests. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > PASS did load image. >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >index 8f57e514e450f9efaadf7f90c515fa9ab267d471..71953fcc29251475244f2b551ecbaeb862e428b5 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt >@@ -1,17 +1,17 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image via a redirect. We should *not* trigger a mixed content block even though the child frame has CSP directive block-all-mixed-content because the redirected insecure image is upgraded to a secure image as the child frame has CSP directive upgrade-insecure-requests. > > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > PASS did load image. >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >index d966a52bc41df7b6d0e44a0249590bc1ea85fba0..26a8a381056a6f741cad2719e686e5112b829f93 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt >@@ -1,18 +1,18 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > ALERT: PASS >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame > ALERT: PASS > ALERT: PASS >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe with the 'upgrade-insecure-requests' header. The secure frame has an insecure script reference, which will get upgraded. The secure frame does a secure load of another frame. This other frame specifies an insecure load of this same script. If the nested subresource logic is working properly, the non-secure load in the second nested frame should be upgraded, even though that frame does not use the 'upgrade-insecure-requests' header, because it had been previously upgraded by an enclosing context. The frame two-layers deep also loads a second script using HTTP. This should also be upgraded to HTTPS, since the nested frame inherits the 'upgrade-insecure-request' from its parent. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >index a1b1f748911b76a5ddd2a7c063d652c3405336dd..fb75e60f64c661a7ec7e6854263ae86fb262fe72 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure style sheet. We should upgrade the CSS request to HTTPS, and thereby avoid triggering a mixed content callback. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >index dbb835df4f06e4b6c9419089dbe78259679fad13..d98d50e104cc0bfc220554649a271ae74495fa56 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should upgrade the script request, and thereby avoid triggering a mixed content callback. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >index ee1860b1d58b607f0a87c4ad1000812129daec8a..cc4550cec9658c5c01b13efbb4da9115903300b2 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should upgrade the relevant requests. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt b/LayoutTests/platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt >index 783bac573f87951320e7112c0948c3c9953a22fb..38d5676cbb3f7aac787e76f38d477e967f446b56 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt >@@ -1,11 +1,11 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >index 963f70a59f46027a23c7db3f2711bdc4e5865b11..33a7c46ed0e186ecb08a8210e7c10af93920f27c 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt >@@ -3,16 +3,16 @@ main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >index a827c1dfe884e66c7206d5e72a5e489c9c52ce4a..da83521b38e3da308a6dc7e37c28162ff48b4d5f 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt >@@ -4,11 +4,11 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test opens a window iframe that loads a data URL iframe. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by active network attackers. >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >index d42f087d43f017172b2bbf430df146f9f1adbb2a..7cb795659db84e7c7b59660520f36cd13b75aab4 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads a data URL script. We should *not* trigger a mixed content callback because the data URL cannot be corrupted by an active network attacker. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >index caaae79d1cdd56bc1486bf0d279f2d9a677aabed..993e96a0ba4d3189b0e16d312ea0ee7c232a163e 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads a plugin without a URL. We should *not* get a mixed content callback because the plug-in cannot be controlled by an active network attacker. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >index 891b4e2025cb9ccc8992fd0eaf8c3169df0f4ce2..af2b86829831809ab3d4dca5d9db70b7a40d7c9b 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt >@@ -1,12 +1,12 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 4: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/style.css. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure style sheet. We should trigger a mixed content callback because an active network attacker can use CSS3 to breach the confidentiality of the HTTPS security origin. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >index 0a2e6e5c03ee06cfc97e75194b494f004a809819..1a87bf5c6a67ecc6e3b37f9b995dea2917d16eb0 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that has a form with an insecure action. We should *not* get a mixed content callback because the main frame is HTTP and the form doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >index aebf78e32a04e8bb9434088bf9e595c78a7e29e4..12c1161e4222fe5ea331ce0eb79eb22e99d18740 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt >@@ -1,15 +1,15 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didStartProvisionalLoadForFrame >+frame "<!--frame2-->" - didCommitLoadForFrame >+frame "<!--frame2-->" - didFinishDocumentLoadForFrame >+frame "<!--frame2-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->/<!--frame0-->-->" - didFinishLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame2-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure iframe. We should *not* get a mixed content callback becase the main frame is HTTP and the grandchild iframe doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >index fd63c94c77985267f059bbe5e5e53a902b5e095f..b6d303c4e8eda1b4bbd1d2dd4c6c8c8d9788aedb 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt >@@ -4,10 +4,10 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html. > > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > This test opens a window that loads an insecure iframe. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content. >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >index 27f9bfe8c718148ec36e72a84805b3d82a5ff965..afe06999642417b481f8accb52969eca7c6a22d3 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt >@@ -1,10 +1,10 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure image. We should *not* get a mixed content callback becase the main frame is HTTP and the image doesn't contaminate the child iframe's security origin with mixed content. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >index 903366342c61411b3257acb932aac137b3577e92..0a409260aabb7e5008258de8484799b177f3f849 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt >@@ -4,10 +4,10 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/boring.html. > > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker. >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >index 26f323a5891396008637ea714b8c9718f89271b4..8de0eefc7c2e39662347d2804a9fa65994661e15 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt >@@ -1,12 +1,12 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-script.html was not allowed to run insecure content from http://127.0.0.1:8080/resources/redirect.php?url=https://127.0.0.1:8443/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker could have redirected the script load to https://attacker.com. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >index 2b1f8a077bffb4bff82bd8c1fa1f893f3c2d40e9..85991dd2d55f2dd4cba10cd43bb1eba817579313 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt >@@ -4,10 +4,10 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > CONSOLE MESSAGE: [blocked] The page at about:blank was not allowed to display insecure content from http://127.0.0.1:8080/security/mixedContent/resources/boring.html. > > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > This test opens a window that loads an insecure iframe (via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying content that can be controlled by an active network attacker. >diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >index ffad8bbf450ff6696dce0994f23c7051484c30c1..c3f379813521bf38efcf46d72634c1b378ba0c8d 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt >@@ -1,12 +1,12 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-script.html was not allowed to run insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js. > >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This test loads a secure iframe that loads an insecure script (but with a tricky redirect). We should trigger a mixed content callback because an active network attacker can end up controling the script. > >diff --git a/LayoutTests/platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt b/LayoutTests/platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >index fe88d6b1715752016f6f658d91d9f3ae7ff87f5d..05d9c01a621482d31f17adf5d7df490398e9ffec 100644 >--- a/LayoutTests/platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >+++ b/LayoutTests/platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt >@@ -1,11 +1,11 @@ > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-intertag.pl?test=/security/xssAuditor/script-tag-with-callbacks.html&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E' because its source code was found within the request. The auditor was enabled because the server did not send an 'X-XSS-Protection' header. > didDetectXSS >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/webarchive/loading/javascript-url-iframe-crash-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/javascript-url-iframe-crash-expected.txt >index aafec5d39574aece29928eb2a987478a2216f30f..da1c7a5574f051200ab55c6c064867f4e88b408c 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/javascript-url-iframe-crash-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/javascript-url-iframe-crash-expected.txt >@@ -6,8 +6,13 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >index a135fd7e1ca3d2fe8418878f3120fcc39536afd9..170b9a90ab111026ac3745d335e0995d3945a32c 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >@@ -2,10 +2,10 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/webarchive/loading/missing-data-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/missing-data-expected.txt >index a135fd7e1ca3d2fe8418878f3120fcc39536afd9..170b9a90ab111026ac3745d335e0995d3945a32c 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/missing-data-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/missing-data-expected.txt >@@ -2,10 +2,10 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/platform/wk2/webarchive/loading/object-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/object-expected.txt >index 36ccc70c669d60146c9f62de8215b218883217ef..d4faa2f33348a93ec22b69a9ceceafce98e01013 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/object-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/object-expected.txt >@@ -7,12 +7,12 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > Loading this webarchive with an object should not crash. > >diff --git a/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt >index 4df3278bf3bb93e1b391294745fb9115a9b4d172..f17f84b1b95376559a4583d3a1974068d80fbb81 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt >@@ -2,13 +2,13 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > test-loading-archive.html - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/helloworld.webarchive - willSendRequest <NSURLRequest URL resources/helloworld.webarchive, main document URL test-loading-archive.html, http method GET> redirectResponse (null) > resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This tests that doing a "normal load" of a webarchive (not using loadArchive) does not cause a cancelled error to be called. >diff --git a/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >index 5f3c93070b121ab97b47b0c971b81a5f8e721929..c2a845973b2a6d11e9637cca55c6d90ff06694b4 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >@@ -2,17 +2,17 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame > test-loading-archive-subresource-null-mimetype.html - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/subresource-null-mimetype.webarchive - willSendRequest <NSURLRequest URL resources/subresource-null-mimetype.webarchive, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null) > resources/subresource-null-mimetype.webarchive - didReceiveResponse <NSURLResponse resources/subresource-null-mimetype.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > test.png - willSendRequest <NSURLRequest URL test.png, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > resources/subresource-null-mimetype.webarchive - didFinishLoading > test.png - didReceiveResponse <NSURLResponse test.png, http status code 0> > test.png - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This tests that doing a normal load of a webarchive with a null mimetype for a subresource does not crash. >diff --git a/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt >index 8d5492169d9e94fcea9fe16f349a9dd94c68296e..d77f732d5c3e637b992ec98b364b30dfcc4bc9f3 100644 >--- a/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt >+++ b/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt >@@ -7,11 +7,8 @@ main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/plugins/resize-from-plugin-expected.txt b/LayoutTests/plugins/resize-from-plugin-expected.txt >index 9c415fc6a6bc381083b84baa97393806b8665d66..969858ae0f27763d91bb3425047ca82e64611454 100644 >--- a/LayoutTests/plugins/resize-from-plugin-expected.txt >+++ b/LayoutTests/plugins/resize-from-plugin-expected.txt >@@ -2,7 +2,7 @@ > Please follow this link for a manual test. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > Test for NPP_SetWindow calls sent while a plug-in resizes itself. >diff --git a/LayoutTests/quicklook/excel-expected.txt b/LayoutTests/quicklook/excel-expected.txt >index 94a0c16bbc68989900126d67304cf026156e1ad5..82e59e0835d4d0f3bdef89114fd531d518dec486 100644 >--- a/LayoutTests/quicklook/excel-expected.txt >+++ b/LayoutTests/quicklook/excel-expected.txt >@@ -55,7 +55,7 @@ margin:0; > } > </style><meta charset="utf-8"><meta name="viewport"></head><body style="font-family:Arial; font-size:10;"><div><table style="border-collapse:collapse; table-layout:fixed; width:657; border-style:none; border-color:#d2d2df;"><colgroup><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"><col style="width:74;"></colgroup><tbody><tr><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td></tr><tr height="20;"><td class="s3"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="170;"><td class="s3"> </td><td class="s5"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:73; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="338;"><td class="s3"> </td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="158;"><td class="s3"> </td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:73; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/excel-legacy-expected.txt b/LayoutTests/quicklook/excel-legacy-expected.txt >index dfabbffd3a02afe307d621c152528d1b7f5524fb..7db101b42598ca0c5f65f0fef0cfac239166341b 100644 >--- a/LayoutTests/quicklook/excel-legacy-expected.txt >+++ b/LayoutTests/quicklook/excel-legacy-expected.txt >@@ -55,7 +55,7 @@ margin:0; > } > </style><meta charset="utf-8"><meta name="viewport"></head><body style="font-family:Arial; font-size:10;"><div><table style="border-collapse:collapse; table-layout:fixed; width:648; border-style:none; border-color:#d2d2df;"><colgroup><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"></colgroup><tbody><tr><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td></tr><tr height="20;"><td class="s3"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="170;"><td class="s3"> </td><td class="s5"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:71; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="338;"><td class="s3"> </td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="158;"><td class="s3"> </td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:71; overflow:hidden;"><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande; color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande; color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/excel-macro-enabled-expected.txt b/LayoutTests/quicklook/excel-macro-enabled-expected.txt >index f4fd77c3d930a38e000e204c69e04902271d6399..52dde5855601fca9f1dc53b65a545f07ba282e1e 100644 >--- a/LayoutTests/quicklook/excel-macro-enabled-expected.txt >+++ b/LayoutTests/quicklook/excel-macro-enabled-expected.txt >@@ -55,7 +55,7 @@ margin:0; > } > </style><meta charset="utf-8"><meta name="viewport"></head><body style="font-family:Arial; font-size:10;"><div><table style="border-collapse:collapse; table-layout:fixed; width:648; border-style:none; border-color:#d2d2df;"><colgroup><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"><col style="width:73;"></colgroup><tbody><tr height="16;"><td colspan="9" class="s0">Table 1</td></tr><tr height="20;"><td class="s1"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td><td class="s2"> </td></tr><tr height="20;"><td class="s3"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="170;"><td class="s3"> </td><td class="s5"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s5"><div style="width:72; overflow:hidden;">Welcome to the website for the WebKit Open Source Project!</div></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="338;"><td class="s3"> </td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"><a href="http://www.apple.com/safari/"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">Safari</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">, Dashboard, Mail, and many other OS X applications.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr><tr height="158;"><td class="s3"> </td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"><a href="http://konqueror.kde.org/features/browser.php"><div style="width:72; overflow:hidden;"><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">WebKit's HTML and JavaScript code began as a branch of the </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KHTML</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;"> and KJS libraries from </span><span style="font-family:Lucida Grande;color:#228711;font-size:12px;">KDE</span><span style="font-family:Lucida Grande;color:#323232;font-size:12px;">.</span></div></a></td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td><td class="s4"> </td></tr></tbody></table></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/keynote-09-expected.txt b/LayoutTests/quicklook/keynote-09-expected.txt >index 6b82377e9956671b9fa90e25ba1f7734a726ca58..c956d32d82c4d1922a76fa04c38fafde8d95b937 100644 >--- a/LayoutTests/quicklook/keynote-09-expected.txt >+++ b/LayoutTests/quicklook/keynote-09-expected.txt >@@ -51,7 +51,7 @@ ShapeId_0(); > <div class="i7 "><img class="i8 g1 " src="x-apple-ql-id://resource.tif"></div></div> > <div id="slideId_last"></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/multi-sheet-numbers-09-expected.txt b/LayoutTests/quicklook/multi-sheet-numbers-09-expected.txt >index 725efae276c2e3773d7a2d0c44cff5f05e0c7f63..962bd5293164bfce8b2cf044ab2b8e30ea88a724 100644 >--- a/LayoutTests/quicklook/multi-sheet-numbers-09-expected.txt >+++ b/LayoutTests/quicklook/multi-sheet-numbers-09-expected.txt >@@ -1,7 +1,7 @@ > > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > >diff --git a/LayoutTests/quicklook/numbers-09-expected.txt b/LayoutTests/quicklook/numbers-09-expected.txt >index 9d03828df5168fd510a696071a890d8a3723a1ae..1308df773a4f9cf47312d1aa615538848362368b 100644 >--- a/LayoutTests/quicklook/numbers-09-expected.txt >+++ b/LayoutTests/quicklook/numbers-09-expected.txt >@@ -36,7 +36,7 @@ iframe { > <frameset rows="30, *" border="none"><frame src="x-apple-ql-id://resource.html" name="navPane"> > <frame src="x-apple-ql-id://resource.html" name="sheetPane"></frameset></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/pages-09-expected.txt b/LayoutTests/quicklook/pages-09-expected.txt >index 1fa8331863de411dca50730591b515f4c3e71af6..3fd658279cfd1b567d7a9259c6b63723eac1acce 100644 >--- a/LayoutTests/quicklook/pages-09-expected.txt >+++ b/LayoutTests/quicklook/pages-09-expected.txt >@@ -42,7 +42,7 @@ iframe { > <p class="p2 it3"><span class="i8 ">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><a href="http://www.apple.com/safari/" title="http://www.apple.com/safari/"><span class="it4">Safari</span></a><span class="i8 ">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span><a href="http://konqueror.kde.org/features/browser.php" title="http://konqueror.kde.org/features/browser.php"><span class="it4">KHTML</span></a><span class="i8 "> and KJS libraries from </span><a href="http://kde.org/" title="http://kde.org/"><span class="it4">KDE</span></a><span class="i8 ">.</span></p></div></div></div> > <div class="dzo i9 "></div></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/powerpoint-expected.txt b/LayoutTests/quicklook/powerpoint-expected.txt >index 2deca74e9f32a8d1eddace3ac869ce59a489cff8..58879329728a37c29c4a3e6d42f116b1414f27eb 100644 >--- a/LayoutTests/quicklook/powerpoint-expected.txt >+++ b/LayoutTests/quicklook/powerpoint-expected.txt >@@ -70,7 +70,7 @@ border-width: thin; > .s3 {margin-top:4px; margin-left:4px; margin-bottom:4px; margin-right:4px; display:table; width:1022; height:56;} > </style><div class="slide" style="position:absolute; overflow:hidden; top:0; left:0; width:1024; height:768;"><div class="s1"></div><div style="position:absolute; top:355; left:0; width:1022; height:56;"><div class="s3"><div class="s2"><p style="font-family:'Lucida Grande'; font-size:16;"><span style="color:#003400; font-weight:bold; font-size:16; font-family:'Lucida Grande';">Welcome to the website for the WebKit Open Source Project!</span></p><p style="font-family:'(null)'; font-size:18;"><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><a href="http://www.apple.com/safari/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">Safari</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span><a href="http://konqueror.kde.org/features/browser.php" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KHTML</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';"> and KJS libraries from </span><a href="http://kde.org/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KDE</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">.</span></p></div></div></div><img src="x-apple-ql-id://resource.tiff" style="position:absolute; top:116; left:404; width:215; height:174;"></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/powerpoint-legacy-expected.txt b/LayoutTests/quicklook/powerpoint-legacy-expected.txt >index a13f2fd49d2681b8473e971c278471c6e54adfd6..ff2586132b260bd70e0a6b25d1f426186cebe41e 100644 >--- a/LayoutTests/quicklook/powerpoint-legacy-expected.txt >+++ b/LayoutTests/quicklook/powerpoint-legacy-expected.txt >@@ -70,7 +70,7 @@ border-width: thin; > .s3 {margin-top:4px; margin-left:4px; margin-bottom:4px; margin-right:4px; display:table; width:1022; height:56;} > </style><div class="slide" style="position:absolute; overflow:hidden; top:0; left:0; width:1024; height:768;"><div class="s1"></div><div style="position:absolute; top:355; left:0; width:1022; height:56;"><div class="s3"><div class="s2"><p style="padding-bottom:0px; font-family:'Lucida Grande'; font-size:16;"><span style="color:#003400; font-weight:bold; font-size:16; font-family:'Lucida Grande';">Welcome to the website for the WebKit Open Source Project!</span></p><p style="padding-top:0px; padding-bottom:0px; font-family:'Helvetica Light'; font-size:18;"><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span><a href="http://www.apple.com/safari/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">Safari</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span><a href="http://konqueror.kde.org/features/browser.php" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KHTML</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';"> and KJS libraries from </span><a href="http://kde.org/" style="color:#228811; font-size:12; font-family:'Lucida Grande';">KDE</a><span style="color:#323333; font-size:12; font-family:'Lucida Grande';">.</span></p></div></div></div><img src="x-apple-ql-id://resource.png" style="position:absolute; top:116; left:404; width:215; height:174;"></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/word-expected.txt b/LayoutTests/quicklook/word-expected.txt >index e9a374892c342fde7334fedceffce95614dc39e5..e6f98b057ebb487c3589bf29e0506394815fe87e 100644 >--- a/LayoutTests/quicklook/word-expected.txt >+++ b/LayoutTests/quicklook/word-expected.txt >@@ -85,7 +85,7 @@ font-size:2.0em; > .s7 {font-weight:normal; font-family:'Lucida Grande'; color:#228711; font-size:12;} > </style><p class="s5"><span class="s6"><span class="bumpedFont15">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span></span><a href="http://www.apple.com/safari/"><span class="s7"><span class="bumpedFont15">Safari</span></span></a><span class="s6"><span class="bumpedFont15">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span></span><a href="http://konqueror.kde.org/features/browser.php"><span class="s7"><span class="bumpedFont15">KHTML</span></span></a><span class="s6"><span class="bumpedFont15"> and KJS libraries from </span></span><a href="http://kde.org/"><span class="s7"><span class="bumpedFont15">KDE</span></span></a><span class="s6"><span class="bumpedFont15">.</span></span></p></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/quicklook/word-legacy-expected.txt b/LayoutTests/quicklook/word-legacy-expected.txt >index ff407da1dc22ab25e9f23356e00479687371e64e..8adcc26a68735002c44630c28b0fb4329ed2805b 100644 >--- a/LayoutTests/quicklook/word-legacy-expected.txt >+++ b/LayoutTests/quicklook/word-legacy-expected.txt >@@ -85,7 +85,7 @@ font-size:2.0em; > </style><p class="s3"><span class="s5"><span class="bumpedFont15">WebKit is an open source web browser engine. WebKit is also the name of the OS X system framework version of the engine that's used by </span></span><a href="http://www.apple.com/safari/"><span class="s6"><span class="bumpedFont15">Safari</span></span></a><span class="s5"><span class="bumpedFont15">, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the </span></span><a href="http://konqueror.kde.org/features/browser.php"><span class="s6"><span class="bumpedFont15">KHTML</span></span></a><span class="s5"><span class="bumpedFont15"> and KJS libraries from </span></span><a href="http://kde.org/"><span class="s6"><span class="bumpedFont15">KDE</span></span></a><span class="s5"><span class="bumpedFont15">.</span></span></p><style type="text/css">.s7 {direction:ltr;} > </style><p class="s7"><span>&nbsp;</span></p></div></body></html></string> > <key>WebResourceFrameName</key> >- <string><!--framePath //<!--frame0-->--></string> >+ <string><!--frame1--></string> > <key>WebResourceMIMEType</key> > <string>text/html</string> > <key>WebResourceTextEncodingName</key> >diff --git a/LayoutTests/userscripts/user-script-all-frames-expected.txt b/LayoutTests/userscripts/user-script-all-frames-expected.txt >index 091e199bc3e2ba6cc7ed87ba4f0f58255047dfba..e766b6563452192a1423b8c47a92968f0f206380 100644 >--- a/LayoutTests/userscripts/user-script-all-frames-expected.txt >+++ b/LayoutTests/userscripts/user-script-all-frames-expected.txt >@@ -1,11 +1,11 @@ > If any thingers appear on this page, the test has failed. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/userscripts/user-script-top-frame-only-expected.txt b/LayoutTests/userscripts/user-script-top-frame-only-expected.txt >index b96b900a349cd561b52b914f59fb76a724148b70..0f08b8feb9be2a92296e7b97f347789a51aa7b3b 100644 >--- a/LayoutTests/userscripts/user-script-top-frame-only-expected.txt >+++ b/LayoutTests/userscripts/user-script-top-frame-only-expected.txt >@@ -1,12 +1,12 @@ > Two thingers should appear on this page. Otherwise the test has failed. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > thinger > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > thinger >diff --git a/LayoutTests/userscripts/user-style-all-frames-expected.txt b/LayoutTests/userscripts/user-style-all-frames-expected.txt >index 091e199bc3e2ba6cc7ed87ba4f0f58255047dfba..e766b6563452192a1423b8c47a92968f0f206380 100644 >--- a/LayoutTests/userscripts/user-style-all-frames-expected.txt >+++ b/LayoutTests/userscripts/user-style-all-frames-expected.txt >@@ -1,11 +1,11 @@ > If any thingers appear on this page, the test has failed. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > >diff --git a/LayoutTests/userscripts/user-style-top-frame-only-expected.txt b/LayoutTests/userscripts/user-style-top-frame-only-expected.txt >index 58c7f5a12cbe904969413702e177ea6d5cddd0d6..ca86b85eb6e9b28edfee10831f8c72cf5f229c2d 100644 >--- a/LayoutTests/userscripts/user-style-top-frame-only-expected.txt >+++ b/LayoutTests/userscripts/user-style-top-frame-only-expected.txt >@@ -1,12 +1,12 @@ > 2 thingers should appear on this page. Otherwise the test has failed. > > -------- >-Frame: '<!--framePath //<!--frame0-->-->' >+Frame: '<!--frame1-->' > -------- > thinger > > > -------- >-Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->' >+Frame: '<!--frame2-->' > -------- > thinger >diff --git a/LayoutTests/webarchive/loading/javascript-url-iframe-crash-expected.txt b/LayoutTests/webarchive/loading/javascript-url-iframe-crash-expected.txt >index ed9697627e3588bfde0a1ed1fc0ecd59337d2717..da1c7a5574f051200ab55c6c064867f4e88b408c 100644 >--- a/LayoutTests/webarchive/loading/javascript-url-iframe-crash-expected.txt >+++ b/LayoutTests/webarchive/loading/javascript-url-iframe-crash-expected.txt >@@ -6,10 +6,13 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailProvisionalLoadWithError >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didFinishDocumentLoadForFrame > main frame - didHandleOnloadEventsForFrame > main frame - didFinishLoadForFrame >diff --git a/LayoutTests/webarchive/loading/mainresource-null-mimetype-crash-expected.txt b/LayoutTests/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >index b9e01c51f33cb3ad2038123b4cb63887f0238a03..1635c39fee0a5a1e41b65c387567836da311ff48 100644 >--- a/LayoutTests/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >+++ b/LayoutTests/webarchive/loading/mainresource-null-mimetype-crash-expected.txt >@@ -1,11 +1,11 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/webarchive/loading/missing-data-expected.txt b/LayoutTests/webarchive/loading/missing-data-expected.txt >index b9e01c51f33cb3ad2038123b4cb63887f0238a03..1635c39fee0a5a1e41b65c387567836da311ff48 100644 >--- a/LayoutTests/webarchive/loading/missing-data-expected.txt >+++ b/LayoutTests/webarchive/loading/missing-data-expected.txt >@@ -1,11 +1,11 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > >diff --git a/LayoutTests/webarchive/loading/object-expected.txt b/LayoutTests/webarchive/loading/object-expected.txt >index 252a7a7f2e9a415aba11a6c55065607d46769bb7..ab85c0149fd5cf74cff9ca78b5d2dc816e2c061f 100644 >--- a/LayoutTests/webarchive/loading/object-expected.txt >+++ b/LayoutTests/webarchive/loading/object-expected.txt >@@ -6,13 +6,13 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > Loading this webarchive with an object should not crash. > >diff --git a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt >index f351c2e1a740b5cb02a570f5315f07d6853b7ffa..3971a63c2297ed5bcf6bac3a85abcab6151e0d10 100644 >--- a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt >+++ b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt >@@ -1,14 +1,14 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/helloworld.webarchive - willSendRequest <NSURLRequest URL resources/helloworld.webarchive, main document URL test-loading-archive.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > test-loading-archive.html - didFinishLoading > resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This tests that doing a "normal load" of a webarchive (not using loadArchive) does not cause a cancelled error to be called. >diff --git a/LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt b/LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >index db3874a9308a694c1351d00eb8cf22175c8a193b..0385e39138414f07c993ee9e6540da331537fc7b 100644 >--- a/LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >+++ b/LayoutTests/webarchive/loading/test-loading-archive-subresource-null-mimetype-expected.txt >@@ -1,18 +1,18 @@ > main frame - didStartProvisionalLoadForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > resources/subresource-null-mimetype.webarchive - willSendRequest <NSURLRequest URL resources/subresource-null-mimetype.webarchive, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null) > main frame - didFinishDocumentLoadForFrame > test-loading-archive-subresource-null-mimetype.html - didFinishLoading > resources/subresource-null-mimetype.webarchive - didReceiveResponse <NSURLResponse resources/subresource-null-mimetype.webarchive, http status code 0> >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >+frame "<!--frame1-->" - didCommitLoadForFrame > test.png - willSendRequest <NSURLRequest URL test.png, main document URL test-loading-archive-subresource-null-mimetype.html, http method GET> redirectResponse (null) >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >+frame "<!--frame1-->" - didFinishDocumentLoadForFrame > resources/subresource-null-mimetype.webarchive - didFinishLoading > test.png - didReceiveResponse <NSURLResponse test.png, http status code 0> > test.png - didFinishLoading >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame >+frame "<!--frame1-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame >+frame "<!--frame1-->" - didFinishLoadForFrame > main frame - didFinishLoadForFrame > This tests that doing a normal load of a webarchive with a null mimetype for a subresource does not crash. >diff --git a/LayoutTests/webarchive/loading/video-in-webarchive-expected.txt b/LayoutTests/webarchive/loading/video-in-webarchive-expected.txt >index ed764f4f50051e0b78b2b4a69f16adf1a0fb3996..46cefd12af1d6a00ec068d5f555186a35ca348e7 100644 >--- a/LayoutTests/webarchive/loading/video-in-webarchive-expected.txt >+++ b/LayoutTests/webarchive/loading/video-in-webarchive-expected.txt >@@ -6,12 +6,9 @@ main frame - didFinishLoadForFrame > main frame - didStartProvisionalLoadForFrame > main frame - didCancelClientRedirectForFrame > main frame - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame >+frame "<!--frame1-->" - didStartProvisionalLoadForFrame > main frame - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame >-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame > main frame - didHandleOnloadEventsForFrame >-frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError >+frame "<!--frame1-->" - didFailProvisionalLoadWithError > main frame - didFinishLoadForFrame >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185322
:
339621
|
339624
|
339628
|
339630
|
339736