Changeset 41903 in webkit


Ignore:
Timestamp:
Mar 22, 2009 8:46:17 PM (15 years ago)
Author:
mitz@apple.com
Message:

Reviewed by John Sullivan.

  • fix <rdar://problem/6640741> Messages not displaying after the Safari 4 beta was installed

Mail assumes that if -[WebArchive subresources] is not nil, then it
contains at least one object.

  • WebView/WebArchive.mm: (-[WebArchive subresources]): Preserve the behavior of returning nil if there are no subresources.
Location:
trunk/WebKit/mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/mac/ChangeLog

    r41885 r41903  
     12009-03-22  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by John Sullivan.
     4
     5        - fix <rdar://problem/6640741> Messages not displaying after the
     6          Safari 4 beta was installed
     7
     8        Mail assumes that if -[WebArchive subresources] is not nil, then it
     9        contains at least one object.
     10
     11        * WebView/WebArchive.mm:
     12        (-[WebArchive subresources]): Preserve the behavior of returning nil
     13        if there are no subresources.
     14
    1152009-03-20  Adele Peterson  <adele@apple.com>
    216
  • trunk/WebKit/mac/WebView/WebArchive.mm

    r41870 r41903  
    321321        }
    322322    }
    323    
    324     return [[_private->cachedSubresources retain] autorelease];
     323    // Maintain the WebKit 3 behavior of this API, which is documented and
     324    // relied upon by some clients, of returning nil if there are no subresources.
     325    return [_private->cachedSubresources count] ? [[_private->cachedSubresources retain] autorelease] : nil;
    325326}
    326327
Note: See TracChangeset for help on using the changeset viewer.