Source/core/html/HTMLVideoElement.cpp - Issue 291873002: Eliminate MediaPlayer & MediaPlayerClient abstractions

Unified Diff: Source/core/html/HTMLVideoElement.cpp

Issue 291873002: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Removed one more unused method Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/html/HTMLVideoElement.cpp

diff --git a/Source/core/html/HTMLVideoElement.cpp b/Source/core/html/HTMLVideoElement.cpp

index a4e2c608f0bcc3b3d96c955f0e557763541993c6..171547d5172476adf3665a82cb156d1410788c11 100644

--- a/Source/core/html/HTMLVideoElement.cpp

+++ b/Source/core/html/HTMLVideoElement.cpp

@@ -43,6 +43,7 @@

namespace WebCore {

using namespace HTMLNames;

+using blink::WebMediaPlayer;

acolwell GONE FROM CHROMIUM 2014/05/20 16:40:21 nit: Please just add blink:: to the one usage belo

inline HTMLVideoElement::HTMLVideoElement(Document& document)

: HTMLMediaElement(videoTag, document)

@@ -126,7 +127,7 @@ bool HTMLVideoElement::supportsFullscreen() const

if (!document().page())

return false;

- if (!player())

+ if (!webMediaPlayer())

return false;

return true;

@@ -134,16 +135,18 @@ bool HTMLVideoElement::supportsFullscreen() const

unsigned HTMLVideoElement::videoWidth() const

{

- if (!player())

+ if (!webMediaPlayer())

return 0;

- return player()->naturalSize().width();

+ IntSize playerSize = webMediaPlayer()->naturalSize();

acolwell GONE FROM CHROMIUM 2014/05/20 16:40:21 nit: Just inline this below since nothing else use

+ return playerSize.width();

}

unsigned HTMLVideoElement::videoHeight() const

{

- if (!player())

+ if (!webMediaPlayer())

return 0;

- return player()->naturalSize().height();

+ IntSize playerSize = webMediaPlayer()->naturalSize();

+ return playerSize.height();

acolwell GONE FROM CHROMIUM 2014/05/20 16:40:21 ditto

}

bool HTMLVideoElement::isURLAttribute(const Attribute& attribute) const

@@ -204,10 +207,10 @@ bool HTMLVideoElement::copyVideoTextureToPlatformTexture(blink::WebGraphicsConte

bool HTMLVideoElement::hasAvailableVideoFrame() const

{

- if (!player())

+ if (!webMediaPlayer())

return false;

- return player()->hasVideo() && player()->readyState() >= MediaPlayer::HaveCurrentData;

+ return webMediaPlayer()->hasVideo() && webMediaPlayer()->readyState() >= WebMediaPlayer::ReadyStateHaveCurrentData;

}

void HTMLVideoElement::webkitEnterFullscreen(ExceptionState& exceptionState)

@@ -248,18 +251,18 @@ void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument)

unsigned HTMLVideoElement::webkitDecodedFrameCount() const

{

- if (!player())

+ if (!webMediaPlayer())

return 0;

- return player()->decodedFrameCount();

+ return webMediaPlayer()->decodedFrameCount();

}

unsigned HTMLVideoElement::webkitDroppedFrameCount() const

{

- if (!player())

+ if (!webMediaPlayer())

return 0;

- return player()->droppedFrameCount();

+ return webMediaPlayer()->droppedFrameCount();

}

KURL HTMLVideoElement::posterImageURL() const

@@ -297,7 +300,7 @@ PassRefPtr<Image> HTMLVideoElement::getSourceImageForCanvas(SourceImageMode mode

bool HTMLVideoElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const

{

- return !hasSingleSecurityOrigin() || (!(player() && player()->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSrc()));

+ return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSrc()));

}

FloatSize HTMLVideoElement::sourceSize() const

« no previous file with comments | « Source/core/html/HTMLVideoElement.h ('k') | Source/core/rendering/RenderVideo.cpp » ('j') | Source/core/rendering/RenderVideo.cpp » ('J')