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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 355cbc430ca6ed116398010a6521b087b341c8b6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 13 18:06:26 2003 +0000

            Fixed by Ed Voas, reviewed by me.
    
            - fixed 3278443: CARBON: grow box obscures scroll bar knob
    
            * Carbon.subproj/CarbonWindowAdapter.m: (-[CarbonWindowAdapter _growBoxRect]):
            Return the grow box so AppKit's scroll bar code will know where it is.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index 41a1ce9..14061de 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -106,6 +106,7 @@ extern const OSType NSCarbonWindowPropertyTag;
 - (NSGraphicsContext *)_threadContext;
 - (void)_setFrame:(NSRect)newWindowFrameRect;
 - (void)_setVisible:(BOOL)flag;
+- (NSRect)_growBoxRect;
 @end
 
 @interface NSApplication(HIWebFrameView)
@@ -979,6 +980,32 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
 - (void)_reallyDoOrderWindow:(NSWindowOrderingMode)place relativeTo:(int)otherWin findKey:(BOOL)doKeyCalc forCounter:(BOOL)isACounter force:(BOOL)doForce isModal:(BOOL)isModal {
 }
 
+- (NSRect) _growBoxRect
+{
+      WindowAttributes                attrs;
+      NSRect                                  retRect = NSZeroRect;
+
+      GetWindowAttributes( _windowRef, &attrs );
+
+      if ( attrs & kWindowResizableAttribute )
+      {
+              HIRect          bounds, rect;
+              HIViewRef   view;
+
+              HIViewGetBounds( HIViewGetRoot( _windowRef ), &bounds );
+              HIViewFindByID( HIViewGetRoot( _windowRef ), kHIViewWindowGrowBoxID, &view );
+              HIViewGetFrame( view, &rect );
+
+              rect.origin.y = bounds.size.height - CGRectGetMaxY( rect ) - 1;
+              rect.origin.x++;
+
+              retRect = *(NSRect*)&rect;
+      }
+
+      return retRect;
+}
+
+
 /*
 void _NSSetModalWindowClassLevel(int level) {
     WindowGroupRef groupRef;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7148fe0..eb2627d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,13 @@
-2003-12-12  Ken Kocienda  <kocienda at apple.com>
+2003-12-13  Darin Adler  <darin at apple.com>
 
-        Reviewed by me
+        Fixed by Ed Voas, reviewed by me.
+
+        - fixed 3278443: CARBON: grow box obscures scroll bar knob
+
+        * Carbon.subproj/CarbonWindowAdapter.m: (-[CarbonWindowAdapter _growBoxRect]):
+        Return the grow box so AppKit's scroll bar code will know where it is.
+
+2003-12-12  Ken Kocienda  <kocienda at apple.com>
 
         * WebCoreSupport.subproj/WebKeyGeneration.cpp:
         (signedPublicKeyAndChallengeString): Fix build-bustin' typo.
@@ -226,7 +233,7 @@
 
         Reviewed by John.
 
-        - fixed  regression in small caps with substituted fonts my patch from yesterday caused
+        - fixed regression in small caps with substituted fonts my patch from yesterday caused
         - fixed 3463599: if Lucida font is installed, you see bad glyphs on pages that use it (advogato.org)
         - fixed storage leak if a renderer is ever deallocated (I don't think we ever do that)
         - fixed some small leaks in various error cases by adding appropriate free and dispose calls
@@ -453,8 +460,6 @@
 
 2003-11-20  Ken Kocienda  <kocienda at apple.com>
 
-        Reviewed by me
-
 	John and I decided to apply the _web_ prefix to the tab key 
 	event method in the extras file, but I neglected to do this
 	before checking in. Fixed now.
@@ -4290,8 +4295,6 @@
 
 2003-07-21  Ken Kocienda  <kocienda at apple.com>
 
-        Reviewed by me.
-
 	Fixed build breaker.
 
 	Removed glyphCountFromFont function. It was used only in an
@@ -4373,8 +4376,6 @@
 
 2003-07-17  Ken Kocienda  <kocienda at apple.com>
 
-        Reviewed by me
-
         * Misc.subproj/WebNSURLExtras.m:
         (-[NSURL _web_URLStringLength]): Fix premature use of new CFURL API.
 	New code is ifdef'ed out for now until everyone has revved.

-- 
WebKit Debian packaging