diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 14:28:35 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 14:28:35 +0000 |
| commit | 62f2e80c79f7d660d7871b14287cef9082fcc32f (patch) | |
| tree | 310edb9b2c0aa8409defc654979719cb4d8a4059 /webkit/glue | |
| parent | c89b244483969aa8859a1d4bb3396f6ceb54f875 (diff) | |
| download | chromium_src-62f2e80c79f7d660d7871b14287cef9082fcc32f.zip chromium_src-62f2e80c79f7d660d7871b14287cef9082fcc32f.tar.gz chromium_src-62f2e80c79f7d660d7871b14287cef9082fcc32f.tar.bz2 | |
This change implements a first pass in the effort to remove the dependency of PlatformDevice within Chrome. The Skia library now provides multiple back-ends for the SkDevice class, so PlatformDevice's inheritance of SkDevice, and the assumption of instances of PlatformDevice limits the use of these new back-ends.
A new set of helper functions is provided for the PlatformDevice entry points. Upon construction of a PlatformDevice, a pointer to the interface is cached in the parent SkDevice's SkMetaData. The new helper functions forward calls to the interface cached in the metadata.
BUG=NONE
TEST=NONE
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86625
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=86625
Review URL: http://codereview.chromium.org/7019013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 1593c35..6e43e8b88 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -403,7 +403,7 @@ WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { #if WEBKIT_USING_SKIA return canvas; #elif WEBKIT_USING_CG - return canvas->getTopPlatformDevice().GetBitmapContext(); + return skia::GetBitmapContext(skia::GetTopDevice(*canvas)); #else NOTIMPLEMENTED(); return NULL; diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 8b83468..a8fe341 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -687,8 +687,8 @@ void WebMediaPlayerImpl::paint(WebCanvas* canvas, // Copy the frame rendered to our temporary skia canvas onto the passed in // canvas. - skia_canvas_->getTopPlatformDevice().DrawToContext(canvas, 0, 0, - &normalized_cgrect); + skia::DrawToNativeContext(skia_canvas_.get(), canvas, 0, 0, + &normalized_cgrect); CGContextRestoreGState(canvas); #else |