Title: [211377] trunk/Source/WebCore
- Revision
- 211377
- Author
- wenson_hs...@apple.com
- Date
- 2017-01-30 10:59:36 -0800 (Mon, 30 Jan 2017)
Log Message
Web content process crashes when initiating a drag on a very large image
https://bugs.webkit.org/show_bug.cgi?id=167564
Reviewed by Beth Dakin.
If we begin dragging an image element that is too large to show the cached image for, we will show an image file
icon instead of the cached image. This may return null if createDragImageIconForCachedImageFilename is
unimplemented, so in the meantime, we should not assume that dragImage will always exist before calling into
doSystemDrag in doImageDrag and bail from the drag operation if that is the case.
* page/DragController.cpp:
(WebCore::DragController::doImageDrag):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211376 => 211377)
--- trunk/Source/WebCore/ChangeLog 2017-01-30 18:45:21 UTC (rev 211376)
+++ trunk/Source/WebCore/ChangeLog 2017-01-30 18:59:36 UTC (rev 211377)
@@ -1,3 +1,18 @@
+2017-01-30 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Web content process crashes when initiating a drag on a very large image
+ https://bugs.webkit.org/show_bug.cgi?id=167564
+
+ Reviewed by Beth Dakin.
+
+ If we begin dragging an image element that is too large to show the cached image for, we will show an image file
+ icon instead of the cached image. This may return null if createDragImageIconForCachedImageFilename is
+ unimplemented, so in the meantime, we should not assume that dragImage will always exist before calling into
+ doSystemDrag in doImageDrag and bail from the drag operation if that is the case.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::doImageDrag):
+
2017-01-30 Chris Dumez <cdu...@apple.com>
Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
Modified: trunk/Source/WebCore/page/DragController.cpp (211376 => 211377)
--- trunk/Source/WebCore/page/DragController.cpp 2017-01-30 18:45:21 UTC (rev 211376)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-01-30 18:59:36 UTC (rev 211377)
@@ -977,6 +977,9 @@
}
}
+ if (!dragImage)
+ return;
+
dragImageOffset = mouseDownPoint + scaledOrigin;
doSystemDrag(dragImage, dragImageOffset, dragOrigin, dataTransfer, frame, false);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
