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

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

Issue 210763005: Disable compositing query assert when dragging (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/clipboard/Clipboard.cpp
diff --git a/Source/core/clipboard/Clipboard.cpp b/Source/core/clipboard/Clipboard.cpp
index 388efc53a989c63a659d57a49a6d9c8c7df5f6b1..e042e86af8ab4c5ac62d9ae94a4db85b982982d6 100644
--- a/Source/core/clipboard/Clipboard.cpp
+++ b/Source/core/clipboard/Clipboard.cpp
@@ -36,6 +36,7 @@
#include "core/frame/LocalFrame.h"
#include "core/html/HTMLImageElement.h"
#include "core/rendering/RenderImage.h"
+#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderObject.h"
#include "platform/DragImage.h"
#include "platform/MIMETypeRegistry.h"
@@ -241,6 +242,9 @@ PassOwnPtr<DragImage> Clipboard::createDragImage(IntPoint& loc, LocalFrame* fram
{
if (m_dragImageElement) {
loc = m_dragLoc;
+
+ // https://code.google.com/p/chromium/issues/detail?id=354373
+ DisableCompositingQueryAsserts disabler;
return frame->nodeImage(m_dragImageElement.get());
}
if (m_dragImage) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698