Changeset 19614 in webkit

Timestamp:

Feb 13, 2007, 2:57:31 PM (18 years ago)

Author:

oliver

Message:

2007-02-13 Oliver Hunt <​oliver@apple.com>

Reviewed by John.

Modify entry point ASSERTs for dragging functions to allow for the case
where a load has occurred mid-drag. The load may detach the HTMLView
from the WebView so it is no longer possible to check _isTopHTMLView.

The assertion changes match that of revision 14897 which fixed the
more common case ([WebHTMLView draggedImage:endedAt:operation:])

It's also necessary to check for a null Page now prior to accessing
the DragController, which is necessary in all of these methods.

See rdar://problem/4994870

• WebView/WebHTMLView.mm: (-[WebHTMLView draggingSourceOperationMaskForLocal:]): (-[WebHTMLView draggedImage:movedTo:]): (-[WebHTMLView draggedImage:endedAt:operation:]): (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-02-13  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by John.
+
+        Modify entry point ASSERTs for dragging functions to allow for the case
+        where a load has occurred mid-drag.  The load may detach the HTMLView 
+        from the WebView so it is no longer possible to check _isTopHTMLView.
+
+        The assertion changes match that of revision 14897 which fixed the 
+        more common case ([WebHTMLView draggedImage:endedAt:operation:])
+
+        It's also necessary to check for a null Page now prior to accessing 
+        the DragController, which is necessary in all of these methods.
+
+        See rdar://problem/4994870
+                                             
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView draggingSourceOperationMaskForLocal:]):
+        (-[WebHTMLView draggedImage:movedTo:]):
+        (-[WebHTMLView draggedImage:endedAt:operation:]):
+        (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]):
+
 2007-02-13  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -2926 +2926 @@
 - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
 {
-    ASSERT([self _isTopHTMLView]);
+    ASSERT(![self _webView] || [self _isTopHTMLView]);
     
     Page *page = core([self _webView]);
-    ASSERT(page);
+    
+    if (!page)
+        return NSDragOperationNone;
+    
     if (page->dragController()->dragOperation() == DragOperationNone)
         return NSDragOperationGeneric | NSDragOperationCopy;
@@ -2938 +2941 @@
 - (void)draggedImage:(NSImage *)image movedTo:(NSPoint)screenLoc
 {
-    ASSERT([self _isTopHTMLView]);
-    Page* page = core([self _webView]);
-    ASSERT(page);
-    DragController* dragController = page->dragController();
+    ASSERT(![self _webView] || [self _isTopHTMLView]);
+    
     NSPoint windowImageLoc = [[self window] convertScreenToBase:screenLoc];
-    NSPoint windowMouseLoc = NSMakePoint(windowImageLoc.x + dragController->dragOffset().x(), windowImageLoc.y + dragController->dragOffset().y());
+    NSPoint windowMouseLoc = windowImageLoc;
+    
+    if (Page* page = core([self _webView])) {
+        DragController* dragController = page->dragController();
+        NSPoint windowMouseLoc = NSMakePoint(windowImageLoc.x + dragController->dragOffset().x(), windowImageLoc.y + dragController->dragOffset().y());
+    }
+    
     [[self _bridge] dragSourceMovedTo:windowMouseLoc];
 }
@@ -2950 +2957 @@
 {
     ASSERT(![self _webView] || [self _isTopHTMLView]);
-    Page* page = core([self _webView]);
-    ASSERT(page);
-    DragController* dragController = page->dragController();
-
+    
     NSPoint windowImageLoc = [[self window] convertScreenToBase:aPoint];
-    NSPoint windowMouseLoc = NSMakePoint(windowImageLoc.x + dragController->dragOffset().x(), windowImageLoc.y + dragController->dragOffset().y());
+    NSPoint windowMouseLoc = windowImageLoc;
+    
+    if (Page* page = core([self _webView])) {
+        DragController* dragController = page->dragController();
+        windowMouseLoc = NSMakePoint(windowImageLoc.x + dragController->dragOffset().x(), windowImageLoc.y + dragController->dragOffset().y());
+        dragController->dragEnded();
+    }
+    
     [[self _bridge] dragSourceEndedAt:windowMouseLoc operation:operation];
-    dragController->dragEnded();
     
     // Prevent queued mouseDragged events from coming after the drag and fake mouseUp event.
@@ -2979 +2989 @@
 - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
 {
-    ASSERT([self _isTopHTMLView]);
+    ASSERT(![self _webView] || [self _isTopHTMLView]);
     Page* page = core([self _webView]);
+    
+    //If a load occurs midway through a drag, the view may be detached, which gives
+    //us no ability to get to the original Page, so we cannot access any drag state
+    //FIXME: is there a way to recover?
+    if (!page) 
+        return nil; 
+    
     KURL imageURL = page->dragController()->draggingImageURL();
     ASSERT(!imageURL.isEmpty());
-
+    
     NSFileWrapper *wrapper = [[self _dataSource] _fileWrapperForURL:imageURL.getNSURL()];
     if (wrapper == nil) {