diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 16:16:02 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 16:16:02 +0000 |
| commit | f2d4c672b6d6b80e376cff979b1ec28864b73fb6 (patch) | |
| tree | 679a4a8178438947f2775a6d1ba5540be99ce00c /webkit/tools/test_shell/mac/webwidget_host.mm | |
| parent | 49578ea329dae7f711ca1cde1ecade01e19a4f1b (diff) | |
| download | chromium_src-f2d4c672b6d6b80e376cff979b1ec28864b73fb6.zip chromium_src-f2d4c672b6d6b80e376cff979b1ec28864b73fb6.tar.gz chromium_src-f2d4c672b6d6b80e376cff979b1ec28864b73fb6.tar.bz2 | |
Revert 86625 - 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
Review URL: http://codereview.chromium.org/7019013
TBR=twiz@chromium.org
Review URL: http://codereview.chromium.org/6987019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/mac/webwidget_host.mm')
| -rw-r--r-- | webkit/tools/test_shell/mac/webwidget_host.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index 7610644..7677dbf 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -179,7 +179,7 @@ void WebWidgetHost::Paint() { // make sure webkit draws into our bitmap, not the window CGContextRef bitmap_context = - skia::GetBitmapContext(skia::GetTopDevice(*canvas_)); + canvas_->getTopPlatformDevice().GetBitmapContext(); [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithGraphicsPort:bitmap_context flipped:YES]]; @@ -221,8 +221,8 @@ void WebWidgetHost::Paint() { int bitmap_width = CGBitmapContextGetWidth(bitmap_context); CGRect bitmap_rect = { { 0, 0 }, { bitmap_width, bitmap_height } }; - skia::DrawToNativeContext(canvas_.get(), context, 0, - client_rect.height() - bitmap_height, &bitmap_rect); + canvas_->getTopPlatformDevice().DrawToContext( + context, 0, client_rect.height() - bitmap_height, &bitmap_rect); [view_ unlockFocus]; } |