Attachment 335881 Details for Bug 180568 – Patch

[patch] Patch

bug-180568-20180315140912.patch (text/plain), 189.73 KB, created by Chris Dumez on 2018-03-15 14:09:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-03-15 14:09:12 PDT

Size: 189.73 KB

patch

obsolete

>Subversion Revision: 229625
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f1a84d5590b03474d3e89b9d9bd48f2d0ce91b8e..6da1bd515d99eca142f5ed5b91de4bc77a6b204d 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-03-13  Chris Dumez  <cdumez@apple.com>
>+
>+        Make policy decisions asynchronous
>+        https://bugs.webkit.org/show_bug.cgi?id=180568
>+        <rdar://problem/37131297>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Get rid of synchronous IPC and synchronous code paths for policy delegates.
>+        Policy decisions are now all made asynchronously and rely on asynchronous
>+        IPC.
>+
>+        This code change is based on work by Alex Christensen.
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::receivedPolicyDecision):
>+        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
>+        (WebKit::WebPageProxy::decidePolicyForResponse):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
>+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
>+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
>+
> 2018-03-15  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [TexMap] Remove TextureMapperLayer::texture()
>diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
>index c850fc3b851115065f7221ca250cedd39170367b..327c581f50b0fe8617227617172737a690282779 100644
>--- a/Source/WebCore/loader/DocumentLoader.cpp
>+++ b/Source/WebCore/loader/DocumentLoader.cpp
>@@ -461,7 +461,7 @@ void DocumentLoader::handleSubstituteDataLoadNow()
>     if (response.url().isEmpty())
>         response = ResourceResponse(m_request.url(), m_substituteData.mimeType(), m_substituteData.content()->size(), m_substituteData.textEncoding());
> 
>-    responseReceived(response);
>+    responseReceived(response, nullptr);
> }
> 
> void DocumentLoader::startDataLoadTimer()
>@@ -716,14 +716,16 @@ void DocumentLoader::stopLoadingAfterXFrameOptionsOrContentSecurityPolicyDenied(
>         cancelMainResourceLoad(frameLoader->cancelledError(m_request));
> }
> 
>-void DocumentLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
>+void DocumentLoader::responseReceived(CachedResource& resource, const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>     ASSERT_UNUSED(resource, m_mainResource == &resource);
>-    responseReceived(response);
>+    responseReceived(response, WTFMove(completionHandler));
> }
> 
>-void DocumentLoader::responseReceived(const ResourceResponse& response)
>+void DocumentLoader::responseReceived(const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>+    CompletionHandlerCallingScope completionHandlerCaller(WTFMove(completionHandler));
>+
> #if ENABLE(CONTENT_FILTERING)
>     if (m_contentFilter && !m_contentFilter->continueAfterResponseReceived(response))
>         return;
>@@ -809,10 +811,12 @@ void DocumentLoader::responseReceived(const ResourceResponse& response)
>     RefPtr<SubresourceLoader> mainResourceLoader = this->mainResourceLoader();
>     if (mainResourceLoader)
>         mainResourceLoader->markInAsyncResponsePolicyCheck();
>-    frameLoader()->checkContentPolicy(m_response, [this, protectedThis = makeRef(*this), mainResourceLoader = WTFMove(mainResourceLoader)](PolicyAction policy) {
>+    frameLoader()->checkContentPolicy(m_response, [this, protectedThis = makeRef(*this), mainResourceLoader = WTFMove(mainResourceLoader), completionHandler = completionHandlerCaller.release()](PolicyAction policy) {
>         continueAfterContentPolicy(policy);
>         if (mainResourceLoader)
>             mainResourceLoader->didReceiveResponsePolicy();
>+        if (completionHandler)
>+            completionHandler();
>     });
> }
> 
>diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
>index 677aef9edc6322aab44560a75008a3ff01ee9326..70a1a3e9ec847bb3f23bc1f598008a4e54ae3955 100644
>--- a/Source/WebCore/loader/DocumentLoader.h
>+++ b/Source/WebCore/loader/DocumentLoader.h
>@@ -355,11 +355,11 @@ private:
>     void finishedLoading();
>     void mainReceivedError(const ResourceError&);
>     WEBCORE_EXPORT void redirectReceived(CachedResource&, ResourceRequest&&, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&&) override;
>-    WEBCORE_EXPORT void responseReceived(CachedResource&, const ResourceResponse&) override;
>+    WEBCORE_EXPORT void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) override;
>     WEBCORE_EXPORT void dataReceived(CachedResource&, const char* data, int length) override;
>     WEBCORE_EXPORT void notifyFinished(CachedResource&) override;
> 
>-    void responseReceived(const ResourceResponse&);
>+    void responseReceived(const ResourceResponse&, CompletionHandler<void()>&&);
>     void dataReceived(const char* data, int length);
> 
>     bool maybeLoadEmpty();
>diff --git a/Source/WebCore/loader/DocumentThreadableLoader.cpp b/Source/WebCore/loader/DocumentThreadableLoader.cpp
>index 4f4be1a11dcbcc66f086ebd31b61671700996b2e..e2197f97db44a16dbb5c76b45e8d300bfaf5b16c 100644
>--- a/Source/WebCore/loader/DocumentThreadableLoader.cpp
>+++ b/Source/WebCore/loader/DocumentThreadableLoader.cpp
>@@ -308,10 +308,13 @@ void DocumentThreadableLoader::dataSent(CachedResource& resource, unsigned long
>     m_client->didSendData(bytesSent, totalBytesToBeSent);
> }
> 
>-void DocumentThreadableLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
>+void DocumentThreadableLoader::responseReceived(CachedResource& resource, const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>     ASSERT_UNUSED(resource, &resource == m_resource);
>     didReceiveResponse(m_resource->identifier(), response);
>+
>+    if (completionHandler)
>+        completionHandler();
> }
> 
> void DocumentThreadableLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
>diff --git a/Source/WebCore/loader/DocumentThreadableLoader.h b/Source/WebCore/loader/DocumentThreadableLoader.h
>index 21c8ab60a5f0b1b1893e5aa9faf2d677b8111ac3..c2bbc4d3369734ebd075d23e5af25ee63d1bb30e 100644
>--- a/Source/WebCore/loader/DocumentThreadableLoader.h
>+++ b/Source/WebCore/loader/DocumentThreadableLoader.h
>@@ -81,7 +81,7 @@ namespace WebCore {
> 
>         // CachedRawResourceClient
>         void dataSent(CachedResource&, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
>-        void responseReceived(CachedResource&, const ResourceResponse&) override;
>+        void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) override;
>         void dataReceived(CachedResource&, const char* data, int dataLength) override;
>         void redirectReceived(CachedResource&, ResourceRequest&&, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&&) override;
>         void finishedTimingForWorkerLoad(CachedResource&, const ResourceTiming&) override;
>diff --git a/Source/WebCore/loader/MediaResourceLoader.cpp b/Source/WebCore/loader/MediaResourceLoader.cpp
>index 3812b82baf616206559f13528be1de9aa62de6e2..1482643ff022e14fe45d3744d08eaf44b4b780e1 100644
>--- a/Source/WebCore/loader/MediaResourceLoader.cpp
>+++ b/Source/WebCore/loader/MediaResourceLoader.cpp
>@@ -139,9 +139,10 @@ void MediaResource::setDefersLoading(bool defersLoading)
>         m_resource->setDefersLoading(defersLoading);
> }
> 
>-void MediaResource::responseReceived(CachedResource& resource, const ResourceResponse& response)
>+void MediaResource::responseReceived(CachedResource& resource, const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>     ASSERT_UNUSED(resource, &resource == m_resource);
>+    CompletionHandlerCallingScope completionHandlerCaller(WTFMove(completionHandler));
> 
>     if (!m_loader->document())
>         return;
>diff --git a/Source/WebCore/loader/MediaResourceLoader.h b/Source/WebCore/loader/MediaResourceLoader.h
>index a31df1837f33459f18092bc69b0f20b02a308cf1..349277e0d9d204029935d79ce44c1365683f94e4 100644
>--- a/Source/WebCore/loader/MediaResourceLoader.h
>+++ b/Source/WebCore/loader/MediaResourceLoader.h
>@@ -82,7 +82,7 @@ public:
>     bool didPassAccessControlCheck() const override { return m_didPassAccessControlCheck; }
> 
>     // CachedRawResourceClient
>-    void responseReceived(CachedResource&, const ResourceResponse&) override;
>+    void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) override;
>     void redirectReceived(CachedResource&, ResourceRequest&&, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&&) override;
>     bool shouldCacheResponse(CachedResource&, const ResourceResponse&) override;
>     void dataSent(CachedResource&, unsigned long long, unsigned long long) override;
>diff --git a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.cpp b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.cpp
>index 8dff94d378e9d0692b85de5db9deed7bce7586b9..864cd0ec0bdbcff8890536c9c4417f93ddce118c 100644
>--- a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.cpp
>+++ b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.cpp
>@@ -75,9 +75,10 @@ void ApplicationCacheResourceLoader::cancel(Error error)
>     }
> }
> 
>-void ApplicationCacheResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
>+void ApplicationCacheResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>     ASSERT_UNUSED(resource, &resource == m_resource);
>+    CompletionHandlerCallingScope completionHandlerCaller(WTFMove(completionHandler));
> 
>     if (response.httpStatusCode() == 404 || response.httpStatusCode() == 410) {
>         cancel(Error::NotFound);
>diff --git a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>index 430a73eb2d6568b21f64cdd8509d24835629ba4f..72b29755f11d94095fa7edd530968f7c57b57beb 100644
>--- a/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>+++ b/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h
>@@ -54,7 +54,7 @@ private:
>     explicit ApplicationCacheResourceLoader(unsigned, CachedResourceHandle<CachedRawResource>&&, CompletionHandler<void(ResourceOrError&&)>&&);
> 
>     // CachedRawResourceClient
>-    void responseReceived(CachedResource&, const ResourceResponse&) final;
>+    void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) final;
>     void dataReceived(CachedResource&, const char* data, int dataLength) final;
>     void redirectReceived(CachedResource&, ResourceRequest&&, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&&) final;
>     void notifyFinished(CachedResource&) final;
>diff --git a/Source/WebCore/loader/cache/CachedRawResource.cpp b/Source/WebCore/loader/cache/CachedRawResource.cpp
>index e7dbfcd11c92fdb7d330bf12053ddb321cb54af5..e98cbe3bf80e81866815f94a9fe0b1b0c3be8406 100644
>--- a/Source/WebCore/loader/cache/CachedRawResource.cpp
>+++ b/Source/WebCore/loader/cache/CachedRawResource.cpp
>@@ -158,6 +158,16 @@ void CachedRawResource::didAddClient(CachedResourceClient& c)
>     iterateRedirects(CachedResourceHandle<CachedRawResource>(this), client, WTFMove(redirectsInReverseOrder), [this, protectedThis = CachedResourceHandle<CachedRawResource>(this), client = &client] (ResourceRequest&&) mutable {
>         if (!hasClient(*client))
>             return;
>+        auto responseProcessedHandler = [this, protectedThis = CachedResourceHandle<CachedRawResource>(this), client] {
>+            if (!hasClient(*client))
>+                return;
>+            if (m_data)
>+                client->dataReceived(*this, m_data->data(), m_data->size());
>+            if (!hasClient(*client))
>+                return;
>+            CachedResource::didAddClient(*client);
>+        };
>+
>         if (!m_response.isNull()) {
>             ResourceResponse response(m_response);
>             if (validationCompleting())
>@@ -166,15 +176,9 @@ void CachedRawResource::didAddClient(CachedResourceClient& c)
>                 ASSERT(!validationInProgress());
>                 response.setSource(ResourceResponse::Source::MemoryCache);
>             }
>-            client->responseReceived(*this, response);
>-        }
>-        if (!hasClient(*client))
>-            return;
>-        if (m_data)
>-            client->dataReceived(*this, m_data->data(), m_data->size());
>-        if (!hasClient(*client))
>-            return;
>-        CachedResource::didAddClient(*client);
>+            client->responseReceived(*this, response, WTFMove(responseProcessedHandler));
>+        } else
>+            responseProcessedHandler();
>     });
> }
> 
>@@ -215,7 +219,7 @@ void CachedRawResource::responseReceived(const ResourceResponse& response)
>     CachedResource::responseReceived(response);
>     CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
>     while (CachedRawResourceClient* c = w.next())
>-        c->responseReceived(*this, m_response);
>+        c->responseReceived(*this, m_response, nullptr);
> }
> 
> bool CachedRawResource::shouldCacheResponse(const ResourceResponse& response)
>diff --git a/Source/WebCore/loader/cache/CachedRawResourceClient.h b/Source/WebCore/loader/cache/CachedRawResourceClient.h
>index 758b7ad7da171a2affcf8780d426901e9fbe2f77..547c6898dbd3c67b8a8db78f0c12a1bd870131ac 100644
>--- a/Source/WebCore/loader/cache/CachedRawResourceClient.h
>+++ b/Source/WebCore/loader/cache/CachedRawResourceClient.h
>@@ -39,7 +39,12 @@ public:
>     CachedResourceClientType resourceClientType() const override { return expectedType(); }
> 
>     virtual void dataSent(CachedResource&, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
>-    virtual void responseReceived(CachedResource&, const ResourceResponse&) { }
>+    virtual void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&& completionHandler)
>+    {
>+        if (completionHandler)
>+            completionHandler();
>+    }
>+
>     virtual bool shouldCacheResponse(CachedResource&, const ResourceResponse&) { return true; }
>     virtual void dataReceived(CachedResource&, const char* /* data */, int /* length */) { }
>     virtual void redirectReceived(CachedResource&, ResourceRequest&& request, const ResourceResponse&, CompletionHandler<void(ResourceRequest&&)>&& completionHandler) { completionHandler(WTFMove(request)); }
>diff --git a/Source/WebCore/loader/cache/KeepaliveRequestTracker.cpp b/Source/WebCore/loader/cache/KeepaliveRequestTracker.cpp
>index 55beb7ec39e73df83f366926dcfb8843a8eedbbb..00c5505e7ec17505825f14a35870c03387f94019 100644
>--- a/Source/WebCore/loader/cache/KeepaliveRequestTracker.cpp
>+++ b/Source/WebCore/loader/cache/KeepaliveRequestTracker.cpp
>@@ -66,11 +66,14 @@ void KeepaliveRequestTracker::registerRequest(CachedResource& resource)
>     resource.addClient(*this);
> }
> 
>-void KeepaliveRequestTracker::responseReceived(CachedResource& resource, const ResourceResponse&)
>+void KeepaliveRequestTracker::responseReceived(CachedResource& resource, const ResourceResponse&, CompletionHandler<void()>&& completionHandler)
> {
>     // Per Fetch specification, allocated quota should be returned before the promise is resolved,
>     // which is when the response is received.
>     unregisterRequest(resource);
>+
>+    if (completionHandler)
>+        completionHandler();
> }
> 
> void KeepaliveRequestTracker::notifyFinished(CachedResource& resource)
>diff --git a/Source/WebCore/loader/cache/KeepaliveRequestTracker.h b/Source/WebCore/loader/cache/KeepaliveRequestTracker.h
>index 47da4ede7cc8959120bd7b2073ed9432216b1926..0c333db81bf995a8aa8ff1ffc005e3efbecfccca 100644
>--- a/Source/WebCore/loader/cache/KeepaliveRequestTracker.h
>+++ b/Source/WebCore/loader/cache/KeepaliveRequestTracker.h
>@@ -38,7 +38,7 @@ public:
>     bool tryRegisterRequest(CachedResource&);
> 
>     // CachedRawResourceClient.
>-    void responseReceived(CachedResource&, const ResourceResponse&) final;
>+    void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) final;
>     void notifyFinished(CachedResource&) final;
> 
> private:
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h b/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h
>index f5e374042942af59f209b9c15e6af89b7a6eab96..eccdbd31d929bac98d3dfce3f5a62d0aceed7b6c 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h
>@@ -56,7 +56,7 @@ public:
> 
> private:
>     // CachedResourceClient
>-    void responseReceived(CachedResource&, const ResourceResponse&) override;
>+    void responseReceived(CachedResource&, const ResourceResponse&, CompletionHandler<void()>&&) override;
>     void dataReceived(CachedResource&, const char*, int) override;
>     void notifyFinished(CachedResource&) override;
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm b/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm
>index 971c831a49db6e40f866dfc884c293d8825dba29..16b07e64c4da201ca97e151ec47f5eea1c0fe38c 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm
>@@ -108,9 +108,10 @@ void WebCoreAVFResourceLoader::invalidate()
>     });
> }
> 
>-void WebCoreAVFResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
>+void WebCoreAVFResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response, CompletionHandler<void()>&& completionHandler)
> {
>     ASSERT_UNUSED(resource, &resource == m_resource);
>+    CompletionHandlerCallingScope completionHandlerCaller(WTFMove(completionHandler));
> 
>     int status = response.httpStatusCode();
>     if (status && (status < 200 || status > 299)) {
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 51dd3cb7480f8cb662cebfdcfd432a95447e8cf1..6b67a25577d1b8e60beb1c554836560d2e6be27c 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -2332,8 +2332,7 @@ void WebPageProxy::receivedPolicyDecision(PolicyAction action, WebFrameProxy& fr
>     DownloadID downloadID = { };
>     if (action == PolicyAction::Download) {
>         // Create a download proxy.
>-        const ResourceRequest& downloadRequest = m_decidePolicyForResponseRequest ? *m_decidePolicyForResponseRequest : ResourceRequest();
>-        DownloadProxy* download = m_process->processPool().createDownloadProxy(downloadRequest, this);
>+        auto* download = m_process->processPool().createDownloadProxy(m_decidePolicyForResponseRequest, this);
>         if (navigation) {
>             download->setWasUserInitiated(navigation->wasUserInitiated());
>             download->setRedirectChain(navigation->takeRedirectChain());
>@@ -2341,27 +2340,9 @@ void WebPageProxy::receivedPolicyDecision(PolicyAction action, WebFrameProxy& fr
> 
>         downloadID = download->downloadID();
>         handleDownloadRequest(download);
>+        m_decidePolicyForResponseRequest = { };
>     }
> 
>-    // If we received a policy decision while in decidePolicyForResponse the decision will
>-    // be sent back to the web process by decidePolicyForResponse.
>-    if (m_inDecidePolicyForResponseSync) {
>-        m_syncMimeTypePolicyActionIsValid = true;
>-        m_syncMimeTypePolicyAction = action;
>-        m_syncMimeTypePolicyDownloadID = downloadID;
>-        return;
>-    }
>-
>-    // If we received a policy decision while in decidePolicyForNavigationAction the decision will 
>-    // be sent back to the web process by decidePolicyForNavigationAction. 
>-    if (m_inDecidePolicyForNavigationAction) {
>-        m_syncNavigationActionPolicyActionIsValid = true;
>-        m_syncNavigationActionPolicyAction = action;
>-        m_syncNavigationActionPolicyDownloadID = downloadID;
>-        m_syncNavigationActionPolicyWebsitePolicies = WTFMove(websitePolicies);
>-        return;
>-    }
>-    
>     m_process->send(Messages::WebPage::DidReceivePolicyDecision(frame.frameID(), listenerID, action, navigation ? navigation->navigationID() : 0, downloadID, websitePolicies), m_pageID);
> }
> 
>@@ -3755,7 +3736,7 @@ void WebPageProxy::frameDidBecomeFrameSet(uint64_t frameID, bool value)
>         m_frameSetLargestFrame = value ? m_mainFrame : 0;
> }
> 
>-void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction& policyAction, DownloadID& downloadID, std::optional<WebsitePoliciesData>& websitePolicies)
>+void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&& navigationActionData, const FrameInfoData& originatingFrameInfoData, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, ResourceRequest&& request, uint64_t listenerID, const UserData& userData)
> {
>     PageClientProtector protector(m_pageClient);
> 
>@@ -3770,6 +3751,7 @@ void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const Secur
>     MESSAGE_CHECK_URL(request.url());
>     MESSAGE_CHECK_URL(originalRequest.url());
>     
>+    uint64_t newNavigationID { 0 };
>     Ref<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
>     if (!navigationID) {
>         auto navigation = m_navigationState->createLoadRequestNavigation(ResourceRequest(request));
>@@ -3779,24 +3761,17 @@ void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const Secur
>         listener->setNavigation(WTFMove(navigation));
>     } else {
>         auto& navigation = m_navigationState->navigation(navigationID);
>+        newNavigationID = navigationID;
>         navigation.setWasUserInitiated(!!navigationActionData.userGestureTokenIdentifier);
>         navigation.setShouldForceDownload(!navigationActionData.downloadAttribute.isNull());
>         listener->setNavigation(navigation);
>     }
> 
> #if ENABLE(CONTENT_FILTERING)
>-    if (frame->didHandleContentFilterUnblockNavigation(request)) {
>-        receivedPolicyAction = true;
>-        policyAction = PolicyAction::Ignore;
>-        return;
>-    }
>+    if (frame->didHandleContentFilterUnblockNavigation(request))
>+        return receivedPolicyDecision(PolicyAction::Ignore, *frame, listenerID, &m_navigationState->navigation(newNavigationID), { });
> #endif
> 
>-    ASSERT(!m_inDecidePolicyForNavigationAction);
>-    
>-    m_inDecidePolicyForNavigationAction = true;
>-    m_syncNavigationActionPolicyActionIsValid = false;
>-
>     WebFrameProxy* originatingFrame = m_process->webFrame(originatingFrameInfoData.frameID);
> 
>     if (m_navigationClient) {
>@@ -3817,15 +3792,6 @@ void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const Secur
>         m_policyClient->decidePolicyForNavigationAction(*this, frame, WTFMove(navigationActionData), originatingFrame, originalRequest, WTFMove(request), WTFMove(listener), m_process->transformHandlesToObjects(userData.object()).get());
> 
>     m_shouldSuppressAppLinksInNextNavigationPolicyDecision = false;
>-    m_inDecidePolicyForNavigationAction = false;
>-
>-    // Check if we received a policy decision already. If we did, we can just pass it back.
>-    receivedPolicyAction = m_syncNavigationActionPolicyActionIsValid;
>-    if (m_syncNavigationActionPolicyActionIsValid) {
>-        policyAction = m_syncNavigationActionPolicyAction;
>-        downloadID = m_syncNavigationActionPolicyDownloadID;
>-        websitePolicies = WTFMove(m_syncNavigationActionPolicyWebsitePolicies);
>-    }
> }
> 
> void WebPageProxy::decidePolicyForNewWindowAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, NavigationActionData&& navigationActionData, ResourceRequest&& request, const String& frameName, uint64_t listenerID, const UserData& userData)
>@@ -3857,6 +3823,8 @@ void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const SecurityOrigi
> {
>     PageClientProtector protector(m_pageClient);
> 
>+    m_decidePolicyForResponseRequest = request;
>+
>     WebFrameProxy* frame = m_process->webFrame(frameID);
>     MESSAGE_CHECK(frame);
>     MESSAGE_CHECK_URL(request.url());
>@@ -3873,29 +3841,6 @@ void WebPageProxy::decidePolicyForResponse(uint64_t frameID, const SecurityOrigi
>         m_policyClient->decidePolicyForResponse(*this, *frame, response, request, canShowMIMEType, WTFMove(listener), m_process->transformHandlesToObjects(userData.object()).get());
> }
> 
>-void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, WebCore::PolicyAction& policyAction, DownloadID& downloadID)
>-{
>-    PageClientProtector protector(m_pageClient);
>-
>-    ASSERT(!m_inDecidePolicyForResponseSync);
>-
>-    m_inDecidePolicyForResponseSync = true;
>-    m_decidePolicyForResponseRequest = &request;
>-    m_syncMimeTypePolicyActionIsValid = false;
>-    
>-    decidePolicyForResponse(frameID, frameSecurityOrigin, navigationID, response, request, canShowMIMEType, listenerID, userData);
>-    
>-    m_inDecidePolicyForResponseSync = false;
>-    m_decidePolicyForResponseRequest = nullptr;
>-    
>-    // Check if we received a policy decision already. If we did, we can just pass it back.
>-    receivedPolicyAction = m_syncMimeTypePolicyActionIsValid;
>-    if (m_syncMimeTypePolicyActionIsValid) {
>-        policyAction = m_syncMimeTypePolicyAction;
>-        downloadID = m_syncMimeTypePolicyDownloadID;
>-    }
>-}
>-
> void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError& error, const UserData& userData)
> {
>     PageClientProtector protector(m_pageClient);
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index a4c66859fa95521762b28c572258da38b29a9276..9c64ebad44e63bad1fc9de1ebe4ddafe007048df 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1362,10 +1362,9 @@ private:
> 
>     void didDestroyNavigation(uint64_t navigationID);
> 
>-    void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, WebCore::PolicyAction&, DownloadID&, std::optional<WebsitePoliciesData>&);
>+    void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, NavigationActionData&&, const FrameInfoData&, uint64_t originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&&, uint64_t listenerID, const UserData&);
>     void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, NavigationActionData&&, WebCore::ResourceRequest&&, const String& frameName, uint64_t listenerID, const UserData&);
>     void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
>-    void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, WebCore::PolicyAction&, DownloadID&);
>     void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
> 
>     void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData&);
>@@ -1906,17 +1905,7 @@ private:
>     bool m_isInPrintingMode { false };
>     bool m_isPerformingDOMPrintOperation { false };
> 
>-    bool m_inDecidePolicyForResponseSync { false };
>-    const WebCore::ResourceRequest* m_decidePolicyForResponseRequest { nullptr };
>-    bool m_syncMimeTypePolicyActionIsValid { false };
>-    WebCore::PolicyAction m_syncMimeTypePolicyAction { WebCore::PolicyAction::Use };
>-    DownloadID m_syncMimeTypePolicyDownloadID { 0 };
>-    bool m_inDecidePolicyForNavigationAction { false };
>-    bool m_syncNavigationActionPolicyActionIsValid { false };
>-    WebCore::PolicyAction m_syncNavigationActionPolicyAction { WebCore::PolicyAction::Use };
>-    DownloadID m_syncNavigationActionPolicyDownloadID { 0 };
>-    std::optional<WebsitePoliciesData> m_syncNavigationActionPolicyWebsitePolicies;
>-
>+    WebCore::ResourceRequest m_decidePolicyForResponseRequest;
>     bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };
> 
>     Deque<NativeWebKeyboardEvent> m_keyEventQueue;
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>index 30f1e0aab7b4d8fdcbc0202f2745aaf806028fd0..605217d02ebbfb0a9549a598d0014a47f89a6f26 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
>+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>@@ -98,8 +98,8 @@ messages -> WebPageProxy {
> #endif
> 
>     # Policy messages
>-    DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID)
>-    DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, enum WebCore::PolicyAction policyAction, WebKit::DownloadID downloadID, std::optional<WebKit::WebsitePoliciesData> websitePolicies)
>+    DecidePolicyForResponse(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData)
>+    DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, struct WebKit::FrameInfoData originatingFrameInfoData, uint64_t originatingPageID, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData)
>     DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
>     UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
> 
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>index 239c4408bf2a8fa55ef4d46e985e93ea6add69fe..00576beb8d4771c30d59a602edf348dd636d1c40 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
>@@ -748,19 +748,9 @@ void WebFrameLoaderClient::dispatchDecidePolicyForResponse(const ResourceRespons
> 
>     Ref<WebFrame> protector(*m_frame);
>     uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::No);
>-    bool receivedPolicyAction;
>-    PolicyAction policyAction;
>-    DownloadID downloadID;
>-
>     auto navigationID = static_cast<WebDocumentLoader&>(*policyDocumentLoader).navigationID();
>-    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), Seconds::infinity(), IPC::SendSyncOption::InformPlatformProcessWillSuspend)) {
>+    if (!webPage->send(Messages::WebPageProxy::DecidePolicyForResponse(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), navigationID, response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
>         m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
>-        return;
>-    }
>-
>-    // We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
>-    if (receivedPolicyAction)
>-        m_frame->didReceivePolicyDecision(listenerID, policyAction, 0, downloadID, { });
> }
> 
> void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(const NavigationAction& navigationAction, const ResourceRequest& request, FormState* formState, const String& frameName, FramePolicyFunction&& function)
>@@ -843,10 +833,6 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const Navigat
>     }
>     
>     uint64_t listenerID = m_frame->setUpPolicyListener(WTFMove(function), WebFrame::ForNavigationAction::Yes);
>-    bool receivedPolicyAction;
>-    uint64_t newNavigationID;
>-    PolicyAction policyAction;
>-    DownloadID downloadID;
> 
>     ASSERT(navigationAction.sourceDocument());
>     const Document& sourceDocument = *navigationAction.sourceDocument();
>@@ -885,15 +871,8 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(const Navigat
> 
>     // Notify the UIProcess.
>     Ref<WebFrame> protect(*m_frame);
>-    std::optional<WebsitePoliciesData> websitePolicies;
>-    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingFrame && originatingFrame->page() ? originatingFrame->page()->pageID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID, websitePolicies))) {
>+    if (!webPage->send(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrameInfoData, originatingFrame && originatingFrame->page() ? originatingFrame->page()->pageID() : 0, navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get()))))
>         m_frame->didReceivePolicyDecision(listenerID, PolicyAction::Ignore, 0, { }, { });
>-        return;
>-    }
>-
>-    // We call this synchronously because WebCore cannot gracefully handle a frame load without a synchronous navigation policy reply.
>-    if (receivedPolicyAction)
>-        m_frame->didReceivePolicyDecision(listenerID, policyAction, newNavigationID, downloadID, WTFMove(websitePolicies));
> }
> 
> void WebFrameLoaderClient::cancelPolicyCheck()
>diff --git a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>index 496af41c0938cfefb7f9ae148cfa5bae24f2adee..80aa6deeb4ea3523d0eb860cbf05b28c920ea9bf 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>@@ -70,29 +70,45 @@ void WebURLSchemeTaskProxy::didPerformRedirection(WebCore::ResourceResponse&& re
>         return;
>     
>     auto completionHandler = [this, protectedThis = makeRef(*this), originalRequest = request] (ResourceRequest&& request) {
>-        m_waitingForRedirectCompletionHandler = false;
>+        m_waitingForCompletionHandler = false;
>         // We do not inform the UIProcess of WebKit's new request with the given suggested request.
>         // We do want to know if WebKit would have generated a request that differs from the suggested request, though.
>         if (request.url() != originalRequest.url())
>             WTFLogAlways("Redirected scheme task would have been sent to a different URL.");
>+
>+        processNextPendingTask();
>     };
>     
>-    if (m_waitingForRedirectCompletionHandler)
>-        WTFLogAlways("Received redirect during previous redirect processing.");
>-    m_waitingForRedirectCompletionHandler = true;
>+    if (m_waitingForCompletionHandler) {
>+        WTFLogAlways("Received redirect during previous redirect processing, queuing it.");
>+        queueTask([this, protectedThis = makeRef(*this), redirectResponse = WTFMove(redirectResponse), request = WTFMove(request)]() mutable {
>+            didPerformRedirection(WTFMove(redirectResponse), WTFMove(request));
>+        });
>+        return;
>+    }
>+    m_waitingForCompletionHandler = true;
> 
>     m_coreLoader->willSendRequest(WTFMove(request), redirectResponse, WTFMove(completionHandler));
> }
> 
> void WebURLSchemeTaskProxy::didReceiveResponse(const ResourceResponse& response)
> {
>-    if (m_waitingForRedirectCompletionHandler)
>-        WTFLogAlways("Received response during redirect processing.");
>+    if (m_waitingForCompletionHandler) {
>+        WTFLogAlways("Received response during redirect processing, queuing it.");
>+        queueTask([this, protectedThis = makeRef(*this), response] {
>+            didReceiveResponse(response);
>+        });
>+        return;
>+    }
>     
>     if (!hasLoader())
>         return;
> 
>-    m_coreLoader->didReceiveResponse(response, nullptr);
>+    m_waitingForCompletionHandler = true;
>+    m_coreLoader->didReceiveResponse(response, [this, protectedThis = makeRef(*this)] {
>+        m_waitingForCompletionHandler = false;
>+        processNextPendingTask();
>+    });
> }
> 
> void WebURLSchemeTaskProxy::didReceiveData(size_t size, const uint8_t* data)
>@@ -100,7 +116,18 @@ void WebURLSchemeTaskProxy::didReceiveData(size_t size, const uint8_t* data)
>     if (!hasLoader())
>         return;
> 
>+    if (m_waitingForCompletionHandler) {
>+        WTFLogAlways("Received data during response processing, queuing it.");
>+        Vector<uint8_t> dataVector;
>+        dataVector.append(data, size);
>+        queueTask([this, protectedThis = makeRef(*this), dataVector = WTFMove(dataVector)] {
>+            didReceiveData(dataVector.size(), dataVector.data());
>+        });
>+        return;
>+    }
>+
>     m_coreLoader->didReceiveData(reinterpret_cast<const char*>(data), size, 0, DataPayloadType::DataPayloadBytes);
>+    processNextPendingTask();
> }
> 
> void WebURLSchemeTaskProxy::didComplete(const ResourceError& error)
>@@ -108,6 +135,13 @@ void WebURLSchemeTaskProxy::didComplete(const ResourceError& error)
>     if (!hasLoader())
>         return;
> 
>+    if (m_waitingForCompletionHandler) {
>+        queueTask([this, protectedThis = makeRef(*this), error] {
>+            didComplete(error);
>+        });
>+        return;
>+    }
>+
>     if (error.isNull())
>         m_coreLoader->didFinishLoading(NetworkLoadMetrics());
>     else
>@@ -124,4 +158,10 @@ bool WebURLSchemeTaskProxy::hasLoader()
>     return m_coreLoader;
> }
> 
>+void WebURLSchemeTaskProxy::processNextPendingTask()
>+{
>+    if (!m_queuedTasks.isEmpty())
>+        m_queuedTasks.takeFirst()();
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.h b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.h
>index a82d0d36150e9e3fc34276efb0694c48c4e137b8..64af08f55dbab1e4033095b3288c6df98cf2ced1 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include <WebCore/ResourceRequest.h>
>+#include <wtf/Deque.h>
> #include <wtf/RefCounted.h>
> 
> namespace WebCore {
>@@ -61,11 +62,15 @@ private:
>     WebURLSchemeTaskProxy(WebURLSchemeHandlerProxy&, WebCore::ResourceLoader&);
>     bool hasLoader();
> 
>+    void queueTask(Function<void()>&& task) { m_queuedTasks.append(WTFMove(task)); }
>+    void processNextPendingTask();
>+
>     WebURLSchemeHandlerProxy& m_urlSchemeHandler;
>     RefPtr<WebCore::ResourceLoader> m_coreLoader;
>     WebCore::ResourceRequest m_request;
>     unsigned long m_identifier;
>-    bool m_waitingForRedirectCompletionHandler { };
>+    bool m_waitingForCompletionHandler { false };
>+    Deque<Function<void()>> m_queuedTasks;
> };
> 
> } // namespace WebKit
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c370479323b62fcd6af9954be8603fa3b4fbc8e1..5adce683e57e9da9e6b0571a8a3924016f1fd004 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,107 @@
>+2018-03-13  Chris Dumez  <cdumez@apple.com>
>+
>+        Make policy decisions asynchronous
>+        https://bugs.webkit.org/show_bug.cgi?id=180568
>+        <rdar://problem/37131297>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rebaseline tests for WebKit2. The issue is that some tests dump policy delegate calls
>+        and things now happen in a slightly different order now that those delegates are
>+        asynchronous.
>+
>+        * TestExpectations:
>+        * http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt:
>+        * platform/ios/http/tests/loading/simple-subframe-expected.txt:
>+        * platform/mac-wk2/http/tests/loading/simple-subframe-expected.txt: Copied from LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt.
>+        * platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt: Copied from LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt.
>+        * platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt: Copied from LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt.
>+        * platform/wk2/fast/loader/main-document-url-for-non-http-loads-expected.txt: Added.
>+        * platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt: Copied from LayoutTests/platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt.
>+        * platform/wk2/fast/loader/subframe-removes-itself-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt: Added.
>+        * platform/wk2/http/tests/contentextensions/block-everything-unless-domain-expected.txt: Added.
>+        * platform/wk2/http/tests/loading/authentication-after-redirect-stores-wrong-credentials/authentication-after-redirect-stores-wrong-credentials-expected.txt:
>+        * platform/wk2/http/tests/loading/bad-server-subframe-expected.txt: Added.
>+        * platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt:
>+        * platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt: Added.
>+        * platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt: Added.
>+        * platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt: Added.
>+        * platform/wk2/http/tests/misc/window-dot-stop-expected.txt: Added.
>+        * platform/wk2/http/tests/navigation/redirect-preserves-fragment-expected.txt: Added.
>+        * platform/wk2/http/tests/navigation/redirect-to-fragment-expected.txt: Added.
>+        * platform/wk2/http/tests/navigation/redirect-to-invalid-url-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: Added.
>+        * platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt: Added.
>+        * platform/wk2/http/tests/security/blocked-on-redirect-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt: Added.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt: Added.
>+        * platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/inspector/page/frameScheduledNavigation-expected.txt: Added.
>+        * platform/wk2/loader/go-back-cached-main-resource-expected.txt: Added.
>+        * platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/webarchive/loading/test-loading-archive-expected.txt: Copied from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+        * platform/wk2/webarchive/loading/video-in-webarchive-expected.txt: Renamed from LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt.
>+
> 2018-03-15  Ms2ger  <Ms2ger@igalia.com>
> 
>         [GTK][WPE] Enable service workers
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 5560d7bf0e7f45a8246d3aa53b9b3833823fa72e..ae9f55aa188323ca77c85d537c99ae60953b7af9 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -1716,6 +1716,9 @@ webkit.org/b/178785 perf/object-keys.html [ Pass Failure ]
> # There is a bug in the test
> imported/w3c/web-platform-tests/workers/worker-performance.worker.html [ Pass Failure ]
> 
>+# We sometimes get 2 console log messages about CSP instead of 1 due to preloading.
>+http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html [ DumpJSConsoleLogInStdErr ]
>+
> media/event-queue-crash.html [ DumpJSConsoleLogInStdErr ]
> 
> webkit.org/b/172243 imported/w3c/web-platform-tests/IndexedDB/idbdatabase-createObjectStore-exception-order.htm [ Pass Failure ]
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt
>index effc711dcf256967a6666f6fb73194c3eede54b3..039002e2d13c2284a32ce1a4deb80148755ce03c 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt
>@@ -3,7 +3,6 @@ main frame - didFinishDocumentLoadForFrame
> main frame - didHandleOnloadEventsForFrame
> main frame - didFinishLoadForFrame
> main frame - 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.
> main frame - didFinishDocumentLoadForFrame
> main frame - didHandleOnloadEventsForFrame
> main frame - didFinishLoadForFrame
>diff --git a/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt b/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt
>index 5db80e9b54c1320eeafc26a178347c5c7b6a0412..c9c7a7f3bffe53420846c2a5c72dc3a78f641169 100644
>--- a/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt
>+++ b/LayoutTests/platform/ios/http/tests/loading/simple-subframe-expected.txt
>@@ -1,7 +1,7 @@
> main frame - didStartProvisionalLoadForFrame
> main frame - didCommitLoadForFrame
>-frame "f1" - didStartProvisionalLoadForFrame
> main frame - didFinishDocumentLoadForFrame
>+frame "f1" - didStartProvisionalLoadForFrame
> frame "f1" - didCommitLoadForFrame
> frame "f1" - didFinishDocumentLoadForFrame
> frame "f1" - didHandleOnloadEventsForFrame
>diff --git a/LayoutTests/platform/mac-wk2/http/tests/loading/simple-subframe-expected.txt b/LayoutTests/platform/mac-wk2/http/tests/loading/simple-subframe-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b38d062540a1b05a04ebfd0708887298bfe4be5d
>--- /dev/null
>+++ b/LayoutTests/platform/mac-wk2/http/tests/loading/simple-subframe-expected.txt
>@@ -0,0 +1,28 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "f1" - didStartProvisionalLoadForFrame
>+frame "f1" - didCommitLoadForFrame
>+frame "f1" - didFinishDocumentLoadForFrame
>+frame "f1" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "f1" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderText {#text} at (0,0) size 496x18
>+        text run at (0,0) width 496: "This is a test of load callbacks. It is only useful inside the regression test tool."
>+      RenderBR {BR} at (495,14) size 1x0
>+      RenderIFrame {IFRAME} at (0,18) size 304x154 [border: (2px inset #000000)]
>+        layer at (0,0) size 300x150
>+          RenderView at (0,0) size 300x150
>+        layer at (0,0) size 300x150
>+          RenderBlock {HTML} at (0,0) size 300x150
>+            RenderBody {BODY} at (8,8) size 284x134
>+              RenderInline {B} at (0,0) size 24x18
>+                RenderText {#text} at (0,0) size 24x18
>+                  text run at (0,0) width 24: "test"
>+      RenderText {#text} at (0,0) size 0x0
>diff --git a/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt b/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt
>deleted file mode 100644
>index b9e01c51f33cb3ad2038123b4cb63887f0238a03..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/mac/webarchive/loading/mainresource-null-mimetype-crash-expected.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-main frame - didStartProvisionalLoadForFrame
>-main frame - didCommitLoadForFrame
>-main frame - didFinishDocumentLoadForFrame
>-frame "-->" - didStartProvisionalLoadForFrame
>-main frame - didHandleOnloadEventsForFrame
>-frame "-->" - didCommitLoadForFrame
>-frame "-->" - didFinishDocumentLoadForFrame
>-frame "-->" - didHandleOnloadEventsForFrame
>-frame "-->" - didFinishLoadForFrame
>-main frame - didFinishLoadForFrame
>-
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..7ee00a5cf1fcce03986c43ca5aa4cfbb44b48685
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/fragment-navigation-base-blank-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didChangeLocationWithinPageForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..b06dcafdef613bba3b6497b5679c3c2aae81a3b3
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/iframe-meta-refresh-base-blank-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html 
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCancelClientRedirectForFrame
>+frame "-->" - didCommitLoadForFrame
>+ALERT: Finishing test with a window count of 1
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..54613e93a22aa33e604b0a3bdb872986559e3667
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/iframe-set-location-base-blank-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - willPerformClientRedirectToURL: resources/notify-done-with-window-count.html 
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCancelClientRedirectForFrame
>+frame "-->" - didCommitLoadForFrame
>+ALERT: Finishing test with a window count of 1
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+
>diff --git a/LayoutTests/platform/wk2/fast/loader/main-document-url-for-non-http-loads-expected.txt b/LayoutTests/platform/wk2/fast/loader/main-document-url-for-non-http-loads-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..38e9276e53b4f80cbeb2e367ecd44074061db35a
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/main-document-url-for-non-http-loads-expected.txt
>@@ -0,0 +1,6 @@
>+main-document-url-for-non-http-loads.html - didFinishLoading
>+resources/subframe-notify-done.html - willSendRequest <NSURLRequest URL resources/subframe-notify-done.html, main document URL main-document-url-for-non-http-loads.html, http method GET> redirectResponse (null)
>+resources/subframe-notify-done.html - didReceiveResponse <NSURLResponse resources/subframe-notify-done.html, http status code 0>
>+Radar 6616664 - Non-HTTP/HTTPS loads need to have their main document URL set.
>+When run in DumpRenderTree, this test will dump the resource load callback for the following subframe to make sure it had its main document URL set in its NSURLRequest.
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..1fa8028307434ed880c5240c3bf678522256c059
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/refresh-iframe-base-blank-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - willPerformClientRedirectToURL: resources/refresh-iframe-base-blank-frame.html 
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCancelClientRedirectForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+ALERT: Test finished with 1 windows
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..9e3d09bf6eab7c54ffe7dedb2af11a7228c27114
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/fast/loader/subframe-removes-itself-expected.txt
>@@ -0,0 +1,7 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - 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/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt b/LayoutTests/platform/wk2/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f449e5adc363676bbc5eef65760bba28b7db1d6b
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt
>@@ -0,0 +1,4 @@
>+CONSOLE MESSAGE: Unsafe attempt to load URL data:text/html,FAIL from document with Content-Disposition: attachment at URL http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/cross-origin-frames-frame.php.
>+This test verifies that cross-origin frames are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/contentextensions/block-everything-unless-domain-expected.txt b/LayoutTests/platform/wk2/http/tests/contentextensions/block-everything-unless-domain-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e02c0719fc55398af1a796304d3813024d2fc896
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/contentextensions/block-everything-unless-domain-expected.txt
>@@ -0,0 +1,4 @@
>+CONSOLE MESSAGE: line 5: helper loaded
>+CONSOLE MESSAGE: Content blocker prevented frame displaying http://localhost:8000/contentextensions/resources/should-not-load.html from loading a resource from http://localhost:8000/contentextensions/resources/should-not-load.html
>+CONSOLE MESSAGE: line 13: PASS - blocked the load
>+
>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 0801b1e7d1e154dcb48fc4cf4174273abfced2eb..91867ff4d864f033fdd0fe3d722b0f2ea6dddabd 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,7 +1,7 @@
> main frame - didStartProvisionalLoadForFrame
> main frame - didCommitLoadForFrame
>-frame "-->" - didStartProvisionalLoadForFrame
> main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
> frame "-->" - didReceiveServerRedirectForProvisionalLoadForFrame
> 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with httpUsername:httpPassword
> frame "-->" - didCommitLoadForFrame
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..c46ab9ac26e1e414744594d1dd81cd489b5c369f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/loading/bad-server-subframe-expected.txt
>@@ -0,0 +1,10 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "f1" - didStartProvisionalLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "f1" - didFailProvisionalLoadWithError
>+main frame - didFinishLoadForFrame
>+This is a test of load callbacks. It is only useful inside the regression test tool.
>+It also assumes there is no web server running locally on port 54321.
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt
>index 575c0502756eb8d8ca6c2f6795297165e1028ea6..b1cbd188f7ae421b087cc2326e87c2c4812a104a 100644
>--- a/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt
>+++ b/LayoutTests/platform/wk2/http/tests/loading/basic-auth-load-URL-with-consecutive-slashes-expected.txt
>@@ -1,7 +1,7 @@
> main frame - didStartProvisionalLoadForFrame
> main frame - didCommitLoadForFrame
>-frame "frame" - didStartProvisionalLoadForFrame
> main frame - didFinishDocumentLoadForFrame
>+frame "frame" - didStartProvisionalLoadForFrame
> 127.0.0.1:8000 - didReceiveAuthenticationChallenge - Responding with webkit:rocks
> frame "frame" - didCommitLoadForFrame
> frame "frame" - didFinishDocumentLoadForFrame
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..7a3dd0d0957ba1a98632e5c336012cf579c1ebfa
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/loading/redirect-with-no-location-crash-expected.txt
>@@ -0,0 +1,12 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didReceiveTitle: Test for https://bugs.webkit.org/show_bug.cgi?id=29293
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..5e68ee89f31d518f15110bf0ad804814afd45952
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt
>@@ -0,0 +1,29 @@
>+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 "-->" - 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 "-->" - 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 "-->" - didCommitLoadForFrame
>+frame "-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php 
>+frame "-->" - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
>+frame "-->" - 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 "-->" - 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 "-->" - didCancelClientRedirectForFrame
>+frame "-->" - didCommitLoadForFrame
>+http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame.
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt b/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a54c6188bf6c5a6b5a6b4222e1e15ee366a163ec
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/loading/slow-parsing-subframe-expected.txt
>@@ -0,0 +1,12 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "f1" - didStartProvisionalLoadForFrame
>+frame "f1" - didCommitLoadForFrame
>+frame "f1" - didFinishDocumentLoadForFrame
>+frame "f1" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "f1" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+This tests that we get frame load callbacks in the proper order when a subframe is parsed and created from within a timer callback.  
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..72b11071d6c002254f6a4b9df743e55c2ff422a4
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt
>@@ -0,0 +1,8 @@
>+http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html - didFinishLoading
>+http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - willSendRequest <NSURLRequest URL http://www.example.com/, main document URL http://127.0.0.1:8000/misc/will-send-request-returns-null-on-redirect.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php, http status code 302>
>+Returning null for this redirect
>+http://127.0.0.1:8000/misc/resources/redirect-to-http-url.php - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999>
>+https://bugs.webkit.org/show_bug.cgi?id=27595
>+This test checks to make sure that things behave as expected when the resource load delegate returns null in response to willSendRequest.
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt b/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..edbfa531e06ec203f823ed8801f65e61128d64f1
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/misc/window-dot-stop-expected.txt
>@@ -0,0 +1,4 @@
>+http://127.0.0.1:8000/misc/window-dot-stop.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/misc/window-dot-stop.html">
>+This tests for the successful use of window.stop()
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/navigation/redirect-preserves-fragment-expected.txt b/LayoutTests/platform/wk2/http/tests/navigation/redirect-preserves-fragment-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4917455ec9b473df12a7ba0ec363600a98bbd057
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/navigation/redirect-preserves-fragment-expected.txt
>@@ -0,0 +1,7 @@
>+http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html - didFinishLoading
>+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo, main document URL http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/success.html#foo, main document URL http://127.0.0.1:8000/navigation/redirect-preserves-fragment.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo, http status code 302>
>+http://127.0.0.1:8000/navigation/resources/redirect-preserves-fragment.php#foo - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/success.html#foo, http status code 200>
>+Test passes if WebKit preserves the request fragment identifier after the redirection.
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-fragment-expected.txt b/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-fragment-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..2505893cf6b4b5206f5b9a80b30533347f40311f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-fragment-expected.txt
>@@ -0,0 +1,7 @@
>+http://127.0.0.1:8000/navigation/redirect-to-fragment.html - didFinishLoading
>+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/success.html#bar, main document URL http://127.0.0.1:8000/navigation/redirect-to-fragment.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo, http status code 302>
>+http://127.0.0.1:8000/navigation/resources/redirect-to-fragment.php#foo - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/navigation/resources/success.html#bar, http status code 200>
>+Test passes if WebKit ignores the request fragment identifier after the redirect to a url with a fragment identifier.
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-invalid-url-expected.txt b/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-invalid-url-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a1b058469fefd4c386aa0946a57f07671f7a3dec
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/navigation/redirect-to-invalid-url-expected.txt
>@@ -0,0 +1,6 @@
>+http://127.0.0.1:8000/navigation/redirect-to-invalid-url.html - didFinishLoading
>+http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php, main document URL http://127.0.0.1:8000/navigation/redirect-to-invalid-url.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "http://127.0.0.1:8000/navigation/resources/redirect-to-invalid-url-frame.php">
>+Test passes if WebKit doesn't request the redirected URL.
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..77a67b876427d9d68adce6edaf9fbc694262fb1f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-allowall-expected.txt
>@@ -0,0 +1,11 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-allowall.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-allowall.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-allowall.cgi, http status code 200>
>+The frame below should load, and 'ALLOWALL' should be accepted as a valid header.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..747f85a84eedef0efbac4fa55b52ece72911dd87
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-deny-expected.txt
>@@ -0,0 +1,14 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi' in a frame because it set 'X-Frame-Options' to 'deny'.
>+CONSOLE MESSAGE: line 14: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
>+CONSOLE MESSAGE: line 15: PASS: Could not read contentWindow.location.href
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi">
>+There should be no content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..f2c06124bb3d2689b1b5fad80130fa8fd85d0b49
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-expected.txt
>@@ -0,0 +1,13 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html, http status code 200>
>+CONSOLE MESSAGE: line 3: The X-Frame-Option 'deny' supplied in a <meta> element was ignored. X-Frame-Options may only be provided by an HTTP header sent with the document.
>+CONSOLE MESSAGE: line 15: PASS: Could read contentWindow.location.href
>+There should be content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..7a66ae1148ab2abd32c69ba3ee780a13d915fa5f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body-expected.txt
>@@ -0,0 +1,15 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-in-body.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html, http status code 200>
>+CONSOLE MESSAGE: line 6: The X-Frame-Option 'deny' supplied in a <meta> element was ignored. X-Frame-Options may only be provided by an HTTP header sent with the document.
>+CONSOLE MESSAGE: line 15: PASS: Could read contentWindow.location.href
>+There should be content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+PASS: This should be displayed.
>+
>+PASS: This should also 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..10ba5f0bc4dd1669f38ce7eb5288a2533f74b675
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow-expected.txt
>@@ -0,0 +1,13 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-allow.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-allow.html, http status code 200>
>+CONSOLE MESSAGE: line 3: The X-Frame-Option 'sameorigin' supplied in a <meta> element was ignored. X-Frame-Options may only be provided by an HTTP header sent with the document.
>+ALERT: PASS: onload fired.
>+There should be content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..579eef21018cf3547c68c65f62cbcf8e7cbc2273
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny-expected.txt
>@@ -0,0 +1,14 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny.html - didFinishLoading
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-ignore-deny-meta-tag-parent-same-origin-deny.html, http method GET> redirectResponse (null)
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didReceiveResponse <NSURLResponse http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html, http status code 200>
>+CONSOLE MESSAGE: line 3: The X-Frame-Option 'sameorigin' supplied in a <meta> element was ignored. X-Frame-Options may only be provided by an HTTP header sent with the document.
>+CONSOLE MESSAGE: line 18: SecurityError: 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 19: FAIL: Could not read contentWindow.location.href
>+There should be content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..949552e9f730dd003ba8e780a0f4ffd3d2390464
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-invalid-expected.txt
>@@ -0,0 +1,12 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-invalid.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-invalid.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Invalid 'X-Frame-Options' header encountered when loading 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi': 'INVALID INVALID INVALID' is not a recognized directive. The header will be ignored.
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-invalid.cgi, http status code 200>
>+The frame below should load, and a console message should be generated that notes the invalid header.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..07959b88bbf808c9cb721aa9fe7608795314c7ff
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-conflict-expected.txt
>@@ -0,0 +1,13 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-conflict.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-conflict.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Multiple 'X-Frame-Options' headers with conflicting values ('ALLOWALL, DENY') encountered when loading 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi'. Falling back to 'DENY'.
>+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi' in a frame because it set 'X-Frame-Options' to 'ALLOWALL, DENY'.
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-conflict.cgi">
>+The frame below should not load, and a console message should be generated that notes the invalid header.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..1547b4bf8ce7fad717052565c46af5a61817eb0e
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow-expected.txt
>@@ -0,0 +1,11 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-allow.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, http status code 200>
>+The frame below should load, proving that 'sameorigin, sameorigin' === 'sameorigin'.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..523bab9d318c11f24b4e8d6e20d80730b7bc8091
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny-expected.txt
>@@ -0,0 +1,14 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny.html - didFinishLoading
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-multiple-headers-sameorigin-deny.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi' in a frame because it set 'X-Frame-Options' to 'SAMEORIGIN, SAMEORIGIN'.
>+CONSOLE MESSAGE: line 21: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
>+CONSOLE MESSAGE: line 22: PASS: Could not read contentWindow.location.href
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-multiple-headers-sameorigin.cgi">
>+The frame below should not load, proving that 'sameorigin, sameorigin' === 'sameorigin'.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..4cba6bfa183fc6679ea97663316f49e5ef376f9b
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt
>@@ -0,0 +1,11 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html - didFinishLoading
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html, http method GET> redirectResponse (null)
>+http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, http status code 200>
>+There should be content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..7c9891447450ed1a5fe621dbe3b5479b1317751f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny-expected.txt
>@@ -0,0 +1,14 @@
>+http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html - didFinishLoading
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - willSendRequest <NSURLRequest URL http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Refused to display 'http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi' in a frame because it set 'X-Frame-Options' to 'sameorigin'.
>+CONSOLE MESSAGE: line 18: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "null".  The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
>+CONSOLE MESSAGE: line 19: PASS: Could not read contentWindow.location.href
>+http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-parent-same-origin-allow.cgi">
>+There should be no content in the iframe below
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt b/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..49e4f97cbb5de150a72f79ea8dfc3311f2f07d6b
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/blocked-on-redirect-expected.txt
>@@ -0,0 +1,5 @@
>+http://127.0.0.1:8000/security/blocked-on-redirect.html - didFinishLoading
>+http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html, main document URL http://127.0.0.1:8000/security/blocked-on-redirect.html, http method GET> redirectResponse (null)
>+CONSOLE MESSAGE: Not allowed to use restricted network port: http://localhost:25/security/resources/post-done.html
>+http://127.0.0.1:8000/resources/redirect.php?code=307&url=http://localhost:25/security/resources/post-done.html - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://localhost:25/security/resources/post-done.html">
>+This test produces output in the console. Only the initial URL should be logged. 
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..b07275959955db6118448255d25b95616675e10e
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/data-url-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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.
>+
>+PASS did load data URL iframe.
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..0061f8c9d2ab174d98448da858a44b69ae7fd51f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-expected.txt
>@@ -0,0 +1,30 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+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
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..caf660f6ef3dc87b0f970276463aa139b63dd5b7
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only-expected.txt
>@@ -0,0 +1,32 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCancelClientRedirectForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+CSP report received:
>+CONTENT_TYPE: application/csp-report
>+HTTP_HOST: 127.0.0.1:8443
>+HTTP_REFERER: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php
>+REQUEST_METHOD: POST
>+REQUEST_URI: /security/contentSecurityPolicy/resources/save-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php
>+=== POST DATA ===
>+{"csp-report":{"document-uri":"https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php","referrer":"http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-iframe-report-only.html","violated-directive":"block-all-mixed-content","effective-directive":"block-all-mixed-content","original-policy":"block-all-mixed-content; report-uri ../../resources/save-report.php?test=/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css-report-only.php","blocked-uri":"http://127.0.0.1:8000","status-code":0}}
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a8f9acedd54054c2dff525b68d78c73b34b050b2
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame-expected.txt
>@@ -0,0 +1,22 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window and loads an insecure stylesheet. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-css.html
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-css-in-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..59c422cf36b54b30a80ae9e775a4b5e7d270a63b
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-iframe-expected.txt
>@@ -0,0 +1,25 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - 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 "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "/-->" - didFailProvisionalLoadWithError
>+frame "-->" - 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: '-->'
>+--------
>+
>+
>+
>+--------
>+Frame: '/-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..352aa4daf9bddfcd84e071276280d072ce8d92d0
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,14 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didCommitLoadForFrame
>+frame "-->" - 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 "-->" - didFailProvisionalLoadWithError
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..46ca150a60f124adf6068262439b84b95c8ecf6e
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-expected.txt
>@@ -0,0 +1,29 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image.html
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..fc71e34a520784e5cb70e9b64a43707ab079251c
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies-expected.txt
>@@ -0,0 +1,31 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - 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 "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image-with-enforced-and-report-policies.php
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-enforced-and-report-policies.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..6aad4db2986409525d35dda57c3b1ad13065b3cb
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-iframe-with-inherited-policy-expected.txt
>@@ -0,0 +1,18 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..5faf94ba3a3b2007b94593dc09f4aaf239d0f093
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-javascript-url-iframe-in-iframe-expected.txt
>@@ -0,0 +1,25 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "/-->" - didStartProvisionalLoadForFrame
>+frame "/-->" - didCommitLoadForFrame
>+frame "/-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - didHandleOnloadEventsForFrame
>+frame "/-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>+
>+--------
>+Frame: '/-->'
>+--------
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..35840760a2a2e214abd25061bc230fd74e33136c
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-main-frame-expected.txt
>@@ -0,0 +1,23 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - 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.
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window and loads an insecure image. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-image.html
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..221c2aba5624b3710b8b08aef4d0c164e0ea2b22
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-image-in-xslt-document-in-iframe-with-inherited-policy-expected.txt
>@@ -0,0 +1,19 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..88b2f7d420ea7f6d2094a8ee610d75d49c7c7ef2
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe-expected.txt
>@@ -0,0 +1,29 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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.
>+
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-plugin.html
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-iframe.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..adfe9b3c8ce8993f35a38cc1f6013d5c3dd73617
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame-expected.txt
>@@ -0,0 +1,23 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+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 opens a window and loads an insecure plugin. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+documentURI: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-plugin.html
>+referrer: http://127.0.0.1:8000/security/contentSecurityPolicy/block-all-mixed-content/insecure-plugin-in-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..9195be2f2f0b86c0cb08645021e1327ea307da53
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-expected.txt
>@@ -0,0 +1,28 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+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
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..bd9cf7bb986e46cf82a29a500f8b4c9395270f8a
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-iframe-with-inherited-policy-expected.txt
>@@ -0,0 +1,18 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..18e1ae4c005b0abfa3a85fb9bc366c3eb7399969
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-script-in-main-frame-expected.txt
>@@ -0,0 +1,23 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - 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.
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window and loads an insecure external script. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+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-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: 
>+lineNumber: 0
>+columnNumber: 0
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..65c6b54db99f5c39408248badd025020e911aef8
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
>@@ -0,0 +1,29 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+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
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html?asynchronous
>+lineNumber: 30
>+columnNumber: 9
>+statusCode: 0
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..549810fd8bb214e0c622fcc6f4c2ef254edbddb7
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
>@@ -0,0 +1,24 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - 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: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window and loads insecure data via asynchronous XHR. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+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-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html?asynchronous
>+lineNumber: 30
>+columnNumber: 9
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..9feb76df6a0e34aa3f70bc3635a83fbebc806693
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-iframe-expected.txt
>@@ -0,0 +1,28 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+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
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html
>+lineNumber: 30
>+columnNumber: 9
>+statusCode: 0
>+
>+
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4dfbf0a1ec4d7f5217eb173ad4c867c34955c061
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-synchronous-in-main-frame-expected.txt
>@@ -0,0 +1,23 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - 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.
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window and loads insecure data via synchronous XHR. We should trigger a mixed content block because the main frame in the window has CSP directive block-all-mixed-content.
>+
>+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-main-frame.html
>+blockedURI: http://127.0.0.1:8000
>+violatedDirective: block-all-mixed-content
>+effectiveDirective: block-all-mixed-content
>+originalPolicy: block-all-mixed-content
>+sourceFile: https://127.0.0.1:8443/security/contentSecurityPolicy/block-all-mixed-content/resources/frame-with-insecure-xhr.html
>+lineNumber: 30
>+columnNumber: 9
>+statusCode: 0
>+
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..f651f984f5397481e71f4069e6ee77fc52c065fa
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-in-iframe-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>+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
>new file mode 100644
>index 0000000000000000000000000000000000000000..8f57e514e450f9efaadf7f90c515fa9ab267d471
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/secure-image-after-upgrade-redirect-in-iframe-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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: '-->'
>+--------
>+
>+PASS did load image.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..9a55940a89c0dc6f795fd7f50791cce3edf7f2d8
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/iframe-upgrade.https-expected.txt
>@@ -0,0 +1,8 @@
>+CONSOLE MESSAGE: The page at about:srcdoc was allowed to display insecure content from http://localhost:8000/security/resources/post-origin-to-parent.html.
>+
>+
>+
>+PASS Same-host frames are upgraded. 
>+PASS Cross-host frames are upgraded. 
>+PASS Upgrade policy does NOT cascade to nested, cross-host frames. 
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..d966a52bc41df7b6d0e44a0249590bc1ea85fba0
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/proper-nested-upgrades-expected.txt
>@@ -0,0 +1,19 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+ALERT: PASS
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - didStartProvisionalLoadForFrame
>+frame "/-->" - didCommitLoadForFrame
>+ALERT: PASS
>+ALERT: PASS
>+frame "/-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "/-->" - didFinishLoadForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..a1b1f748911b76a5ddd2a7c063d652c3405336dd
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-insecure-css-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..dbb835df4f06e4b6c9419089dbe78259679fad13
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-http-to-https-script-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..ee1860b1d58b607f0a87c4ad1000812129daec8a
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/upgrade-insecure-requests/upgrade-redirect-https-to-http-script-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..783bac573f87951320e7112c0948c3c9953a22fb
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/http-0.9/iframe-blocked-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFailProvisionalLoadWithError
>+main frame - didFinishLoadForFrame
>+
>+
>+--------
>+Frame: '-->'
>+--------
>+
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..963f70a59f46027a23c7db3f2711bdc4e5865b11
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/about-blank-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,19 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window iframe that loads an about:blank iframe. We should *not* trigger a mixed content callback because the about:blank iframes cannot be corrupted by active network attackers.
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..a827c1dfe884e66c7206d5e72a5e489c9c52ce4a
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,14 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..d42f087d43f017172b2bbf430df146f9f1adbb2a
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/data-url-script-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..caaae79d1cdd56bc1486bf0d279f2d9a677aabed
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/empty-url-plugin-in-frame-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..891b4e2025cb9ccc8992fd0eaf8c3169df0f4ce2
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-iframe-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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-css-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..d2d199475f475234da475b048d07931553e24f68
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - 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.
>+
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that loads an insecure style sheet. We should trigger a mixed content callback because the main frame in the window is HTTPS but is running insecure content.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..27642de147072a16fa09bc01d741a0fb6eb872de
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-css-with-secure-cookies-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+CONSOLE MESSAGE: line 6: secureCookie=yes
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-css-secure-cookies.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/greenbox-hotspot5-4.cur.
>+
>+didDisplayInsecureContent
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that loads a secure style sheet with insecure cursor content after reading secure cookies. This should be allowed because loading of the insecure cursor does not pose a security risk since it can only affect the display.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..c1af5a95f7380c8ecff92eecf4c34599c6630a1d
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-executable-css-with-secure-cookies-expected.txt
>@@ -0,0 +1,12 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+CONSOLE MESSAGE: line 6: secureCookie=yes
>+CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-executable-css-with-secure-cookies.html was not allowed to run insecure content from http://127.0.0.1:8080/security/resources/insecure.css.
>+
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that loads a secure style sheet with insecure content after reading secure cookies. This should block loading of the insecure content since secure cookie was read.
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..0a2e6e5c03ee06cfc97e75194b494f004a809819
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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-form-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..78ce4d548407be23444f8877e9cbb08e86ee1823
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-form-in-main-frame-expected.txt
>@@ -0,0 +1,12 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+CONSOLE MESSAGE: line 3: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-form.html contains a form which targets an insecure URL http://127.0.0.1:8080/resources/doesnotexist.
>+
>+didDisplayInsecureContent
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that has a form with an non-https action. We should trigger a mixed content callback because the main frame in the window is HTTPS but is running insecure 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..aebf78e32a04e8bb9434088bf9e595c78a7e29e4
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-iframe-expected.txt
>@@ -0,0 +1,16 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - didStartProvisionalLoadForFrame
>+frame "/-->" - didCommitLoadForFrame
>+frame "/-->" - didFinishDocumentLoadForFrame
>+frame "/-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "/-->" - didFinishLoadForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..fd63c94c77985267f059bbe5e5e53a902b5e095f
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - 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 "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..27f9bfe8c718148ec36e72a84805b3d82a5ff965
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/insecure-image-in-iframe-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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/javascript-url-form-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..9f0804e09f4ef0dc6c73d54b71ddada0b1233156
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/javascript-url-form-in-main-frame-expected.txt
>@@ -0,0 +1,9 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that has a form with an action that is a javascript: url. We should *not* trigger a mixed content callback because the javascript: URL cannot be corrupted by active network attackers.
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..903366342c61411b3257acb932aac137b3577e92
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - 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 "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..26f323a5891396008637ea714b8c9718f89271b4
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..2b1f8a077bffb4bff82bd8c1fa1f893f3c2d40e9
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - 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 "-->" - 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-image-secure-cookies-block-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4dd8ea491c7fe4bad81f2790738a5c7b6395373c
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-block-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-image-secure-cookie-block.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+
>+didDisplayInsecureContent
>+CONSOLE MESSAGE: line 8: secureCookie=yes
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that loads an insecure image (via a tricky redirect) and then tries to read a secure cookie. This should block the secure cookie from being read because insecure content was loaded while loading a main frame.
>diff --git a/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..336881973244f0f23d021470fc722ca48d519840
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-image-secure-cookies-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+CONSOLE MESSAGE: line 4: secureCookie=yes
>+main frame - didFinishDocumentLoadForFrame
>+CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-image-secure-cookie.html was allowed to display insecure content from http://127.0.0.1:8080/security/resources/compass.jpg.
>+
>+didDisplayInsecureContent
>+main frame - didHandleOnloadEventsForFrame
>+main frame - didFinishLoadForFrame
>+This test opens a window that reads a secure cookie and then loads an insecure image (via a tricky redirect). This should not block the insecure image from loading even though a secure cookie was accessed, because an insecure image can only affect pixels on screen, not expose private data.
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..ffad8bbf450ff6696dce0994f23c7051484c30c1
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe-expected.txt
>@@ -0,0 +1,13 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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
>new file mode 100644
>index 0000000000000000000000000000000000000000..fe88d6b1715752016f6f658d91d9f3ae7ff87f5d
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/http/tests/security/xssAuditor/script-tag-with-callbacks-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - 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 "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+
>diff --git a/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt b/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b1a52a59eef5b4db1234c21c5fdbcd00c76d8083
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/inspector/page/frameScheduledNavigation-expected.txt
>@@ -0,0 +1,5 @@
>+
>+Scheduled navigation with delay 0
>+Cleared scheduled navigation
>+Started loading
>+
>diff --git a/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt b/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..3aebba2b6dae7e072de7a6a5ffc02bdc392d7872
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/loader/go-back-cached-main-resource-expected.txt
>@@ -0,0 +1,25 @@
>+go-back-cached-main-resource.html - didFinishLoading
>+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL resources/first-page.html, http method GET> redirectResponse (null)
>+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
>+resources/first-page.html - didFinishLoading
>+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL resources/other-page.html, http method GET> redirectResponse (null)
>+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
>+resources/other-page.html - didFinishLoading
>+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL resources/first-page.html, http method GET> redirectResponse (null)
>+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
>+resources/first-page.html - didFinishLoading
>+resources/other-page.html - willSendRequest <NSURLRequest URL resources/other-page.html, main document URL resources/other-page.html, http method GET> redirectResponse (null)
>+resources/other-page.html - didReceiveResponse <NSURLResponse resources/other-page.html, http status code 0>
>+resources/other-page.html - didFinishLoading
>+resources/first-page.html - willSendRequest <NSURLRequest URL resources/first-page.html, main document URL resources/first-page.html, http method GET> redirectResponse (null)
>+resources/first-page.html - didReceiveResponse <NSURLResponse resources/first-page.html, http status code 0>
>+resources/first-page.html - didFinishLoading
>+This test check the following situation:
>+
>+First you navigate to a page (first-page.html).
>+Then you go to another page (other-page.html).
>+You repeat previous steps again (going to first-page.html and then to other-page.html).
>+Finally you click back.
>+The problem was that the resource load callbacks when going back to the cached main resource were not being called.
>+
>+See bug #112418.
>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
>new file mode 100644
>index 0000000000000000000000000000000000000000..a135fd7e1ca3d2fe8418878f3120fcc39536afd9
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/webarchive/loading/mainresource-null-mimetype-crash-expected.txt
>@@ -0,0 +1,11 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+frame "-->" - didFinishLoadForFrame
>+main frame - didFinishLoadForFrame
>+
>diff --git a/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4df3278bf3bb93e1b391294745fb9115a9b4d172
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/webarchive/loading/test-loading-archive-expected.txt
>@@ -0,0 +1,14 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+test-loading-archive.html - didFinishLoading
>+frame "-->" - 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 "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - 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/video-in-webarchive-expected.txt b/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..8d5492169d9e94fcea9fe16f349a9dd94c68296e
>--- /dev/null
>+++ b/LayoutTests/platform/wk2/webarchive/loading/video-in-webarchive-expected.txt
>@@ -0,0 +1,17 @@
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCommitLoadForFrame
>+main frame - willPerformClientRedirectToURL: resources/video-in-webarchive.webarchive 
>+main frame - didFinishDocumentLoadForFrame
>+main frame - didFinishLoadForFrame
>+main frame - didStartProvisionalLoadForFrame
>+main frame - didCancelClientRedirectForFrame
>+main frame - didCommitLoadForFrame
>+main frame - didFinishDocumentLoadForFrame
>+frame "-->" - didStartProvisionalLoadForFrame
>+frame "-->" - didCommitLoadForFrame
>+frame "-->" - didFinishDocumentLoadForFrame
>+frame "-->" - didHandleOnloadEventsForFrame
>+main frame - didHandleOnloadEventsForFrame
>+frame "-->" - didFailLoadWithError
>+main frame - didFinishLoadForFrame
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 180568: 328779 | 331568 | 331575 | 331579 | 333618 | 333625 | 333630 | 334384 | 334391 | 334392 | 334834 | 334840 | 334843 | 334903 | 334909 | 334912 | 334914 | 334922 | 334935 | 334937 | 334941 | 334942 | 335140 | 335156 | 335162 | 335210 | 335226 | 335228 | 335243 | 335252 | 335255 | 335324 | 335326 | 335337 | 335338 | 335652 | 335660 | 335667 | 335668 | 335670 | 335674 | 335676 | 335679 | 335681 | 335682 | 335708 | 335719 | 335753 | 335858 | 335859 | 335881 | 335892 | 335897 | 335955 | 335991 | 335993 | 335995 | 336048 | 336052 | 336061 | 336062 | 336065 | 336066 | 336070 | 336080 | 336204 | 336205 | 336210