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

Timothy thatcher at opensource.apple.com
Mon Dec 12 18:01:16 PST 2005


thatcher    05/12/12 18:01:16

  Modified:    .        ChangeLog
               Misc.subproj WebIconDatabase.m
               WebCoreSupport.subproj WebImageRenderer.h
               WebView.subproj WebHTMLView.m
  Log:
          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:]):
  
  Revision  Changes    Path
  1.3400    +13 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3399
  retrieving revision 1.3400
  diff -u -r1.3399 -r1.3400
  --- ChangeLog	12 Dec 2005 21:01:28 -0000	1.3399
  +++ ChangeLog	13 Dec 2005 02:01:07 -0000	1.3400
  @@ -1,3 +1,16 @@
  +2005-12-12  Timothy Hatcher  <timothy at 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 at mitzpettel.com>
   
           Reviewed and checked in by John Sullivan.
  
  
  
  1.62      +1 -1      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- WebIconDatabase.m	12 Dec 2005 21:01:34 -0000	1.61
  +++ WebIconDatabase.m	13 Dec 2005 02:01:14 -0000	1.62
  @@ -244,7 +244,7 @@
                       [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 {
  
  
  
  1.35      +3 -0      WebKit/WebCoreSupport.subproj/WebImageRenderer.h
  
  Index: WebImageRenderer.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageRenderer.h,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- WebImageRenderer.h	8 Dec 2005 08:40:33 -0000	1.34
  +++ WebImageRenderer.h	13 Dec 2005 02:01:14 -0000	1.35
  @@ -56,6 +56,9 @@
   - (NSRect)targetAnimationRect;
   - (void)resize:(NSSize)s;
   - (NSSize)size;
  +- (NSData *)TIFFRepresentation;
  +- (NSImage *)image;
  +- (CGImageRef)imageRef;
   
   @end
   
  
  
  
  1.490     +2 -2      WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.489
  retrieving revision 1.490
  diff -u -r1.489 -r1.490
  --- WebHTMLView.m	10 Dec 2005 20:40:34 -0000	1.489
  +++ WebHTMLView.m	13 Dec 2005 02:01:15 -0000	1.490
  @@ -1659,7 +1659,7 @@
   - (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 @@
       [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);
  
  
  



More information about the webkit-changes mailing list