WebKitTools:
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Aug 2009 23:41:46 +0000 (23:41 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Aug 2009 23:41:46 +0000 (23:41 +0000)
2009-08-05  Brady Eidson  <beidson@apple.com>

        Reviewed by Darin Adler.

        Win DRT's resource load delegate is missing didReceiveResponse
        https://bugs.webkit.org/show_bug.cgi?id=28033

        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
        (ResourceLoadDelegate::didReceiveResponse):
        * DumpRenderTree/win/ResourceLoadDelegate.h:
LayoutTests:
2009-08-05  Brady Eidson  <beidson@apple.com>

        Reviewed by Darin Adler.

        Win DRT's resource load delegate is missing didReceiveResponse
        https://bugs.webkit.org/show_bug.cgi?id=28033

        * platform/win/Skipped: Remove a test that now passes

        Remove platform specific results for the XFrameOptions suite which now matches cross platform results:
        * platform/win/http/tests/security: Removed.
        * platform/win/http/tests/security/XFrameOptions: Removed.
        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt: Removed.
        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt: Removed.
        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt: Removed.
        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt: Removed.
        * platform/win/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@46820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/win/Skipped
LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt [deleted file]
LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt [deleted file]
LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt [deleted file]
LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt [deleted file]
LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt [deleted file]
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.h

index 774efea..16c63be 100644 (file)
@@ -1,3 +1,21 @@
+2009-08-05  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Win DRT's resource load delegate is missing didReceiveResponse
+        https://bugs.webkit.org/show_bug.cgi?id=28033
+
+        * platform/win/Skipped: Remove a test that now passes
+        
+        Remove platform specific results for the XFrameOptions suite which now matches cross platform results:
+        * platform/win/http/tests/security: Removed.
+        * platform/win/http/tests/security/XFrameOptions: Removed.
+        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt: Removed.
+        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt: Removed.
+        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt: Removed.
+        * platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt: Removed.
+        * platform/win/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt: Removed.
+
 2009-08-05  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Darin Adler.
index b39de77..b460cdc 100644 (file)
@@ -572,6 +572,5 @@ http/tests/security/isolatedWorld/object-prototype.html
 http/tests/security/isolatedWorld/string-prototype.html
 http/tests/security/isolatedWorld/window-properties.html
 
-# <rdar://problem/7102793> When dumping resource load delegate callbacks, we tend to not get didReceiveResponse for the main response.
+# <rdar://problem/7102793> Some resource load delegate callbacks are not implemented
 http/tests/loading/redirect-methods.html
-http/tests/misc/favicon-loads-with-images-disabled.html
diff --git a/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt b/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-expected.txt
deleted file mode 100644 (file)
index 1f999ff..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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-deny-meta-tag.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe.html">
-about:blank - willSendRequest <NSURLRequest URL about:blank, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag.html, http method GET> redirectResponse (null)
-There should be no content in the iframe below
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-
diff --git a/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt b/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body-expected.txt
deleted file mode 100644 (file)
index d07f0e3..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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-deny-meta-tag-in-body.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-in-body.html">
-about:blank - willSendRequest <NSURLRequest URL about:blank, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html, http method GET> redirectResponse (null)
-There should be no content in the iframe below
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-
diff --git a/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt b/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-allow-expected.txt
deleted file mode 100644 (file)
index 4fbc484..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-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-deny-meta-tag-parent-same-origin-allow.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-There should be content in the iframe below
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS: This should show up as the parent is in the same origin.
diff --git a/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt b/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny-expected.txt
deleted file mode 100644 (file)
index 68f424a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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-deny-meta-tag-parent-same-origin-deny.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -999, failing URL "http://localhost:8000/security/XFrameOptions/resources/x-frame-options-deny-meta-tag-subframe-parent-same-origin-deny.html">
-about:blank - willSendRequest <NSURLRequest URL about:blank, main document URL http://127.0.0.1:8000/security/XFrameOptions/x-frame-options-deny-meta-tag-parent-same-origin-deny.html, http method GET> redirectResponse (null)
-There should be no content in the iframe below
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-
diff --git a/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt b/LayoutTests/platform/win/http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow-expected.txt
deleted file mode 100644 (file)
index c74d808..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-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)
-<unknown> - didFinishLoading
-There should be content in the iframe below
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS: This should show up as the parent is in the same origin.
index cf296e9..391a555 100644 (file)
@@ -1,3 +1,14 @@
+2009-08-05  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Win DRT's resource load delegate is missing didReceiveResponse
+        https://bugs.webkit.org/show_bug.cgi?id=28033
+
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::didReceiveResponse):
+        * DumpRenderTree/win/ResourceLoadDelegate.h:
+
 2009-08-05  Darin Fisher  <darin@chromium.org>
 
         Reviewed by Darin Adler.
index 328ec75..06476e7 100644 (file)
@@ -251,6 +251,39 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::willSendRequest(
     return S_OK;
 }
 
+HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didReceiveResponse(
+    /* [in] */ IWebView* webView, 
+    /* [in] */ unsigned long identifier, 
+    /* [in] */ IWebURLResponse* response, 
+    /* [in] */ IWebDataSource* dataSource)
+{
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
+        printf("%S - didReceiveResponse %S\n",
+            descriptionSuitableForTestResult(identifier).c_str(),
+            descriptionSuitableForTestResult(response).c_str());
+    }
+    if (!done && gLayoutTestController->dumpResourceResponseMIMETypes()) {
+        BSTR mimeTypeBSTR;
+        if (FAILED(response->MIMEType(&mimeTypeBSTR)))
+            E_FAIL;
+    
+        wstring mimeType = wstringFromBSTR(mimeTypeBSTR);
+        ::SysFreeString(mimeTypeBSTR);
+
+        BSTR urlBSTR;
+        if (FAILED(response->URL(&urlBSTR)))
+            E_FAIL;
+    
+        wstring url = urlSuitableForTestResult(wstringFromBSTR(urlBSTR));
+        ::SysFreeString(urlBSTR);
+
+        printf("%S has MIME type %S\n", url.c_str(), mimeType.c_str());
+    }
+
+    return S_OK;
+}
+
+
 HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didFinishLoadingFromDataSource( 
     /* [in] */ IWebView* webView,
     /* [in] */ unsigned long identifier,
index e259adc..c708147 100644 (file)
@@ -72,7 +72,7 @@ public:
         /* [in] */ IWebView *webView,
         /* [in] */ unsigned long identifier,
         /* [in] */ IWebURLResponse *response,
-        /* [in] */ IWebDataSource *dataSource) { return E_NOTIMPL; }
+        /* [in] */ IWebDataSource *dataSource);
         
     virtual HRESULT STDMETHODCALLTYPE didReceiveContentLength( 
         /* [in] */ IWebView *webView,