Title: [88036] releases/WebKitGTK/webkit-1.4/Source/WebCore
- Revision
- 88036
- Author
- [email protected]
- Date
- 2011-06-03 12:02:15 -0700 (Fri, 03 Jun 2011)
Log Message
Merging http://trac.webkit.org/changeset/87366
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (88035 => 88036)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-03 19:00:09 UTC (rev 88035)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-03 19:02:15 UTC (rev 88036)
@@ -1,3 +1,15 @@
+2011-05-26 Igor Oliveira <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ drag-not-loaded-image.html test crashes when WebKit is built with debug option
+ https://bugs.webkit.org/show_bug.cgi?id=61480
+
+ Checks if image has content before starting to drag.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
2011-05-12 Adam Barth <[email protected]>
Reviewed by Darin Adler.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/page/DragController.cpp (88035 => 88036)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/page/DragController.cpp 2011-06-03 19:00:09 UTC (rev 88035)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/page/DragController.cpp 2011-06-03 19:02:15 UTC (rev 88036)
@@ -707,7 +707,7 @@
Node* node = dragSource.innerNonSharedNode();
Image* image = getImage(static_cast<Element*>(node));
- if (!imageURL.isEmpty() && node && node->isElementNode() && image
+ if (!imageURL.isEmpty() && node && node->isElementNode() && image && !image->isNull()
&& (m_dragSourceAction & DragSourceActionImage)) {
// We shouldn't be starting a drag for an image that can't provide an extension.
// This is an early detection for problems encountered later upon drop.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
