[webkit-changes] cvs commit: WebKit/WebView.subproj WebHTMLView.m

[Timothy]

thatcher    05/12/12 20:39:13

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebImageRenderer.h
               WebView.subproj WebHTMLView.m
  Log:
  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:]):
  
  Revision  Changes    Path
  1.3401    +1 -2      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3400
  retrieving revision 1.3401
  diff -u -r1.3400 -r1.3401
  --- ChangeLog	13 Dec 2005 02:01:07 -0000	1.3400
  +++ ChangeLog	13 Dec 2005 04:39:10 -0000	1.3401
  @@ -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:]):
  
  
  
  1.36      +0 -3      WebKit/WebCoreSupport.subproj/WebImageRenderer.h
  
  Index: WebImageRenderer.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageRenderer.h,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- WebImageRenderer.h	13 Dec 2005 02:01:14 -0000	1.35
  +++ WebImageRenderer.h	13 Dec 2005 04:39:13 -0000	1.36
  @@ -56,9 +56,6 @@
   - (NSRect)targetAnimationRect;
   - (void)resize:(NSSize)s;
   - (NSSize)size;
  -- (NSData *)TIFFRepresentation;
  -- (NSImage *)image;
  -- (CGImageRef)imageRef;
   
   @end
   
  
  
  
  1.491     +2 -1      WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.490
  retrieving revision 1.491
  diff -u -r1.490 -r1.491
  --- WebHTMLView.m	13 Dec 2005 02:01:15 -0000	1.490
  +++ WebHTMLView.m	13 Dec 2005 04:39:13 -0000	1.491
  @@ -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 @@
       [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);