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

[Darin]

darin       05/12/16 08:11:52

  Modified:    .        ChangeLog
               WebView.subproj WebImageView.m
  Log:
          Reviewed and landed by Darin.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6090
            REGRESSION: Assertion failure when choosing Copy from a WebImageView's contextual menu
  
          * WebView.subproj/WebImageView.m:
          (-[WebImageView elementAtPoint:]): Use WebCoreElementImageRendererKey
          for the image renderer and WebElementImageKey for the image.
  
  Revision  Changes    Path
  1.3405    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3404
  retrieving revision 1.3405
  diff -u -r1.3404 -r1.3405
  --- ChangeLog	15 Dec 2005 22:17:55 -0000	1.3404
  +++ ChangeLog	16 Dec 2005 16:11:41 -0000	1.3405
  @@ -1,3 +1,14 @@
  +2005-12-16  Mitz Pettel  <opendarwin.org at mitzpettel.com>
  +
  +        Reviewed and landed by Darin.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6090
  +          REGRESSION: Assertion failure when choosing Copy from a WebImageView's contextual menu
  +
  +        * WebView.subproj/WebImageView.m:
  +        (-[WebImageView elementAtPoint:]): Use WebCoreElementImageRendererKey
  +        for the image renderer and WebElementImageKey for the image.
  +
   2005-12-15  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Darin.
  
  
  
  1.76      +3 -1      WebKit/WebView.subproj/WebImageView.m
  
  Index: WebImageView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebImageView.m,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- WebImageView.m	20 Sep 2005 08:33:05 -0000	1.75
  +++ WebImageView.m	16 Dec 2005 16:11:52 -0000	1.76
  @@ -43,6 +43,7 @@
   #import <WebKit/WebUIDelegatePrivate.h>
   
   #import <WebCore/WebCoreImageRenderer.h>
  +#import <WebCore/WebCoreBridge.h>
   
   @implementation WebImageView
   
  @@ -236,7 +237,8 @@
       ASSERT(frame);
       
       return [NSDictionary dictionaryWithObjectsAndKeys:
  -        [rep image],                            WebElementImageKey,
  +        [rep image],                            WebCoreElementImageRendererKey,
  +        [[rep image] image],                    WebElementImageKey,
           [NSValue valueWithRect:[self bounds]], 	WebElementImageRectKey,
           [rep URL],                              WebElementImageURLKey,
           [NSNumber numberWithBool:NO], 		WebElementIsSelectedKey,