Remove cc::SharedBitmap::memory()

content/renderer/npapi/webplugin_delegate_proxy.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 #endif
 
 struct NPObject;
 struct PluginHostMsg_URLRequest_Params;
 class SkBitmap;
 
 namespace base {
 class WaitableEvent;
 }
 
-namespace cc {
-class SharedBitmap;
-}
 
 namespace content {
 class NPObjectStub;
 class PluginChannelHost;
 class RenderFrameImpl;
 class RenderViewImpl;
+class SharedMemoryBitmap;
 class WebPluginImpl;
 
 // An implementation of WebPluginDelegate that proxies all calls to
 // the plugin process.
 class WebPluginDelegateProxy
     : public WebPluginDelegate,
       public IPC::Listener,
       public IPC::Sender,
       public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
@@ skipping 95 matching lines @@
 
  protected:
   friend class base::DeleteHelper<WebPluginDelegateProxy>;
   ~WebPluginDelegateProxy() override;
 
  private:
   struct SharedBitmap {
     SharedBitmap();
     ~SharedBitmap();
 
-    scoped_ptr<cc::SharedBitmap> bitmap;
+    scoped_ptr<SharedMemoryBitmap> bitmap;
     scoped_ptr<SkCanvas> canvas;
   };
 
   // Message handlers for messages that proxy WebPlugin methods, which
   // we translate into calls to the real WebPlugin.
   void OnSetWindow(gfx::PluginWindowHandle window);
   void OnCompleteURL(const std::string& url_in, std::string* url_out,
                      bool* result);
   void OnHandleURLRequest(const PluginHostMsg_URLRequest_Params& params);
   void OnCancelResource(int id);
@@ skipping 53 matching lines @@
   }
 
   SkCanvas* front_buffer_canvas() const {
     return transport_stores_[front_buffer_index()].canvas.get();
   }
 
   SkCanvas* back_buffer_canvas() const {
     return transport_stores_[back_buffer_index()].canvas.get();
   }
 
-  cc::SharedBitmap* front_buffer_bitmap() const {
+  SharedMemoryBitmap* front_buffer_bitmap() const {
     return transport_stores_[front_buffer_index()].bitmap.get();
   }
 
-  cc::SharedBitmap* back_buffer_bitmap() const {
+  SharedMemoryBitmap* back_buffer_bitmap() const {
     return transport_stores_[back_buffer_index()].bitmap.get();
   }
 
 #if !defined(OS_WIN)
   // 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<SkCanvas>* canvas);
 #endif
 
   // Creates a shared memory section and canvas.
-  bool CreateSharedBitmap(scoped_ptr<cc::SharedBitmap>* memory,
+  bool CreateSharedBitmap(scoped_ptr<SharedMemoryBitmap>* memory,
                           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
   // point the window has already been destroyed).
   void WillDestroyWindow();
 
 #if defined(OS_WIN)
   // Returns true if we should update the plugin geometry synchronously.
   bool UseSynchronousGeometryUpdates();
@@ skipping 50 matching lines @@
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_