[webkit-changes] cvs commit: WebCore/khtml khtmlview.cpp

[John]

sullivan    05/09/05 15:26:07

  Modified:    .        ChangeLog
               WebView.subproj WebHTMLView.m
               .        ChangeLog
               khtml    khtmlview.cpp
  Log:
  WebCore:
  
          Reviewed by Dave Hyatt.
  
          Test cases added: none, doesn't affect layout
  
          - fixed <rdar://problem/4211999> Safari quits when click-drag-hold an image that is
          set to automatically change.
  
          * khtml/khtmlview.cpp:
          (KHTMLView::updateDragAndDrop):
          add missing nil check
  
  WebKit:
  
          Reviewed by Dave Hyatt.
  
          - change related to <rdar://problem/4211999> Safari quits when click-drag-hold an image
          that is set to automatically change.
  
          * WebView.subproj/WebHTMLView.m:
          (-[NSArray namesOfPromisedFilesDroppedAtDestination:]):
          handle nil wrapper with ERROR and early return rather than ASSERT, since we now know
          of a way to reproduce this (written up as 4244861)
  
  Revision  Changes    Path
  1.3309    +12 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3308
  retrieving revision 1.3309
  diff -u -r1.3308 -r1.3309
  --- ChangeLog	5 Sep 2005 22:22:29 -0000	1.3308
  +++ ChangeLog	5 Sep 2005 22:26:03 -0000	1.3309
  @@ -1,3 +1,15 @@
  +2005-09-05  John Sullivan  <sullivan at apple.com>
  +
  +        Reviewed by Dave Hyatt.
  +        
  +        - change related to <rdar://problem/4211999> Safari quits when click-drag-hold an image 
  +        that is set to automatically change.
  +
  +        * WebView.subproj/WebHTMLView.m:
  +        (-[NSArray namesOfPromisedFilesDroppedAtDestination:]):
  +        handle nil wrapper with ERROR and early return rather than ASSERT, since we now know
  +        of a way to reproduce this (written up as 4244861)
  +
   2005-09-05  Darin Adler  <darin at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.467     +4 -1      WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.466
  retrieving revision 1.467
  diff -u -r1.466 -r1.467
  --- WebHTMLView.m	27 Aug 2005 00:03:43 -0000	1.466
  +++ WebHTMLView.m	5 Sep 2005 22:26:05 -0000	1.467
  @@ -2686,7 +2686,10 @@
       ASSERT(_private->draggingImageURL);
       
       NSFileWrapper *wrapper = [[self _dataSource] _fileWrapperForURL:_private->draggingImageURL];
  -    ASSERT(wrapper);    
  +    if (wrapper == nil) {
  +        ERROR("Failed to create image file. Did the source image change while dragging? (<rdar://problem/4244861>)");
  +        return nil;
  +    }
       
       // FIXME: Report an error if we fail to create a file.
       NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper preferredFilename]];
  
  
  
  1.94      +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- ChangeLog	5 Sep 2005 20:25:17 -0000	1.93
  +++ ChangeLog	5 Sep 2005 22:26:06 -0000	1.94
  @@ -1,3 +1,16 @@
  +2005-09-05  John Sullivan  <sullivan at apple.com>
  +
  +        Reviewed by Dave Hyatt.
  +
  +        Test cases added: none, doesn't affect layout
  +        
  +        - fixed <rdar://problem/4211999> Safari quits when click-drag-hold an image that is 
  +        set to automatically change.
  +
  +        * khtml/khtmlview.cpp:
  +        (KHTMLView::updateDragAndDrop):
  +        add missing nil check
  +
   2005-09-05  Darin Adler  <darin at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.145     +1 -1      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- khtmlview.cpp	3 Sep 2005 23:09:58 -0000	1.144
  +++ khtmlview.cpp	5 Sep 2005 22:26:06 -0000	1.145
  @@ -1266,7 +1266,7 @@
       NodeImpl *newTarget = mev.innerNode.get();
   
       // Drag events should never go to text nodes (following IE, and proper mouseover/out dispatch)
  -    if (newTarget->isTextNode()) {
  +    if (newTarget && newTarget->isTextNode()) {
           newTarget = newTarget->parentNode();
       }