Title: [211916] branches/safari-604.1.5-branch/Source/WebCore
- Revision
- 211916
- Author
- [email protected]
- Date
- 2017-02-08 18:05:36 -0800 (Wed, 08 Feb 2017)
Log Message
Merge r211377. rdar://problem/30267849
Modified Paths
Diff
Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211915 => 211916)
--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog 2017-02-09 01:57:21 UTC (rev 211915)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog 2017-02-09 02:05:36 UTC (rev 211916)
@@ -1,3 +1,22 @@
+2017-02-08 Matthew Hanson <[email protected]>
+
+ Merge r211377. rdar://problem/30267849
+
+ 2017-01-30 Wenson Hsieh <[email protected]>
+
+ 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-02-07 Matthew Hanson <[email protected]>
Merge r211659. rdar://problem/30386165
Modified: branches/safari-604.1.5-branch/Source/WebCore/page/DragController.cpp (211915 => 211916)
--- branches/safari-604.1.5-branch/Source/WebCore/page/DragController.cpp 2017-02-09 01:57:21 UTC (rev 211915)
+++ branches/safari-604.1.5-branch/Source/WebCore/page/DragController.cpp 2017-02-09 02:05:36 UTC (rev 211916)
@@ -977,6 +977,9 @@
}
}
+ if (!dragImage)
+ return;
+
dragImageOffset = mouseDownPoint + scaledOrigin;
doSystemDrag(dragImage, dragImageOffset, dragOrigin, dataTransfer, frame, false);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
