Diff
Modified: trunk/LayoutTests/ChangeLog (102299 => 102300)
--- trunk/LayoutTests/ChangeLog 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/ChangeLog 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,3 +1,29 @@
+2011-12-07 Aaron Colwell <[email protected]>
+
+ Revert mixed content handling for video fix and follow-up test expectations & Skipped changes.
+ (r101883, r101918, r101927, r101981, r101986, r101997)
+ https://bugs.webkit.org/show_bug.cgi?id=72178
+
+ Reviewed by Adam Barth.
+
+ * http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt: Removed.
+ * http/tests/security/mixedContent/insecure-video-in-iframe.html: Removed.
+ * http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
+ * http/tests/security/mixedContent/insecure-video-in-main-frame.html: Removed.
+ * http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
+ * http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html: Removed.
+ * http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt: Removed.
+ * http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html: Removed.
+ * http/tests/security/mixedContent/resources/frame-with-insecure-video.html: Removed.
+ * http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html: Removed.
+ * http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html: Removed.
+ * platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
+ * platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
+ * platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
+ * platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
+ * platform/gtk/Skipped:
+ * platform/qt/Skipped:
+
2011-12-07 Kent Tamura <[email protected]>
[Qt] Follow up of r102226.
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,11 +0,0 @@
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-This test loads a secure iframe that loads an insecure video. We should *not* get a mixed content callback because the main frame is HTTP and the video doesn't contaminate the child iframe's security origin with mixed content.
-
-
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-iframe.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,14 +0,0 @@
-<html>
- <body>
- <script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
- }
- </script>
- <p>This test loads a secure iframe that loads an insecure video. We should
-*not* get a mixed content callback because the main frame is HTTP and the video
-doesn't contaminate the child iframe's security origin with mixed content.</p>
- <iframe src=""
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-video-in-main-frame.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,25 +0,0 @@
-<html>
- <body>
- <script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
- }
-
- window.addEventListener("message", function (e) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
-
- </script>
- <p>This test opens a window that loads an insecure video. We should trigger a
-mixed content callback because the main frame in the window is HTTPS but is
-displaying insecure content.</p>
- <script>
- window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html");
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html displayed insecure content from http://127.0.0.1:8080/security/resources/redir.php?url=""
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video(via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,25 +0,0 @@
-<html>
- <body>
- <script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
- }
-
- window.addEventListener("message", function (e) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
-
- </script>
- <p>This test opens a window that loads an insecure video(via a tricky
-redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is
-displaying insecure content.</p>
- <script>
- window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html");
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,12 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video(via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,25 +0,0 @@
-<html>
- <body>
- <script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
- }
-
- window.addEventListener("message", function (e) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }, false);
-
- </script>
- <p>This test opens a window that loads an insecure video(via a tricky
-redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is
-displaying insecure content.</p>
- <script>
- window.open("https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html");
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-video.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-video.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-video.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,23 +0,0 @@
-<html>
- <head>
- <script src=""
- <script>
- function frameLoaded() {
- video = document.getElementById('v');
-
- video.addEventListener('loadedmetadata', function(e) {
- if (window.opener)
- window.opener.postMessage('done', '*');
- }, true);
-
- var mediaFile = findMediaFile('video', 'resources/test');
- video.src = '' + mediaFile;
- video.play();
- }
- </script>
- </head>
- <body _onload_="frameLoaded()">
- <video id="v"> </video>
- <p>Test that at least one progress event is fired after starting to load the video.</p>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,23 +0,0 @@
-<html>
- <head>
- <script src=""
- <script>
- function frameLoaded() {
- video = document.getElementById('v');
-
- video.addEventListener('loadedmetadata', function(e) {
- if (window.opener)
- window.opener.postMessage('done', '*');
- }, true);
-
- var mediaFile = findMediaFile('video', 'resources/test');
- video.src = '' + mediaFile;
- video.play();
- }
- </script>
- </head>
- <body _onload_="frameLoaded()">
- <video id="v"> </video>
- <p>Test that at least one progress event is fired after starting to load the video.</p>
- </body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html (102299 => 102300)
--- trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,23 +0,0 @@
-<html>
- <head>
- <script src=""
- <script>
- function frameLoaded() {
- video = document.getElementById('v');
-
- video.addEventListener('loadedmetadata', function(e) {
- if (window.opener)
- window.opener.postMessage('done', '*');
- }, true);
-
- var mediaFile = findMediaFile('video', 'resources/test');
- video.src = '' + mediaFile;
- video.play();
- }
- </script>
- </head>
- <body _onload_="frameLoaded()">
- <video id="v"> </video>
- <p>Test that at least one progress event is fired after starting to load the video.</p>
- </body>
-</html>
Deleted: trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,15 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,15 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html displayed insecure content from http://127.0.0.1:8080/security/resources/redir.php?url=""
-
-didDisplayInsecureContent
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html displayed insecure content from http://127.0.0.1:8080/security/resources/redir.php?url=""
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video(via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,15 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-video.html displayed insecure content from http://127.0.0.1:8080/resources/test.ogv.
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Deleted: trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt (102299 => 102300)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,15 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html displayed insecure content from http://127.0.0.1:8080/security/resources/redir.php?url=""
-
-didDisplayInsecureContent
-CONSOLE MESSAGE: line 1: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html displayed insecure content from http://127.0.0.1:8080/security/resources/redir.php?url=""
-
-didDisplayInsecureContent
-This test opens a window that loads an insecure video(via a tricky redirect). We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
Modified: trunk/LayoutTests/platform/gtk/Skipped (102299 => 102300)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1595,11 +1595,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=73583
fullscreen/video-controls-override.html
-# https://bugs.webkit.org/show_bug.cgi?id=73743
-http/tests/security/mixedContent/insecure-video-in-main-frame.html
-http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html
-http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html
-
# https://bugs.webkit.org/show_bug.cgi?id=73769
svg/text/text-style-recalc-crash.html
Modified: trunk/LayoutTests/platform/qt/Skipped (102299 => 102300)
--- trunk/LayoutTests/platform/qt/Skipped 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-12-08 02:45:00 UTC (rev 102300)
@@ -2519,12 +2519,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=73660
fast/forms/select/listbox-in-multi-column.html
-# New test introduced in r101883 fail
-# https://bugs.webkit.org/show_bug.cgi?id=72178
-http/tests/security/mixedContent/insecure-video-in-main-frame.html
-http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html
-http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html
-
# [Qt] REGRESSION(101967): It made editing/style/iframe-onload-crash-mac.html timeout
# https://bugs.webkit.org/show_bug.cgi?id=73802
editing/style/iframe-onload-crash-mac.html
Modified: trunk/Source/WebCore/ChangeLog (102299 => 102300)
--- trunk/Source/WebCore/ChangeLog 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/ChangeLog 2011-12-08 02:45:00 UTC (rev 102300)
@@ -1,3 +1,25 @@
+2011-12-07 Aaron Colwell <[email protected]>
+
+ Revert mixed content handling for video fix and follow-up test expectations & Skipped changes.
+ (r101883, r101918, r101927, r101981, r101986, r101997)
+ https://bugs.webkit.org/show_bug.cgi?id=72178
+
+ Reviewed by Adam Barth.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequest):
+ * loader/cache/CachedRawResource.cpp:
+ * loader/cache/CachedRawResource.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::defaultPriorityForResourceType):
+ (WebCore::cachedResourceTypeToTargetType):
+ * loader/cache/CachedResource.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::createResource):
+ (WebCore::CachedResourceLoader::checkInsecureContent):
+ (WebCore::CachedResourceLoader::canRequest):
+ (WebCore::CachedResourceLoader::requestResource):
+
2011-12-07 Ryuan Choi <[email protected]>
[EFL] Introduce AssertMatchingEnums.cpp.
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (102299 => 102300)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2011-12-08 02:45:00 UTC (rev 102300)
@@ -128,16 +128,10 @@
{
// Store the previous URL because the call to ResourceLoader::willSendRequest will modify it.
KURL previousURL = request().url();
- CachedResource::Type requestTypeForCanRequest = m_resource->type();
-
-#if PLATFORM(CHROMIUM)
- if (requestTypeForCanRequest == CachedResource::RawResource)
- requestTypeForCanRequest = CachedResource::targetTypeToCachedResourceType(request().targetType());
-#endif
-
+
ResourceLoader::willSendRequest(newRequest, redirectResponse);
if (!previousURL.isNull() && !newRequest.isNull() && previousURL != newRequest.url()) {
- if (!m_document->cachedResourceLoader()->canRequest(requestTypeForCanRequest, newRequest.url())) {
+ if (!m_document->cachedResourceLoader()->canRequest(m_resource->type(), newRequest.url())) {
cancel();
return;
}
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (102299 => 102300)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2011-12-08 02:45:00 UTC (rev 102300)
@@ -41,12 +41,6 @@
{
}
-CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest, Type type)
- : CachedResource(resourceRequest, type)
- , m_dataLength(0)
-{
-}
-
void CachedRawResource::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
{
CachedResourceHandle<CachedRawResource> protect(this);
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (102299 => 102300)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2011-12-08 02:45:00 UTC (rev 102300)
@@ -30,8 +30,7 @@
class CachedRawResource : public CachedResource {
public:
- explicit CachedRawResource(ResourceRequest&);
- CachedRawResource(ResourceRequest&, Type);
+ CachedRawResource(ResourceRequest&);
// FIXME: AssociatedURLLoader shouldn't be a DocumentThreadableLoader and therefore shouldn't
// use CachedRawResource. However, it is, and it needs to be able to defer loading.
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (102299 => 102300)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2011-12-08 02:45:00 UTC (rev 102300)
@@ -74,10 +74,6 @@
case CachedResource::LinkSubresource:
return ResourceLoadPriorityVeryLow;
#endif
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
- return ResourceLoadPriorityMedium;
-#endif
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
return ResourceLoadPriorityLow;
@@ -116,10 +112,6 @@
case CachedResource::LinkSubresource:
return ResourceRequest::TargetIsSubresource;
#endif
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
- return ResourceRequest::TargetIsMedia;
-#endif
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
return ResourceRequest::TargetIsTextTrack;
@@ -128,51 +120,8 @@
ASSERT_NOT_REACHED();
return ResourceRequest::TargetIsSubresource;
}
-
-CachedResource::Type CachedResource::targetTypeToCachedResourceType(ResourceRequest::TargetType type)
-{
- switch (type) {
- case ResourceRequest::TargetIsStyleSheet:
- return CachedResource::CSSStyleSheet;
- case ResourceRequest::TargetIsScript:
- return CachedResource::Script;
- case ResourceRequest::TargetIsFontResource:
- return CachedResource::FontResource;
- case ResourceRequest::TargetIsImage:
- case ResourceRequest::TargetIsFavicon:
- return CachedResource::ImageResource;
- case ResourceRequest::TargetIsSubresource:
- return CachedResource::RawResource;
- case ResourceRequest::TargetIsWorker:
- case ResourceRequest::TargetIsSharedWorker:
- return CachedResource::Script;
- case ResourceRequest::TargetIsObject:
- case ResourceRequest::TargetIsMainFrame:
- case ResourceRequest::TargetIsSubframe:
- case ResourceRequest::TargetIsXHR:
- case ResourceRequest::TargetIsUnspecified:
- return CachedResource::RawResource;
-#if ENABLE(LINK_PREFETCH)
- case ResourceRequest::TargetIsPrefetch:
- return CachedResource::LinkPrefetch;
- case ResourceRequest::TargetIsPrerender:
- return CachedResource::LinkPrerender;
#endif
-#if ENABLE(VIDEO)
- case ResourceRequest::TargetIsMedia:
- return CachedResource::MediaResource;
-#endif
-#if ENABLE(VIDEO_TRACK)
- case ResourceRequest::TargetIsTextTrack:
- return CachedResource::TextTrackResource;
-#endif
- }
- ASSERT_NOT_REACHED();
- return CachedResource::RawResource;
-}
-#endif
-
DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, cachedResourceLeakCounter, ("CachedResource"));
CachedResource::CachedResource(const ResourceRequest& request, Type type)
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (102299 => 102300)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2011-12-08 02:45:00 UTC (rev 102300)
@@ -79,9 +79,6 @@
#if ENABLE(CSS_SHADERS)
, ShaderResource
#endif
-#if ENABLE(VIDEO)
- , MediaResource
-#endif
};
enum Status {
@@ -241,8 +238,6 @@
virtual void didSendData(unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
#if PLATFORM(CHROMIUM)
virtual void didDownloadData(int) { }
-
- static Type targetTypeToCachedResourceType(ResourceRequest::TargetType);
#endif
void setLoadFinishTime(double finishTime) { m_loadFinishTime = finishTime; }
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (102299 => 102300)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-12-08 02:27:22 UTC (rev 102299)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2011-12-08 02:45:00 UTC (rev 102300)
@@ -88,10 +88,6 @@
case CachedResource::LinkSubresource:
return new CachedResource(request, CachedResource::LinkSubresource);
#endif
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
- return new CachedRawResource(request, CachedResource::MediaResource);
-#endif
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
return new CachedTextTrack(request);
@@ -257,9 +253,6 @@
if (!f->loader()->checkIfRunInsecureContent(m_document->securityOrigin(), url))
return false;
break;
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
-#endif
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
#endif
@@ -311,9 +304,6 @@
case CachedResource::LinkPrerender:
case CachedResource::LinkSubresource:
#endif
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
-#endif
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
#endif
@@ -379,11 +369,8 @@
case CachedResource::LinkSubresource:
#endif
break;
-#if ENABLE(VIDEO)
- case CachedResource::MediaResource:
#if ENABLE(VIDEO_TRACK)
case CachedResource::TextTrackResource:
-#endif
// Cues aren't called out in the CPS spec yet, but they only work with a media element
// so use the media policy.
if (!m_document->contentSecurityPolicy()->allowMediaFromSource(url))
@@ -415,14 +402,7 @@
if (!url.isValid())
return 0;
- CachedResource::Type requestTypeForCanRequest = type;
-
-#if PLATFORM(CHROMIUM)
- if (requestTypeForCanRequest == CachedResource::RawResource)
- requestTypeForCanRequest = CachedResource::targetTypeToCachedResourceType(request.targetType());
-#endif
-
- if (!canRequest(requestTypeForCanRequest, url, forPreload))
+ if (!canRequest(type, url, forPreload))
return 0;
if (memoryCache()->disabled()) {
