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

[Adele]

adele       05/08/11 18:53:28

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               Carbon.subproj Tag: Safari-2-0-branch HIViewAdapter.m
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-11  Beth Dakin  <bdakin at apple.com>
  
          Reviewed by Vicki
  
  	This is a fix for <rdar://problem/4141161> REGRESSION (Tiger): WebKit does not display in composited Carbon windows.
  	I basically did what Troy suggests in his bug comments, and everything seems to work fine!
  
          * Carbon.subproj/HIViewAdapter.m:
          (-[HIViewAdapter setNeedsDisplayInRect:]):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.41 +14 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.40
  retrieving revision 1.3118.4.41
  diff -u -r1.3118.4.40 -r1.3118.4.41
  --- ChangeLog	11 Aug 2005 01:39:45 -0000	1.3118.4.40
  +++ ChangeLog	12 Aug 2005 01:53:23 -0000	1.3118.4.41
  @@ -1,3 +1,17 @@
  +2005-08-11  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-11  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by Vicki
  +
  +	This is a fix for <rdar://problem/4141161> REGRESSION (Tiger): WebKit does not display in composited Carbon windows.
  +	I basically did what Troy suggests in his bug comments, and everything seems to work fine!
  +
  +        * Carbon.subproj/HIViewAdapter.m:
  +        (-[HIViewAdapter setNeedsDisplayInRect:]):
  +
   2005-08-10  Adele Peterson  <adele at apple.com>
   
           Changes made to WebSubresourceLoader.m need to be made on WebSubresourceClient.m, since the file was renamed on TOT.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.56.1  +2 -3      WebKit/Carbon.subproj/HIViewAdapter.m
  
  Index: HIViewAdapter.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Carbon.subproj/HIViewAdapter.m,v
  retrieving revision 1.3
  retrieving revision 1.3.56.1
  diff -u -r1.3 -r1.3.56.1
  --- HIViewAdapter.m	19 Mar 2003 23:11:52 -0000	1.3
  +++ HIViewAdapter.m	12 Aug 2005 01:53:27 -0000	1.3.56.1
  @@ -120,15 +120,14 @@
   }
   
   - (void)setNeedsDisplayInRect:(NSRect)invalidRect {
  +        invalidRect = NSUnionRect(invalidRect, [self _dirtyRect]);
   	[super setNeedsDisplayInRect:invalidRect];
   	
  -    if (_vFlags.needsDisplay || _vFlags.needsDisplayForBounds) 
  +    if (!NSIsEmptyRect(invalidRect)) 
       {
       	HIViewRef	hiView = NULL;
       	NSRect		targetBounds = _bounds;
       	NSView*		view = self;
  -    	
  -		invalidRect = [self _dirtyRect];
   		
       	while ( view ) {
   			targetBounds = [view bounds];