Title: [134620] trunk/Source/WebCore
- Revision
- 134620
- Author
- [email protected]
- Date
- 2012-11-14 09:46:26 -0800 (Wed, 14 Nov 2012)
Log Message
[Qt] Use a node image if there is no drag image set for Drag&Drop
https://bugs.webkit.org/show_bug.cgi?id=102124
Reviewed by Simon Hausmann.
Use the nodeImage provided by the frame if there is no dragImage in
the clipboard for the current drag&drop operation.
* platform/qt/ClipboardQt.cpp:
(WebCore::ClipboardQt::createDragImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134619 => 134620)
--- trunk/Source/WebCore/ChangeLog 2012-11-14 17:37:48 UTC (rev 134619)
+++ trunk/Source/WebCore/ChangeLog 2012-11-14 17:46:26 UTC (rev 134620)
@@ -1,3 +1,16 @@
+2012-11-14 Sergio Villar Senin <[email protected]>
+
+ [Qt] Use a node image if there is no drag image set for Drag&Drop
+ https://bugs.webkit.org/show_bug.cgi?id=102124
+
+ Reviewed by Simon Hausmann.
+
+ Use the nodeImage provided by the frame if there is no dragImage in
+ the clipboard for the current drag&drop operation.
+
+ * platform/qt/ClipboardQt.cpp:
+ (WebCore::ClipboardQt::createDragImage):
+
2012-11-14 Max Vujovic <[email protected]>
Call to enclosingFilterLayer() in RenderObject::containerForRepaint() is expensive
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (134619 => 134620)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2012-11-14 17:37:48 UTC (rev 134619)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2012-11-14 17:46:26 UTC (rev 134620)
@@ -240,10 +240,14 @@
DragImageRef ClipboardQt::createDragImage(IntPoint& dragLoc) const
{
- if (!m_dragImage)
- return 0;
dragLoc = m_dragLoc;
- return m_dragImage->image()->nativeImageForCurrentFrame();
+
+ if (m_dragImage)
+ return m_dragImage->image()->nativeImageForCurrentFrame();
+ if (m_dragImageElement && m_frame)
+ return m_frame->nodeImage(m_dragImageElement.get());
+
+ return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
