Chromium changes to use new WebKit, WebKitClient, and WebClipboard interfaces...

chrome/renderer/renderer_glue.cc

 // Copyright (c) 2006-2008 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.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 66 matching lines @@
       cur_capacity_ = stack_capacity;
     }
   }
 
   T stack_buffer_[stack_capacity];
   T* cur_buffer_;
   size_t cur_capacity_;
 };
 
 #if defined(OS_WIN)
-// This definition of WriteBitmap uses shared memory to communicate across
-// processes.
-void ScopedClipboardWriterGlue::WriteBitmap(const SkBitmap& bitmap) {
-  // do not try to write a bitmap more than once
+// This definition of WriteBitmapFromPixels uses shared memory to communicate
+// across processes.
+void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
+                                                      const gfx::Size& size) {
+  // Do not try to write a bitmap more than once
   if (shared_buf_)
     return;
 
-  size_t buf_size = bitmap.getSize();
-  gfx::Size size(bitmap.width(), bitmap.height());
+  size_t buf_size = 4 * size.width() * size.height();
 
   // Allocate a shared memory buffer to hold the bitmap bits
   shared_buf_ = new base::SharedMemory;
   shared_buf_->Create(L"", false /* read write */, true /* open existing */,
                       buf_size);
   if (!shared_buf_ || !shared_buf_->Map(buf_size)) {
     NOTREACHED();
     return;
   }
 
   // Copy the bits into shared memory
-  SkAutoLockPixels bitmap_lock(bitmap);
-  memcpy(shared_buf_->memory(), bitmap.getPixels(), buf_size);
+  memcpy(shared_buf_->memory(), pixels, buf_size);
   shared_buf_->Unmap();
 
   Clipboard::ObjectMapParam param1, param2;
   base::SharedMemoryHandle smh = shared_buf_->handle();
 
   const char* shared_handle = reinterpret_cast<const char*>(&smh);
   for (size_t i = 0; i < sizeof base::SharedMemoryHandle; i++)
     param1.push_back(shared_handle[i]);
 
   const char* size_data = reinterpret_cast<const char*>(&size);
@@ skipping 238 matching lines @@
   // Update the browser about our cache
   // NOTE: Since this can be called from the plugin process, we might not have
   // a RenderThread.  Do nothing in that case.
   if (!IsPluginProcess())
     RenderThread::current()->InformHostOfCacheStatsLater();
 }
 
 #endif  // !USING_SIMPLE_RESOURCE_LOADER_BRIDGE
 
 }  // namespace webkit_glue