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

Unified Diff: Source/core/clipboard/Pasteboard.cpp

Issue 1001703003: Take NativeImageSkia out behind the woodshed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Switch to skia-style API (return bool instead of SkBitmap) Created 5 years, 9 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 | Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/clipboard/Pasteboard.cpp
diff --git a/Source/core/clipboard/Pasteboard.cpp b/Source/core/clipboard/Pasteboard.cpp
index e6c0e7ade3f3812e8ce70a686a271e1fde89cfbc..21d5fa664b7a1be810c39343b390dfde278cd157 100644
--- a/Source/core/clipboard/Pasteboard.cpp
+++ b/Source/core/clipboard/Pasteboard.cpp
@@ -34,7 +34,6 @@
#include "core/clipboard/DataObject.h"
#include "platform/clipboard/ClipboardUtilities.h"
#include "platform/graphics/Image.h"
-#include "platform/graphics/skia/NativeImageSkia.h"
#include "platform/weborigin/KURL.h"
#include "public/platform/Platform.h"
#include "public/platform/WebDragData.h"
@@ -82,11 +81,11 @@ void Pasteboard::writeImage(Image* image, const KURL& url, const String& title)
{
ASSERT(image);
- RefPtr<NativeImageSkia> bitmap = image->nativeImageForCurrentFrame();
- if (!bitmap)
+ SkBitmap bitmap;
+ if (!image->bitmapForCurrentFrame(&bitmap))
return;
- blink::WebImage webImage = bitmap->bitmap();
+ blink::WebImage webImage = bitmap;
blink::Platform::current()->clipboard()->writeImage(webImage, blink::WebURL(url), blink::WebString(title));
}
« no previous file with comments | « no previous file | Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698