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

Unified Diff: Source/core/editing/Editor.cpp

Issue 270613004: Implement "Copy image" for canvas (blink side). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/Editor.cpp
diff --git a/Source/core/editing/Editor.cpp b/Source/core/editing/Editor.cpp
index a91f9e264bb4617b32adb3b991b1cf02e02eb208..ae29f6e56d910bdbf2bd2bc50de903e15d535369 100644
--- a/Source/core/editing/Editor.cpp
+++ b/Source/core/editing/Editor.cpp
@@ -68,6 +68,7 @@
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/Settings.h"
+#include "core/html/HTMLCanvasElement.h"
#include "core/html/HTMLImageElement.h"
#include "core/html/HTMLInputElement.h"
#include "core/html/HTMLTextAreaElement.h"
@@ -426,14 +427,22 @@ static void writeImageNodeToPasteboard(Pasteboard* pasteboard, Node* node, const
ASSERT(pasteboard);
ASSERT(node);
- if (!(node->renderer() && node->renderer()->isImage()))
+ RenderObject* renderer = node->renderer();
+ if (!renderer)
return;
- RenderImage* renderer = toRenderImage(node->renderer());
- ImageResource* cachedImage = renderer->cachedImage();
- if (!cachedImage || cachedImage->errorOccurred())
+ Image* image = 0;
+ if (renderer->isImage()) {
+ RenderImage* renderImage = toRenderImage(renderer);
+ ImageResource* cachedImage = renderImage->cachedImage();
+ if (!cachedImage || cachedImage->errorOccurred())
+ return;
+ image = cachedImage->imageForRenderer(renderImage);
+ } else if (renderer->isCanvas()) {
+ image = toHTMLCanvasElement(node)->copiedImage();
+ } else {
return;
- Image* image = cachedImage->imageForRenderer(renderer);
+ }
ASSERT(image);
// FIXME: This should probably be reconciled with HitTestResult::absoluteImageURL.
@@ -444,6 +453,8 @@ static void writeImageNodeToPasteboard(Pasteboard* pasteboard, Node* node, const
urlString = toElement(node)->getAttribute(XLinkNames::hrefAttr);
else if (isHTMLEmbedElement(*node) || isHTMLObjectElement(*node))
urlString = toElement(node)->imageSourceURL();
+ else if (isHTMLCanvasElement(*node))
+ urlString = AtomicString("data:image/png");
Justin Novosad 2014/05/09 19:56:38 This URL does not seem useful. Why not leave urlSt
KURL url = urlString.isEmpty() ? KURL() : node->document().completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
pasteboard->writeImage(image, url, title);
« no previous file with comments | « no previous file | Source/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698