Remove cc::SharedBitmap::memory()

content/renderer/npapi/webplugin_delegate_proxy.cc

 // 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.
 
 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 525 matching lines @@
 
 #if defined(OS_POSIX)
   // If we're using POSIX mmap'd TransportDIBs, sending the handle across
   // IPC establishes a new mapping rather than just sending a window ID,
   // so only do so if we've actually changed the shared memory bitmaps.
   if (bitmaps_changed)
 #endif
   {
     if (transport_stores_[0].bitmap)
       CopySharedMemoryHandleForMessage(
-          transport_stores_[0].bitmap->memory()->handle(),
+          transport_stores_[0].bitmap->shared_memory()->handle(),
           &param.windowless_buffer0, channel_host_->peer_pid());
 
     if (transport_stores_[1].bitmap)
       CopySharedMemoryHandleForMessage(
-          transport_stores_[1].bitmap->memory()->handle(),
+          transport_stores_[1].bitmap->shared_memory()->handle(),
           &param.windowless_buffer1, channel_host_->peer_pid());
   }
 
   IPC::Message* msg;
 #if defined(OS_WIN)
   if (UseSynchronousGeometryUpdates()) {
     msg = new PluginMsg_UpdateGeometrySync(instance_id_, param);
   } else  // NOLINT
 #endif
   {
@@ skipping 73 matching lines @@
   if (memory->size() != size)
     return false;
   canvas->reset(skia::CreatePlatformCanvas(
       plugin_rect_.width(), plugin_rect_.height(), true, &((*memory)[0]),
       skia::CRASH_ON_FAILURE));
   return true;
 }
 #endif
 
 bool WebPluginDelegateProxy::CreateSharedBitmap(
-    scoped_ptr<cc::SharedBitmap>* memory,
+    scoped_ptr<SharedMemoryBitmap>* memory,
     scoped_ptr<skia::PlatformCanvas>* canvas) {
-  *memory =
-      ChildThread::current()->shared_bitmap_manager()->AllocateSharedBitmap(
-          plugin_rect_.size());
+  *memory = ChildThread::current()
+                ->shared_bitmap_manager()
+                ->AllocateSharedMemoryBitmap(plugin_rect_.size());
   if (!memory->get())
     return false;
-  DCHECK((*memory)->memory());
+  DCHECK((*memory)->shared_memory());
 #if defined(OS_POSIX)
   canvas->reset(skia::CreatePlatformCanvas(
       plugin_rect_.width(), plugin_rect_.height(), true, (*memory)->pixels(),
       skia::RETURN_NULL_ON_FAILURE));
 #else
   canvas->reset(skia::CreatePlatformCanvas(
       plugin_rect_.width(), plugin_rect_.height(), true,
-      (*memory)->memory()->handle(), skia::RETURN_NULL_ON_FAILURE));
+      (*memory)->shared_memory()->handle(), skia::RETURN_NULL_ON_FAILURE));
 #endif
   return !!canvas->get();
 }
 
 void WebPluginDelegateProxy::Paint(SkCanvas* canvas,
                                    const gfx::Rect& damaged_rect) {
   // Limit the damaged rectangle to whatever is contained inside the plugin
   // rectangle, as that's the rectangle that we'll actually draw.
   gfx::Rect rect = gfx::IntersectRects(damaged_rect, plugin_rect_);
 
@@ skipping 569 matching lines @@
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
                                                          bool* result) {
   *result = plugin_->CheckIfRunInsecureContent(url);
 }
 
 }  // namespace content