Changeset 44211

Timestamp:

05/27/09 17:27:57 (10 months ago)

Author:

mrowe@apple.com

Message:

Merge r44189.

Location:

branches/WWDC-2009-branch/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DragController.cpp (modified) (1 diff)

branches/WWDC-2009-branch/WebCore/ChangeLog

@@ +1 @@
+2009-05-27  Mark Rowe  <mrowe@apple.com>
+
+        Merge r44189.
+
+    2009-05-27  John Sullivan  <sullivan@apple.com>
+
+        fixed <rdar://problem/6925482> repro crash in WebCore::DragController::dragExited dropping 
+        bookmarks (at least) over Top Sites (at least)
+
+        Reviewed by Kevin Decker
+
+        * page/DragController.cpp:
+        (WebCore::DragController::dragExited):
+        nil check m_documentUnderMouse and take the "local file" case if it's nil
+
 2009-05-27  Mark Rowe  <mrowe@apple.com>
 

branches/WWDC-2009-branch/WebCore/page/DragController.cpp

@@ -155 +155 @@
     
     if (RefPtr<FrameView> v = mainFrame->view()) {
-        ClipboardAccessPolicy policy = m_document->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;
+        ClipboardAccessPolicy policy = (!m_document || m_document->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable;
         RefPtr<Clipboard> clipboard = dragData->createClipboard(policy);
         clipboard->setSourceOperation(dragData->draggingSourceOperationMask());