[webkit-changes] cvs commit: WebKit/Carbon.subproj HIWebView.m

[Darin]

darin       05/09/05 16:12:44

  Modified:    .        ChangeLog
               Carbon.subproj HIWebView.m
  Log:
          Reviewed by John Sullivan.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4846
            REGRESSION: Carbon WebKit applications don't work at all
  
          * Carbon.subproj/HIWebView.m: Remove lots of unneeded declarations of private stuff.
          (Draw): Call WKNSWindowOverrideCGContext and WKNSWindowRestoreCGContext rather
          than calling a non-existent setCGContext: method on the context.
  
  Revision  Changes    Path
  1.3310    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3309
  retrieving revision 1.3310
  diff -u -r1.3309 -r1.3310
  --- ChangeLog	5 Sep 2005 22:26:03 -0000	1.3309
  +++ ChangeLog	5 Sep 2005 23:12:40 -0000	1.3310
  @@ -1,3 +1,14 @@
  +2005-09-05  Darin Adler  <darin at apple.com>
  +
  +        Reviewed by John Sullivan.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4846
  +          REGRESSION: Carbon WebKit applications don't work at all
  +
  +        * Carbon.subproj/HIWebView.m: Remove lots of unneeded declarations of private stuff.
  +        (Draw): Call WKNSWindowOverrideCGContext and WKNSWindowRestoreCGContext rather
  +        than calling a non-existent setCGContext: method on the context.
  +
   2005-09-05  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  1.28      +6 -31     WebKit/Carbon.subproj/HIWebView.m
  
  Index: HIWebView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Carbon.subproj/HIWebView.m,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- HIWebView.m	7 Jun 2005 00:37:21 -0000	1.27
  +++ HIWebView.m	5 Sep 2005 23:12:44 -0000	1.28
  @@ -34,32 +34,12 @@
   #include "HIViewAdapter.h"
   #include <WebKitSystemInterface.h>
   
  - at interface NSView (AppKitSecretsWebGraphicsBridgeKnowsAbout)
  -- (NSView *)_clipViewAncestor;
  - at end
  -
  - at interface NSGraphicsContext (Secret)
  -- (void)setCGContext:(CGContextRef)cgContext;
  - at end
  -
  - at interface NSWindow(Secret)
  -- (NSGraphicsContext *)_threadContext;
  -- (NSView *)_borderView;
  + at interface NSWindow (AppKitSecretsHIWebViewKnows)
   - (void)_removeWindowRef;
   @end
   
  - at interface NSEvent( Secret )
  -- (NSEvent *)_eventRelativeToWindow:(NSWindow *)aWin;
  - at end
  -
  - at interface NSView( Secret )
  -- (void) _setHIView:(HIViewRef)view;
  -- (void) _clearDirtyRectsForTree;
  -- (BOOL) _allowsContextMenus;
  - at end
  -
  - at interface NSMenu( Secret )
  -- (void)_popUpMenuWithEvent:(NSEvent*)event forView:(NSView*)view;
  + at interface NSView (AppKitSecretsHIWebViewKnows)
  +- (void)_clearDirtyRectsForTree;
   @end
   
   @interface MenuItemProxy : NSObject <NSValidatedUserInterfaceItem>
  @@ -344,7 +324,6 @@
   Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext )
   {
   	HIRect				bounds;
  -	CGContextRef		temp;
   	Rect				drawRect;
   	HIRect				hiRect;
   	bool				createdContext = false;
  @@ -365,10 +344,8 @@
       
   	HIViewGetBounds( inView->fViewRef, &bounds );
   
  -	temp = (CGContextRef)[[inView->fKitWindow _threadContext] graphicsPort];
  -	CGContextRetain( temp );
  -	[[inView->fKitWindow _threadContext] setCGContext: inContext];
  -	[NSGraphicsContext setCurrentContext:[inView->fKitWindow _threadContext] ];
  +    CGContextRef savedContext = WKNSWindowOverrideCGContext(inView->fKitWindow, inContext);
  +    [NSGraphicsContext setCurrentContext:[inView->fKitWindow graphicsContext]];
   
   	GetRegionBounds( limitRgn, &drawRect );
   
  @@ -388,7 +365,7 @@
       else
           [inView->fWebView displayRect:*(NSRect*)&hiRect];
   
  -    [[inView->fKitWindow _threadContext] setCGContext: temp];
  +    WKNSWindowRestoreCGContext(inView->fKitWindow, savedContext);
   
       if ( !inView->fIsComposited )
       {
  @@ -413,8 +390,6 @@
           }
        }
   
  -    CGContextRelease( temp );
  -    
       if ( createdContext )
       {
           CGContextSynchronize( inContext );