Diff
Modified: trunk/LayoutTests/ChangeLog (119711 => 119712)
--- trunk/LayoutTests/ChangeLog 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/LayoutTests/ChangeLog 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,3 +1,16 @@
+2012-06-07 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r119694.
+ http://trac.webkit.org/changeset/119694
+ https://bugs.webkit.org/show_bug.cgi?id=88529
+
+ it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
+ (Requested by loislo on #webkit).
+
+ * http/tests/security/resources/video-cross-origin-allow.php: Removed.
+ * http/tests/security/video-cross-origin-readback-expected.txt: Removed.
+ * http/tests/security/video-cross-origin-readback.html: Removed.
+
2012-06-07 Shinya Kawanaka <shin...@chromium.org>
Delete a contenteditable element having a Shadow DOM causes a crash.
Deleted: trunk/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php (119711 => 119712)
--- trunk/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/LayoutTests/http/tests/security/resources/video-cross-origin-allow.php 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,13 +0,0 @@
-<?php
-
-header("Access-Control-Allow-Origin: *");
-
-if ($_SERVER['REQUEST_METHOD'] == "OPTIONS") {
- header("Access-Control-Allow-Methods: GET");
- header("Access-Control-Allow-Headers: origin, accept-encoding, referer, range");
- exit;
-}
-
-@include("../../media/resources/serve-video.php");
-
-?>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/security/video-cross-origin-readback-expected.txt (119711 => 119712)
--- trunk/LayoutTests/http/tests/security/video-cross-origin-readback-expected.txt 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/LayoutTests/http/tests/security/video-cross-origin-readback-expected.txt 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,3 +0,0 @@
-EVENT(playing)
-END OF TEST
-
Deleted: trunk/LayoutTests/http/tests/security/video-cross-origin-readback.html (119711 => 119712)
--- trunk/LayoutTests/http/tests/security/video-cross-origin-readback.html 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/LayoutTests/http/tests/security/video-cross-origin-readback.html 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,33 +0,0 @@
-<html>
- <body _onload_="start()">
- <script src=""
- <script src=""
- <script>
- waitForEvent('error', function() {
- failTest("error: " + JSON.stringify(video.error));
- });
-
- waitForEvent('playing', function() {
- try {
- var ctx = document.getElementsByTagName('canvas')[0].getContext("2d");
- ctx.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
- ctx.getImageData(0, 0, video.videoWidth, video.videoHeight);
- } catch (e) {
- failTest("Caught error: " + e);
- }
- endTest();
- });
-
- function start() {
- findMediaElement();
- var mediaFile = findMediaFile("video", "../../media/resources/test");
- var type = mimeTypeForExtension(mediaFile.split('.').pop());
- video.src = "" + mediaFile + "&type=" + type;
- video.play();
- }
- </script>
-
- <video crossorigin></video>
- <canvas></canvas>
- </body>
-</head>
Modified: trunk/Source/WebCore/ChangeLog (119711 => 119712)
--- trunk/Source/WebCore/ChangeLog 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/ChangeLog 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,3 +1,22 @@
+2012-06-07 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r119694.
+ http://trac.webkit.org/changeset/119694
+ https://bugs.webkit.org/show_bug.cgi?id=88529
+
+ it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
+ (Requested by loislo on #webkit).
+
+ * html/HTMLMediaElement.cpp:
+ * html/HTMLMediaElement.h:
+ (HTMLMediaElement):
+ * html/canvas/CanvasRenderingContext.cpp:
+ (WebCore::CanvasRenderingContext::wouldTaintOrigin):
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/MediaPlayer.h:
+ (MediaPlayer):
+ * platform/graphics/MediaPlayerPrivate.h:
+
2012-06-07 Shinya Kawanaka <shin...@chromium.org>
Delete a contenteditable element having a Shadow DOM causes a crash.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (119711 => 119712)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-06-07 12:56:04 UTC (rev 119712)
@@ -4456,15 +4456,6 @@
}
-MediaPlayerClient::CORSMode HTMLMediaElement::mediaPlayerCORSMode() const
-{
- if (!fastHasAttribute(HTMLNames::crossoriginAttr))
- return Unspecified;
- if (equalIgnoringCase(fastGetAttribute(HTMLNames::crossoriginAttr), "use-credentials"))
- return UseCredentials;
- return Anonymous;
-}
-
bool HTMLMediaElement::mediaPlayerNeedsSiteSpecificHacks() const
{
Settings* settings = document()->settings();
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (119711 => 119712)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2012-06-07 12:56:04 UTC (rev 119712)
@@ -427,7 +427,6 @@
virtual String mediaPlayerReferrer() const OVERRIDE;
virtual String mediaPlayerUserAgent() const OVERRIDE;
- virtual CORSMode mediaPlayerCORSMode() const OVERRIDE;
virtual bool mediaPlayerNeedsSiteSpecificHacks() const OVERRIDE;
virtual String mediaPlayerDocumentHost() const OVERRIDE;
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp (119711 => 119712)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp 2012-06-07 12:56:04 UTC (rev 119712)
@@ -77,12 +77,11 @@
if (!video || !canvas()->originClean())
return false;
- if (!video->hasSingleSecurityOrigin())
+ if (wouldTaintOrigin(video->currentSrc()))
return true;
- if (!(video->player() && video->player()->didPassCORSAccessCheck()) && wouldTaintOrigin(video->currentSrc()))
+ if (!video->hasSingleSecurityOrigin())
return true;
-
#else
UNUSED_PARAM(video);
#endif
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (119711 => 119712)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-06-07 12:56:04 UTC (rev 119712)
@@ -834,11 +834,6 @@
return m_private->hasSingleSecurityOrigin();
}
-bool MediaPlayer::didPassCORSAccessCheck() const
-{
- return m_private->didPassCORSAccessCheck();
-}
-
MediaPlayer::MovieLoadType MediaPlayer::movieLoadType() const
{
return m_private->movieLoadType();
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (119711 => 119712)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-06-07 12:56:04 UTC (rev 119712)
@@ -101,8 +101,6 @@
class MediaPlayerClient {
public:
- enum CORSMode { Unspecified, Anonymous, UseCredentials };
-
virtual ~MediaPlayerClient() { }
// Get the document which the media player is owned by
@@ -180,7 +178,6 @@
virtual String mediaPlayerReferrer() const { return String(); }
virtual String mediaPlayerUserAgent() const { return String(); }
- virtual CORSMode mediaPlayerCORSMode() const { return Unspecified; }
};
class MediaPlayerSupportsTypeClient {
@@ -357,8 +354,6 @@
bool hasSingleSecurityOrigin() const;
- bool didPassCORSAccessCheck() const;
-
float mediaTimeForTimeValue(float) const;
double maximumDurationToCacheMediaTime() const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (119711 => 119712)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-06-07 12:56:04 UTC (rev 119712)
@@ -135,8 +135,6 @@
virtual bool hasSingleSecurityOrigin() const { return false; }
- virtual bool didPassCORSAccessCheck() const { return false; }
-
virtual MediaPlayer::MovieLoadType movieLoadType() const { return MediaPlayer::Unknown; }
virtual void prepareForRendering() { }
Modified: trunk/Source/WebKit/chromium/ChangeLog (119711 => 119712)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-07 12:56:04 UTC (rev 119712)
@@ -1,5 +1,22 @@
2012-06-07 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r119694.
+ http://trac.webkit.org/changeset/119694
+ https://bugs.webkit.org/show_bug.cgi?id=88529
+
+ it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
+ (Requested by loislo on #webkit).
+
+ * public/WebMediaPlayer.h:
+ (WebMediaPlayer):
+ * src/AssertMatchingEnums.cpp:
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::loadInternal):
+ * src/WebMediaPlayerClientImpl.h:
+ (WebMediaPlayerClientImpl):
+
+2012-06-07 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r119689.
http://trac.webkit.org/changeset/119689
https://bugs.webkit.org/show_bug.cgi?id=88516
Modified: trunk/Source/WebKit/chromium/public/WebMediaPlayer.h (119711 => 119712)
--- trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2012-06-07 12:56:04 UTC (rev 119712)
@@ -108,7 +108,7 @@
virtual ~WebMediaPlayer() {}
- virtual void load(const WebURL&, CORSMode) = 0;
+ virtual void load(const WebURL&) = 0;
virtual void cancelLoad() = 0;
// Playback controls.
@@ -154,7 +154,6 @@
virtual unsigned long long totalBytes() const = 0;
virtual bool hasSingleSecurityOrigin() const = 0;
- virtual bool didPassCORSAccessCheck() const = 0;
virtual MovieLoadType movieLoadType() const = 0;
virtual float mediaTimeForTimeValue(float timeValue) const = 0;
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (119711 => 119712)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-06-07 12:56:04 UTC (rev 119712)
@@ -581,7 +581,3 @@
COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_0_9, ResourceResponse::HTTP_0_9);
COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_0, ResourceResponse::HTTP_1_0);
COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_1, ResourceResponse::HTTP_1_1);
-
-COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeUnspecified, MediaPlayerClient::Unspecified);
-COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeAnonymous, MediaPlayerClient::Anonymous);
-COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeUseCredentials, MediaPlayerClient::UseCredentials);
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (119711 => 119712)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-06-07 12:56:04 UTC (rev 119712)
@@ -318,9 +318,7 @@
// Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
#endif
- m_webMediaPlayer->load(
- KURL(ParsedURLString, m_url),
- static_cast<WebMediaPlayer::CORSMode>(m_mediaPlayer->mediaPlayerClient()->mediaPlayerCORSMode()));
+ m_webMediaPlayer->load(KURL(ParsedURLString, m_url));
}
}
@@ -664,13 +662,6 @@
return false;
}
-bool WebMediaPlayerClientImpl::didPassCORSAccessCheck() const
-{
- if (m_webMediaPlayer)
- return m_webMediaPlayer->didPassCORSAccessCheck();
- return false;
-}
-
MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const
{
if (m_webMediaPlayer)
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (119711 => 119712)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-06-07 12:22:40 UTC (rev 119711)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-06-07 12:56:04 UTC (rev 119712)
@@ -131,7 +131,6 @@
virtual void paintCurrentFrameInContext(WebCore::GraphicsContext*, const WebCore::IntRect&);
virtual void setPreload(WebCore::MediaPlayer::Preload);
virtual bool hasSingleSecurityOrigin() const;
- virtual bool didPassCORSAccessCheck() const;
virtual WebCore::MediaPlayer::MovieLoadType movieLoadType() const;
virtual float mediaTimeForTimeValue(float timeValue) const;
virtual unsigned decodedFrameCount() const;
