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

Unified Diff: content/renderer/webplugin_delegate_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 | « content/renderer/render_widget.h ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webplugin_delegate_proxy.h
===================================================================
--- content/renderer/webplugin_delegate_proxy.h (revision 167659)
+++ content/renderer/webplugin_delegate_proxy.h (working copy)
@@ -35,10 +35,6 @@
class WaitableEvent;
}
-namespace skia {
-class PlatformCanvas;
-}
-
namespace webkit {
namespace npapi {
class WebPlugin;
@@ -144,7 +140,7 @@
~SharedBitmap();
scoped_ptr<TransportDIB> dib;
- scoped_ptr<skia::PlatformCanvas> canvas;
+ scoped_ptr<SkCanvas> canvas;
};
// Message handlers for messages that proxy WebPlugin methods, which
@@ -227,11 +223,11 @@
return 1 - front_buffer_index_;
}
- skia::PlatformCanvas* front_buffer_canvas() const {
+ SkCanvas* front_buffer_canvas() const {
return transport_stores_[front_buffer_index()].canvas.get();
}
- skia::PlatformCanvas* back_buffer_canvas() const {
+ SkCanvas* back_buffer_canvas() const {
return transport_stores_[back_buffer_index()].canvas.get();
}
@@ -247,12 +243,12 @@
// Creates a process-local memory section and canvas. PlatformCanvas on
// Windows only works with a DIB, not arbitrary memory.
bool CreateLocalBitmap(std::vector<uint8>* memory,
- scoped_ptr<skia::PlatformCanvas>* canvas);
+ scoped_ptr<SkCanvas>* canvas);
#endif
// Creates a shared memory section and canvas.
bool CreateSharedBitmap(scoped_ptr<TransportDIB>* memory,
- scoped_ptr<skia::PlatformCanvas>* canvas);
+ scoped_ptr<SkCanvas>* canvas);
// Called for cleanup during plugin destruction. Normally right before the
// plugin window gets destroyed, or when the plugin has crashed (at which
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698