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

Unified Diff: Source/core/platform/chromium/ClipboardChromium.cpp

Issue 16715002: Refactor WebCore::DragImage. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: merge upstream changes, some changes per jamesr Created 7 years, 6 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
Index: Source/core/platform/chromium/ClipboardChromium.cpp
diff --git a/Source/core/platform/chromium/ClipboardChromium.cpp b/Source/core/platform/chromium/ClipboardChromium.cpp
index 363d378ad124d89615cb85a3ca4decb7fbbc183d..2e2dbab0734267c4c8ce42198542565525cf9371 100644
--- a/Source/core/platform/chromium/ClipboardChromium.cpp
+++ b/Source/core/platform/chromium/ClipboardChromium.cpp
@@ -323,19 +323,18 @@ void ClipboardChromium::setDragImageElement(Node* node, const IntPoint& loc)
setDragImage(0, node, loc);
}
-DragImageRef ClipboardChromium::createDragImage(IntPoint& loc) const
+PassOwnPtr<DragImage> ClipboardChromium::createDragImage(IntPoint& loc) const
{
- DragImageRef result = 0;
if (m_dragImageElement) {
if (m_frame) {
- result = m_frame->nodeImage(m_dragImageElement.get());
loc = m_dragLoc;
+ return m_frame->nodeImage(m_dragImageElement.get());
}
} else if (m_dragImage) {
- result = createDragImageFromImage(m_dragImage->image());
loc = m_dragLoc;
+ return DragImage::create(m_dragImage->image());
}
- return result;
+ return nullptr;
}
static CachedImage* getCachedImage(Element* element)
« no previous file with comments | « Source/core/platform/chromium/ClipboardChromium.h ('k') | Source/core/platform/chromium/DragImageChromiumSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698