diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 17:36:26 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 17:36:26 +0000 |
| commit | afc4ce91f94bc0cb976884e1c1c785a9e75f127a (patch) | |
| tree | 0c64c063fe026abd1f2a81a97fe04b9dfd514702 /webkit/glue/webmediaplayer_impl.cc | |
| parent | 73689e53255c6ac22a90b0cd01fe40180ec2bbba (diff) | |
| download | chromium_src-afc4ce91f94bc0cb976884e1c1c785a9e75f127a.zip chromium_src-afc4ce91f94bc0cb976884e1c1c785a9e75f127a.tar.gz chromium_src-afc4ce91f94bc0cb976884e1c1c785a9e75f127a.tar.bz2 | |
Eliminate skia::PlatformCanvas, a subclass of SkCanvas. Skia provides multiple types of SkCanvas classes that we would like to use. Unfortunately these classes are implemented as subclasses of SkCanvas. Subclassing SkCanvas in both Skia and Chromium makes it impossible to dynamically use any SkCanvas. There is also no reason for chromium to subclass SkCanvas. Most of the extra functionalities can be implemented by hanging meta-data from SkCanvas.
We cannot eliminate skia::PlatformCanvas in one step due to WebKit's dependency on skia::PlatformCanvas. WebKit::WebCanvas is typedef as skia::PlatformDevice. It should be SkCanvas. So we need to do it in multiple steps:
1. Prepare Chromium tree for the change in WebKit::WebCanvas tyepdef. This basically means adding a couple of static_cast<skia::PlatformCanvas>(WebCanvas).
2. Change WebKit::WebCanvas typedef from skia::PlatformCanvas to SkCanvas
3. Eliminate skia::PlatformCanvas in chromium
This CL accomplishes the first step on windows.
WebKit BUG=https://bugs.webkit.org/show_bug.cgi?id=57563
Review URL: http://codereview.chromium.org/6783023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index c01b331..e204be6 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -22,7 +22,6 @@ #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/rtc_video_decoder.h" #include "media/filters/null_audio_renderer.h" -#include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" @@ -124,7 +123,7 @@ WebDataSourceBuildObserverHack* WebMediaPlayerImpl::Proxy::GetBuildObserver() { return build_observer_.get(); } -void WebMediaPlayerImpl::Proxy::Paint(skia::PlatformCanvas* canvas, +void WebMediaPlayerImpl::Proxy::Paint(SkCanvas* canvas, const gfx::Rect& dest_rect) { DCHECK(MessageLoop::current() == render_loop_); if (video_renderer_) { |