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

[vicki]

The following commit has been merged in the debian/unstable branch:
commit 9fb6dae9cccc71e0a40ecdc0554f096358e4fa79
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 20 23:53:38 2004 +0000

            Reviewed by mjs.
    
    	- fix build breakage caused by removal of kWindowNoBufferingAttribute.
    
            * Carbon.subproj/CarbonWindowAdapter.m:
            (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
    	always used a retained backing store type
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index 14061de..bb1f34a 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -169,27 +169,17 @@ extern const OSType NSCarbonWindowPropertyTag;
     nativeWindow = GetNativeWindowFromWindowRef(inWindowRef);
 
     // Find out the window's Carbon window attributes.
-    osStatus = GetWindowAttributes(inWindowRef, &windowAttributes);
-    if (osStatus!=noErr) NSLog(@"A Carbon window's attributes couldn't be gotten.");
+    GetWindowAttributes(inWindowRef, &windowAttributes);
 
     // Find out the window's Carbon window features.
-    osStatus = GetWindowFeatures(inWindowRef, &windowFeatures);
-    if (osStatus!=noErr) NSLog(@"A Carbon window's features couldn't be gotten.");
+    GetWindowFeatures(inWindowRef, &windowFeatures);
 
     // Figure out the window's backing store type.
-    // This switch statement is inspired by one in HIToolbox/Windows/Platform/CGSPlatform.c's CreatePlatformWindow().  M.P. Notice - 8/2/00
-    switch (windowAttributes & (kWindowNoBufferingAttribute | kWindowRetainedAttribute)) {
-        case kWindowNoAttributes:
-            backingStoreType = NSBackingStoreBuffered;
-            break;
-        case kWindowRetainedAttribute:
-            backingStoreType = NSBackingStoreRetained;
-            break;
-        case kWindowNoBufferingAttribute:
-        default:
-            backingStoreType = NSBackingStoreNonretained;
-            break;
-    }
+    // At one time, this had code stolen from CreatePlatformWindow in HIToolbox/Windows/Platform/CGSPlatform.c
+	// But now the non-retained window class is a Carbon secret that's not even in
+	// WindowsPriv.h; maybe we'll have to revisit this if someone needs to use WebKit
+	// in a non-retained window.
+    backingStoreType = NSBackingStoreRetained;
 
     // Figure out the window's style mask.
     styleMask = _NSCarbonWindowMask;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1d7d8ab..d425e5f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-20  Darin Adler <darin at apple.com>
+
+        Reviewed by mjs.
+
+	- fix build breakage caused by removal of kWindowNoBufferingAttribute.  
+
+        * Carbon.subproj/CarbonWindowAdapter.m:
+        (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]):
+	always used a retained backing store type
+
 2004-02-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3563402>: when copying HTML, relative URLs should be made absolute

-- 
WebKit Debian packaging