diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 03:12:40 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 03:12:40 +0000 |
| commit | 64a44dc67d3ee535f6dba0afa1db761320bbfe2e (patch) | |
| tree | 09e69ee7fc045feb5310298a671bcb18dbb4b818 | |
| parent | 9eb09ff76df1a01e34780a07e30d1df7ffe1c0be (diff) | |
| download | chromium_src-64a44dc67d3ee535f6dba0afa1db761320bbfe2e.zip chromium_src-64a44dc67d3ee535f6dba0afa1db761320bbfe2e.tar.gz chromium_src-64a44dc67d3ee535f6dba0afa1db761320bbfe2e.tar.bz2 | |
Use ifdef to take away the paint method for media player from mac
Since mac doesn't use skia, there's no WebCanvas, so disable everything
using WebCanvas for mac.
TBR=scherkus, darin
Review URL: http://codereview.chromium.org/113076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15498 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/webmediaplayer_impl.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/webmediaplayer_impl.h | 3 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayerclient_impl.cc | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/chrome/renderer/webmediaplayer_impl.cc b/chrome/renderer/webmediaplayer_impl.cc index 7e78eaa..ed07d19 100644 --- a/chrome/renderer/webmediaplayer_impl.cc +++ b/chrome/renderer/webmediaplayer_impl.cc @@ -288,6 +288,8 @@ void WebMediaPlayerImpl::setSize(const WebSize& size) { } } +// TODO(hclam): enable this for mac. +#if WEBKIT_USING_SKIA void WebMediaPlayerImpl::paint(skia::PlatformCanvas* canvas, const WebRect& rect) { DCHECK(main_loop_ && MessageLoop::current() == main_loop_); @@ -296,6 +298,7 @@ void WebMediaPlayerImpl::paint(skia::PlatformCanvas* canvas, video_renderer_->Paint(canvas, rect); } } +#endif void WebMediaPlayerImpl::WillDestroyCurrentMessageLoop() { pipeline_.Stop(); diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h index 3e263d5..e7ee2f2 100644 --- a/chrome/renderer/webmediaplayer_impl.h +++ b/chrome/renderer/webmediaplayer_impl.h @@ -93,7 +93,10 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, // Methods for painting. virtual void setSize(const WebKit::WebSize& size); + // TODO(hclam): enable this for mac. +#if WEBKIT_USING_SKIA virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect); +#endif // True if a video is loaded. virtual bool hasVideo() const; diff --git a/webkit/glue/webmediaplayerclient_impl.cc b/webkit/glue/webmediaplayerclient_impl.cc index ebd2e57..2831f61 100644 --- a/webkit/glue/webmediaplayerclient_impl.cc +++ b/webkit/glue/webmediaplayerclient_impl.cc @@ -270,10 +270,13 @@ void WebMediaPlayerClientImpl::setSize(const IntSize& size) { void WebMediaPlayerClientImpl::paint(GraphicsContext* context, const IntRect& rect) { +// TODO(hclam): enable this for mac. +#if WEBKIT_USING_SKIA if (m_webMediaPlayer) m_webMediaPlayer->paint( context->platformContext()->canvas(), WebRect(rect.x(), rect.y(), rect.width(), rect.height())); +#endif } void WebMediaPlayerClientImpl::setAutobuffer(bool autoBuffer) { |