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

Unified Diff: content/renderer/renderer_clipboard_client.cc

Issue 10078001: Fix leak in ScopedClipboardWriterGlue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months 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 | « no previous file | webkit/glue/clipboard_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_clipboard_client.cc
diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc
index 7f496b9f5adb1baa4a40b63ee1f7715f7c1f42e7..d04628e3f234e6804b8e653a33f6414c086570c1 100644
--- a/content/renderer/renderer_clipboard_client.cc
+++ b/content/renderer/renderer_clipboard_client.cc
@@ -30,7 +30,7 @@ class RendererClipboardWriteContext :
virtual void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects,
const void* pixels,
const gfx::Size& size);
- virtual void FlushAndDestroy(const ui::Clipboard::ObjectMap& objects);
+ virtual void Flush(const ui::Clipboard::ObjectMap& objects);
private:
scoped_ptr<base::SharedMemory> shared_buf_;
@@ -80,12 +80,9 @@ void RendererClipboardWriteContext::WriteBitmapFromPixels(
(*objects)[ui::Clipboard::CBF_SMBITMAP] = params;
}
-// Define a destructor that makes IPCs to flush the contents to the
-// system clipboard.
-void RendererClipboardWriteContext::FlushAndDestroy(
+// Flushes the objects to the clipboard with an IPC.
+void RendererClipboardWriteContext::Flush(
const ui::Clipboard::ObjectMap& objects) {
- scoped_ptr<RendererClipboardWriteContext> delete_on_return(this);
-
if (shared_buf_.get()) {
RenderThreadImpl::current()->Send(
new ClipboardHostMsg_WriteObjectsSync(objects, shared_buf_->handle()));
« no previous file with comments | « no previous file | webkit/glue/clipboard_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698