Revised fix.

        Reviewed by nobody, simple build fix.

        Fixes a couple ambiguous selector build errors when building with GCC 3.3.

        * Misc.subproj/WebIconDatabase.m:
        (-[WebIconDatabase releaseIconForURL:]):
        * WebView.subproj/WebHTMLView.m:
        (-[NSView _web_layoutIfNeededRecursive:testDirtyRect:]):
        (-[NSArray elementAtPoint:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@11560 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e7ad7deff7eb0b2e0643585f14509caf28f5754a..845b2541d204b4afa4afb8c8c43a62bb8220b88b 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,11 +2,10 @@
 
         Reviewed by nobody, simple build fix.
 
-        Fixes a couple ambiguous selector build errors when building with 3.3.
+        Fixes a couple ambiguous selector build errors when building with GCC 3.3.
 
         * Misc.subproj/WebIconDatabase.m:
         (-[WebIconDatabase releaseIconForURL:]):
-        * WebCoreSupport.subproj/WebImageRenderer.h: Added missing methods for image and imageRef.
         * WebView.subproj/WebHTMLView.m:
         (-[NSView _web_layoutIfNeededRecursive:testDirtyRect:]):
         (-[NSArray elementAtPoint:]):

diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
index 2e5e86c790282563eac58a7eff5e9d6c02228d3d..6806b51b45e598f0fa1e0488e8425c42793fd866 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
@@ -56,9 +56,6 @@
 - (NSRect)targetAnimationRect;
 - (void)resize:(NSSize)s;
 - (NSSize)size;
-- (NSData *)TIFFRepresentation;
-- (NSImage *)image;
-- (CGImageRef)imageRef;
 
 @end
 

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index e0811d7be236cfa8a6de76190138edae1243f769..f20f020010251475d0eed74fe7b9c3784e24d71d 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -69,6 +69,7 @@
 #import <WebKit/WebViewInternal.h>
 #import <WebKit/WebViewPrivate.h>
 #import <WebKitSystemInterface.h>
+#import <WebCore/WebCoreImageRenderer.h>
 
 #import <AppKit/NSAccessibility.h>
 
@@ -2867,7 +2868,7 @@ done:
     [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithDataAsString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
 
     // Convert image renderer to NSImage.
-    [elementInfo _web_setObjectIfNotNil:[(WebImageRenderer *)[elementInfoWC objectForKey:WebCoreElementImageRendererKey] image] forKey:WebElementImageKey];
+    [elementInfo _web_setObjectIfNotNil:[(id <WebCoreImageRenderer>)[elementInfoWC objectForKey:WebCoreElementImageRendererKey] image] forKey:WebElementImageKey];
     
     WebFrameView *webFrameView = [self _web_parentWebFrameView];
     ASSERT(webFrameView);