[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[voas]

The following commit has been merged in the debian/unstable branch:
commit f94dc2ecd8864f03f2eaa459896812e71dd620ea
Author: voas <voas at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 6 22:14:51 2003 +0000

    2003-03-06  Ed Voas  voas at apple.com
    
            Reviewed by Richard.
    
    		Don't use _HIViewSetNeedsDisplayInRect for now. Fixes
    		Jaguar builds.
    
            * Carbon.subproj/HIViewAdapter.m:
            (-[HIViewAdapter setNeedsDisplay:]):
            (-[HIViewAdapter setNeedsDisplayInRect:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/HIViewAdapter.m b/WebKit/Carbon.subproj/HIViewAdapter.m
index 2907bae..e81ee36 100644
--- a/WebKit/Carbon.subproj/HIViewAdapter.m
+++ b/WebKit/Carbon.subproj/HIViewAdapter.m
@@ -109,7 +109,27 @@ static CFMutableDictionaryRef	sViewMap;
 			//printf( "  flipped to %g %g %g %g\n", rect.origin.y, rect.origin.x,
 			//	CGRectGetMaxY( rect ), CGRectGetMaxX( rect ) );
 
-			_HIViewSetNeedsDisplayInRect( hiView, &rect, false );
+			// For now, call the region-based API.
+			{
+				RgnHandle rgn = NewRgn();
+				if ( rgn )
+				{
+					Rect		qdRect;
+					qdRect.top = (SInt16)rect.origin.y;
+					qdRect.left = (SInt16)rect.origin.x;
+					qdRect.bottom = CGRectGetMaxY( rect );
+					qdRect.right = CGRectGetMaxX( rect );
+				
+					RectRgn( rgn, &qdRect );
+					HIViewSetNeedsDisplayInRegion( hiView, rgn, false );
+					DisposeRgn( rgn );
+				}
+				else
+				{
+					HIViewSetNeedsDisplay( hiView, false );
+				}
+			}
+			//_HIViewSetNeedsDisplayInRect( hiView, &rect, false );
 		}
 	}
 }
@@ -154,7 +174,27 @@ static CFMutableDictionaryRef	sViewMap;
     			//printf( "  flipped to %g %g %g %g\n", rect.origin.y, rect.origin.x,
     			//	CGRectGetMaxY( rect ), CGRectGetMaxX( rect ) );
 
-	    		_HIViewSetNeedsDisplayInRect( hiView, &rect, true );
+				// For now, call the region-based API.
+				{
+					RgnHandle rgn = NewRgn();
+					if ( rgn )
+					{
+						Rect		qdRect;
+						qdRect.top = (SInt16)rect.origin.y;
+						qdRect.left = (SInt16)rect.origin.x;
+						qdRect.bottom = CGRectGetMaxY( rect );
+						qdRect.right = CGRectGetMaxX( rect );
+					
+						RectRgn( rgn, &qdRect );
+						HIViewSetNeedsDisplayInRegion( hiView, rgn, true );
+						DisposeRgn( rgn );
+					}
+					else
+					{
+						HIViewSetNeedsDisplay( hiView, true );
+					}
+				}
+	    		//_HIViewSetNeedsDisplayInRect( hiView, &rect, true );
 	    	}
     	}
     	else
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 95adb12..ffc9b40 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-06  Ed Voas  voas at apple.com
+
+        Reviewed by Richard.
+
+		Don't use _HIViewSetNeedsDisplayInRect for now. Fixes
+		Jaguar builds.
+
+        * Carbon.subproj/HIViewAdapter.m:
+        (-[HIViewAdapter setNeedsDisplay:]):
+        (-[HIViewAdapter setNeedsDisplayInRect:]):
+
 2003-03-05  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.

-- 
WebKit Debian packaging