summaryrefslogtreecommitdiffstats
path: root/WebKit/mac/Misc/WebNSPasteboardExtras.mm
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-11 17:01:47 +0100
committerBen Murdoch <benm@google.com>2009-08-11 18:21:02 +0100
commit0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch)
tree2943df35f62d885c89d01063cc528dd73b480fea /WebKit/mac/Misc/WebNSPasteboardExtras.mm
parent7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff)
downloadexternal_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/mac/Misc/WebNSPasteboardExtras.mm')
-rw-r--r--WebKit/mac/Misc/WebNSPasteboardExtras.mm8
1 files changed, 5 insertions, 3 deletions
diff --git a/WebKit/mac/Misc/WebNSPasteboardExtras.mm b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
index 34c39dd..3cc1c7c 100644
--- a/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+++ b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
@@ -28,6 +28,7 @@
#import "WebNSPasteboardExtras.h"
+#import "DOMElementInternal.h"
#import "WebArchive.h"
#import "WebFrameInternal.h"
#import "WebHTMLViewInternal.h"
@@ -211,13 +212,14 @@ static NSArray *_writableTypesForImageWithArchive (void)
}
-static CachedImage* imageFromElement(DOMElement *domElement) {
+static CachedImage* imageFromElement(DOMElement *domElement)
+{
Element* element = core(domElement);
if (!element)
return 0;
RenderObject* renderer = element->renderer();
- RenderImage* imageRenderer = static_cast<RenderImage*>(renderer);
+ RenderImage* imageRenderer = toRenderImage(renderer);
if (!imageRenderer->cachedImage() || imageRenderer->cachedImage()->errorOccurred())
return 0;
return imageRenderer->cachedImage();
@@ -266,7 +268,7 @@ static CachedImage* imageFromElement(DOMElement *domElement) {
NSString *extension = @"";
if (RenderObject* renderer = core(element)->renderer()) {
if (renderer->isImage()) {
- if (CachedImage* image = static_cast<RenderImage*>(renderer)->cachedImage()) {
+ if (CachedImage* image = toRenderImage(renderer)->cachedImage()) {
extension = image->image()->filenameExtension();
if (![extension length])
return 0;