| Index: content/renderer/webplugin_delegate_proxy.h
|
| ===================================================================
|
| --- content/renderer/webplugin_delegate_proxy.h (revision 165342)
|
| +++ content/renderer/webplugin_delegate_proxy.h (working copy)
|
| @@ -34,10 +34,6 @@
|
| class WaitableEvent;
|
| }
|
|
|
| -namespace skia {
|
| -class PlatformCanvas;
|
| -}
|
| -
|
| namespace webkit {
|
| namespace npapi {
|
| class WebPlugin;
|
| @@ -143,7 +139,7 @@
|
| ~SharedBitmap();
|
|
|
| scoped_ptr<TransportDIB> dib;
|
| - scoped_ptr<skia::PlatformCanvas> canvas;
|
| + scoped_ptr<SkCanvas> canvas;
|
| };
|
|
|
| // Message handlers for messages that proxy WebPlugin methods, which
|
| @@ -230,11 +226,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();
|
| }
|
|
|
| @@ -250,12 +246,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
|
|
|