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

Unified Diff: webkit/plugins/ppapi/ppb_image_data_impl.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 | « webkit/plugins/ppapi/plugin_delegate.h ('k') | webkit/tools/test_shell/webwidget_host_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_image_data_impl.h
===================================================================
--- webkit/plugins/ppapi/ppb_image_data_impl.h (revision 167659)
+++ webkit/plugins/ppapi/ppb_image_data_impl.h (working copy)
@@ -15,11 +15,8 @@
#include "webkit/plugins/ppapi/plugin_delegate.h"
#include "webkit/plugins/webkit_plugins_export.h"
-namespace skia {
-class PlatformCanvas;
-}
-
class SkBitmap;
+class SkCanvas;
namespace webkit {
namespace ppapi {
@@ -42,7 +39,7 @@
virtual void* Map() = 0;
virtual void Unmap() = 0;
virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) = 0;
- virtual skia::PlatformCanvas* GetPlatformCanvas() = 0;
+ virtual SkCanvas* GetPlatformCanvas() = 0;
virtual SkCanvas* GetCanvas() = 0;
virtual const SkBitmap* GetMappedBitmap() const = 0;
};
@@ -92,7 +89,7 @@
virtual void* Map() OVERRIDE;
virtual void Unmap() OVERRIDE;
virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
- virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+ virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
virtual SkCanvas* GetCanvas() OVERRIDE;
const SkBitmap* GetMappedBitmap() const;
@@ -119,7 +116,7 @@
virtual void* Map() OVERRIDE;
virtual void Unmap() OVERRIDE;
virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
- virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+ virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
virtual SkCanvas* GetCanvas() OVERRIDE;
virtual const SkBitmap* GetMappedBitmap() const OVERRIDE;
@@ -129,7 +126,7 @@
scoped_ptr<PluginDelegate::PlatformImage2D> platform_image_;
// When the device is mapped, this is the image. Null when umapped.
- scoped_ptr<skia::PlatformCanvas> mapped_canvas_;
+ scoped_ptr<SkCanvas> mapped_canvas_;
DISALLOW_COPY_AND_ASSIGN(ImageDataPlatformBackend);
};
@@ -147,7 +144,7 @@
virtual void* Map() OVERRIDE;
virtual void Unmap() OVERRIDE;
virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
- virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+ virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
virtual SkCanvas* GetCanvas() OVERRIDE;
virtual const SkBitmap* GetMappedBitmap() const OVERRIDE;
« no previous file with comments | « webkit/plugins/ppapi/plugin_delegate.h ('k') | webkit/tools/test_shell/webwidget_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698