Reviewed by nobody, simple build fix.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Dec 2005 02:01:15 +0000 (02:01 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Dec 2005 02:01:15 +0000 (02:01 +0000)
        Fixes a couple ambiguous selector build errors when building with 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:]):

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

WebKit/ChangeLog
WebKit/Misc.subproj/WebIconDatabase.m
WebKit/WebCoreSupport.subproj/WebImageRenderer.h
WebKit/WebView.subproj/WebHTMLView.m

index a5e3cd0e1f0dde340a74c176a8124c23defa4f87..e7ad7deff7eb0b2e0643585f14509caf28f5754a 100644 (file)
@@ -1,3 +1,16 @@
+2005-12-12  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by nobody, simple build fix.
+
+        Fixes a couple ambiguous selector build errors when building with 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:]):
+
 2005-12-12  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Reviewed and checked in by John Sullivan.
index 46ba1d694d544a6ea7e36434c9a70ae4321c2edc..263a82d77a8afadf73b342be08229caccf6402d3 100644 (file)
@@ -244,7 +244,7 @@ NSSize WebIconLargeSize = {128, 128};
                     [pageURLs removeObject:pageURL];
                     
                     // Maybe this was the last page URL mapped to this icon URL
-                    if ([pageURLs count] == 0) {
+                    if ([(NSMutableSet *)pageURLs count] == 0) {
                         [_private->iconURLToPageURLs removeObjectForKey:iconURL];
                     }
                 } else {
index 6806b51b45e598f0fa1e0488e8425c42793fd866..2e5e86c790282563eac58a7eff5e9d6c02228d3d 100644 (file)
@@ -56,6 +56,9 @@
 - (NSRect)targetAnimationRect;
 - (void)resize:(NSSize)s;
 - (NSSize)size;
+- (NSData *)TIFFRepresentation;
+- (NSImage *)image;
+- (CGImageRef)imageRef;
 
 @end
 
index a2b8d3ce2a8585e083ddb131fc2ea93feab9190d..e0811d7be236cfa8a6de76190138edae1243f769 100644 (file)
@@ -1659,7 +1659,7 @@ static WebHTMLView *lastHitView = nil;
 - (void)_web_layoutIfNeededRecursive: (NSRect)rect testDirtyRect:(bool)testDirtyRect
 {
     unsigned index, count;
-    for (index = 0, count = [_subviews count]; index < count; index++) {
+    for (index = 0, count = [(NSArray *)_subviews count]; index < count; index++) {
         NSView *subview = [_subviews objectAtIndex:index];
         NSRect dirtiedSubviewRect = [subview convertRect: rect fromView: self];
         [subview _web_layoutIfNeededRecursive: dirtiedSubviewRect testDirtyRect:testDirtyRect];
@@ -2867,7 +2867,7 @@ done:
     [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithDataAsString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
 
     // Convert image renderer to NSImage.
-    [elementInfo _web_setObjectIfNotNil:[[elementInfoWC objectForKey:WebCoreElementImageRendererKey] image] forKey:WebElementImageKey];
+    [elementInfo _web_setObjectIfNotNil:[(WebImageRenderer *)[elementInfoWC objectForKey:WebCoreElementImageRendererKey] image] forKey:WebElementImageKey];
     
     WebFrameView *webFrameView = [self _web_parentWebFrameView];
     ASSERT(webFrameView);