Changeset 19920 in webkit

Timestamp:

Feb 28, 2007 3:46:58 PM (17 years ago)

Author:

bdakin

Message:

Reviewed by Brady.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=12923 REGRESSION:
Assertion failure copying standalone image

• platform/mac/PasteboardMac.mm: (WebCore::Pasteboard::writeImage): Use the CachedImage as the resource. This makes more sense anyway. There is no need to null- check the renderer or the CachedImage since we return early if there is no Image* and the HitTestResult::image() function checks for these things.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PasteboardMac.mm (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-28  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Brady.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=12923 REGRESSION: 
+        Assertion failure copying standalone image
+
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::writeImage): Use the CachedImage as the 
+        resource. This makes more sense anyway. There is no need to null-
+        check the renderer or the CachedImage since we return early if 
+        there is no Image* and the HitTestResult::image() function checks 
+        for these things.
+
 2007-02-28  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/platform/mac/PasteboardMac.mm

@@ -27 +27 @@
 #import "Pasteboard.h"
 
-#import "Cache.h"
 #import "CachedResource.h"
 #import "CharacterNames.h"
@@ -40 +39 @@
 #import "LoaderNSURLExtras.h"
 #import "MimeTypeRegistry.h"
+#import "RenderImage.h"
 #import "RetainPtr.h"
 #import "WebCoreNSStringExtras.h"
@@ -279 +279 @@
     ASSERT(URL);
 
+    Node* node = result.innerNonSharedNode();
+    if (!node)
+        return;
+
     NSString *title = result.altDisplayString().isNull() ? nil : (NSString*)(result.altDisplayString());
-    Frame* frame = result.innerNonSharedNode()->document()->frame();
+    Frame* frame = node->document()->frame();
 
     writeURL(URL, title, frame, true);
@@ -286 +290 @@
     [m_pasteboard declareTypes:types owner:nil];
 
-    NSImage *image = (NSImage *)(result.image() ? result.image()->getNSImage() : nil);
-    ASSERT(image);
-    [m_pasteboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
-
-    CachedResource* imageResource = WebCore::cache()->resourceForURL(result.absoluteImageURL().url());
+    Image* coreImage = result.image();
+    ASSERT(coreImage);
+    if (!coreImage)
+        return;
+    [m_pasteboard setData:[coreImage->getNSImage() TIFFRepresentation] forType:NSTIFFPboardType];
+
+    RenderImage* renderer = static_cast<RenderImage*>(node->renderer());
+    CachedResource* imageResource = static_cast<CachedResource*>(renderer->cachedImage());
     ASSERT(imageResource);
     String MIMEType = imageResource->response().mimeType();