Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1044)

Unified Diff: content/plugin/webplugin_proxy.h

Issue 11138024: Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/renderer/safe_browsing/phishing_thumbnailer.cc ('k') | content/plugin/webplugin_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/webplugin_proxy.h
===================================================================
--- content/plugin/webplugin_proxy.h (revision 167659)
+++ content/plugin/webplugin_proxy.h (working copy)
@@ -27,9 +27,7 @@
#include "ui/surface/transport_dib.h"
#include "webkit/plugins/npapi/webplugin.h"
-namespace skia {
-class PlatformCanvas;
-}
+class SkCanvas;
namespace webkit {
namespace npapi {
@@ -215,7 +213,7 @@
#if defined(OS_WIN)
void CreateCanvasFromHandle(const TransportDIB::Handle& dib_handle,
const gfx::Rect& window_rect,
- SkAutoTUnref<skia::PlatformCanvas>* canvas);
+ SkAutoTUnref<SkCanvas>* canvas);
#elif defined(OS_MACOSX)
static void CreateDIBAndCGContextFromHandle(
const TransportDIB::Handle& dib_handle,
@@ -227,7 +225,7 @@
const TransportDIB::Handle& dib_handle,
const gfx::Rect& window_rect,
scoped_refptr<SharedTransportDIB>* dib_out,
- SkAutoTUnref<skia::PlatformCanvas>* canvas);
+ SkAutoTUnref<SkCanvas>* canvas);
static void CreateShmPixmapFromDIB(
TransportDIB* dib,
@@ -245,7 +243,7 @@
return windowless_contexts_[windowless_buffer_index_].get();
}
#else
- skia::PlatformCanvas* windowless_canvas() const {
+ SkCanvas* windowless_canvas() const {
return windowless_canvases_[windowless_buffer_index_].get();
}
@@ -282,7 +280,8 @@
base::mac::ScopedCFTypeRef<CGContextRef> windowless_contexts_[2];
scoped_ptr<WebPluginAcceleratedSurfaceProxy> accelerated_surface_;
#else
- SkAutoTUnref<skia::PlatformCanvas> windowless_canvases_[2];
+ SkAutoTUnref<SkCanvas> windowless_canvases_[2];
+ SkAutoTUnref<SkCanvas> background_canvas_;
#if defined(USE_X11)
scoped_refptr<SharedTransportDIB> windowless_dibs_[2];
« no previous file with comments | « chrome/renderer/safe_browsing/phishing_thumbnailer.cc ('k') | content/plugin/webplugin_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698