Changeset 119712 in webkit


Ignore:
Timestamp:
Jun 7, 2012 5:56:04 AM (12 years ago)
Author:
loislo@chromium.org
Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-06-07

Source/WebCore:

  • 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:

Source/WebKit/chromium:

  • public/WebMediaPlayer.h:

(WebMediaPlayer):

  • src/AssertMatchingEnums.cpp:
  • src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::loadInternal):

  • src/WebMediaPlayerClientImpl.h:

(WebMediaPlayerClientImpl):

LayoutTests:

  • 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.
Location:
trunk
Files:
3 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r119711 r119712  
     12012-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r119694.
     4        http://trac.webkit.org/changeset/119694
     5        https://bugs.webkit.org/show_bug.cgi?id=88529
     6
     7        it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
     8        (Requested by loislo on #webkit).
     9
     10        * http/tests/security/resources/video-cross-origin-allow.php: Removed.
     11        * http/tests/security/video-cross-origin-readback-expected.txt: Removed.
     12        * http/tests/security/video-cross-origin-readback.html: Removed.
     13
    1142012-06-07  Shinya Kawanaka  <shinyak@chromium.org>
    215

  • trunk/Source/WebCore/ChangeLog

    r119711 r119712  
     12012-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r119694.
     4        http://trac.webkit.org/changeset/119694
     5        https://bugs.webkit.org/show_bug.cgi?id=88529
     6
     7        it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
     8        (Requested by loislo on #webkit).
     9
     10        * html/HTMLMediaElement.cpp:
     11        * html/HTMLMediaElement.h:
     12        (HTMLMediaElement):
     13        * html/canvas/CanvasRenderingContext.cpp:
     14        (WebCore::CanvasRenderingContext::wouldTaintOrigin):
     15        * platform/graphics/MediaPlayer.cpp:
     16        * platform/graphics/MediaPlayer.h:
     17        (MediaPlayer):
     18        * platform/graphics/MediaPlayerPrivate.h:
     19
    1202012-06-07  Shinya Kawanaka  <shinyak@chromium.org>
    221

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r119694 r119712  
    44574457}
    44584458
    4459 MediaPlayerClient::CORSMode HTMLMediaElement::mediaPlayerCORSMode() const
    4460 {
    4461     if (!fastHasAttribute(HTMLNames::crossoriginAttr))
    4462         return Unspecified;
    4463     if (equalIgnoringCase(fastGetAttribute(HTMLNames::crossoriginAttr), "use-credentials"))
    4464         return UseCredentials;
    4465     return Anonymous;
    4466 }
    4467 
    44684459bool HTMLMediaElement::mediaPlayerNeedsSiteSpecificHacks() const
    44694460{

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r119694 r119712  
    428428    virtual String mediaPlayerReferrer() const OVERRIDE;
    429429    virtual String mediaPlayerUserAgent() const OVERRIDE;
    430     virtual CORSMode mediaPlayerCORSMode() const OVERRIDE;
    431430
    432431    virtual bool mediaPlayerNeedsSiteSpecificHacks() const OVERRIDE;

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp

    r119694 r119712  
    7878        return false;
    7979
     80    if (wouldTaintOrigin(video->currentSrc()))
     81        return true;
     82
    8083    if (!video->hasSingleSecurityOrigin())
    8184        return true;
    82 
    83     if (!(video->player() && video->player()->didPassCORSAccessCheck()) && wouldTaintOrigin(video->currentSrc()))
    84         return true;
    85 
    8685#else
    8786    UNUSED_PARAM(video);

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r119694 r119712  
    835835}
    836836
    837 bool MediaPlayer::didPassCORSAccessCheck() const
    838 {
    839     return m_private->didPassCORSAccessCheck();
    840 }
    841 
    842837MediaPlayer::MovieLoadType MediaPlayer::movieLoadType() const
    843838{

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.h

    r119694 r119712  
    102102class MediaPlayerClient {
    103103public:
    104     enum CORSMode { Unspecified, Anonymous, UseCredentials };
    105 
    106104    virtual ~MediaPlayerClient() { }
    107105
    … …  
    181179    virtual String mediaPlayerReferrer() const { return String(); }
    182180    virtual String mediaPlayerUserAgent() const { return String(); }
    183     virtual CORSMode mediaPlayerCORSMode() const { return Unspecified; }
    184181};
    185182
    … …  
    357354
    358355    bool hasSingleSecurityOrigin() const;
    359 
    360     bool didPassCORSAccessCheck() const;
    361356
    362357    float mediaTimeForTimeValue(float) const;

  • trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

    r119694 r119712  
    136136    virtual bool hasSingleSecurityOrigin() const { return false; }
    137137
    138     virtual bool didPassCORSAccessCheck() const { return false; }
    139 
    140138    virtual MediaPlayer::MovieLoadType movieLoadType() const { return MediaPlayer::Unknown; }
    141139

  • trunk/Source/WebKit/chromium/ChangeLog

    r119696 r119712  
     12012-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r119694.
     4        http://trac.webkit.org/changeset/119694
     5        https://bugs.webkit.org/show_bug.cgi?id=88529
     6
     7        it broke PrerenderBrowserTest.PrerenderHTML5VideoNetwork
     8        (Requested by loislo on #webkit).
     9
     10        * public/WebMediaPlayer.h:
     11        (WebMediaPlayer):
     12        * src/AssertMatchingEnums.cpp:
     13        * src/WebMediaPlayerClientImpl.cpp:
     14        (WebKit::WebMediaPlayerClientImpl::loadInternal):
     15        * src/WebMediaPlayerClientImpl.h:
     16        (WebMediaPlayerClientImpl):
     17
    1182012-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
    219

  • trunk/Source/WebKit/chromium/public/WebMediaPlayer.h

    r119694 r119712  
    109109    virtual ~WebMediaPlayer() {}
    110110
    111     virtual void load(const WebURL&, CORSMode) = 0;
     111    virtual void load(const WebURL&) = 0;
    112112    virtual void cancelLoad() = 0;
    113113
    … …  
    155155
    156156    virtual bool hasSingleSecurityOrigin() const = 0;
    157     virtual bool didPassCORSAccessCheck() const = 0;
    158157    virtual MovieLoadType movieLoadType() const = 0;
    159158

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r119694 r119712  
    582582COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_0, ResourceResponse::HTTP_1_0);
    583583COMPILE_ASSERT_MATCHING_ENUM(WebURLResponse::HTTP_1_1, ResourceResponse::HTTP_1_1);
    584 
    585 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeUnspecified, MediaPlayerClient::Unspecified);
    586 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeAnonymous, MediaPlayerClient::Anonymous);
    587 COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::CORSModeUseCredentials, MediaPlayerClient::UseCredentials);

  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

    r119694 r119712  
    319319        m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
    320320#endif
    321         m_webMediaPlayer->load(
    322             KURL(ParsedURLString, m_url),
    323             static_cast<WebMediaPlayer::CORSMode>(m_mediaPlayer->mediaPlayerClient()->mediaPlayerCORSMode()));
     321        m_webMediaPlayer->load(KURL(ParsedURLString, m_url));
    324322    }
    325323}
    … …  
    662660    if (m_webMediaPlayer)
    663661        return m_webMediaPlayer->hasSingleSecurityOrigin();
    664     return false;
    665 }
    666 
    667 bool WebMediaPlayerClientImpl::didPassCORSAccessCheck() const
    668 {
    669     if (m_webMediaPlayer)
    670         return m_webMediaPlayer->didPassCORSAccessCheck();
    671662    return false;
    672663}

  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

    r119694 r119712  
    132132    virtual void setPreload(WebCore::MediaPlayer::Preload);
    133133    virtual bool hasSingleSecurityOrigin() const;
    134     virtual bool didPassCORSAccessCheck() const;
    135134    virtual WebCore::MediaPlayer::MovieLoadType movieLoadType() const;
    136135    virtual float mediaTimeForTimeValue(float timeValue) const;
Note: See TracChangeset for help on using the changeset viewer.