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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e12168f972e55316c8005c8c266a6137bc101e49
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 7 21:06:42 2004 +0000

    	Fix for 3604388.  The runtime version check (_CFExecutableLinkedOnOrAfter) used by many of
    	our frameworks doesn't work for CFM apps.  So, conditional panther bugs fixes aren't
    	being pickup by CFM apps that use WebKit, specifically Contribute.  This particular radar
    	describes a problem that was conditionally fixed in the AppKit for panther.  The work-around
    	is to force NSBitmapImageRep to execute to conditional code.
    
            Reviewed by Maciej.
    
            * Carbon.subproj/CarbonUtils.m:
            (WebInitForCarbon):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6325 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.m b/WebKit/Carbon.subproj/CarbonUtils.m
index 411f28a..de16b3e 100644
--- a/WebKit/Carbon.subproj/CarbonUtils.m
+++ b/WebKit/Carbon.subproj/CarbonUtils.m
@@ -6,9 +6,11 @@
  *  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
  */
+#import <AppKit/NSBitmapImageRep_Private.h>
 
 #include "CarbonUtils.h"
 
+
 extern CGImageRef _NSCreateImageRef( unsigned char *const bitmapData[5], int pixelsWide, int pixelsHigh, int bitsPerSample, int samplesPerPixel, int bitsPerPixel, int bytesPerRow, BOOL isPlanar, BOOL hasAlpha, NSString *colorSpaceName, CGColorSpaceRef customColorSpace, id sourceObj);
 
 static void				PoolCleaner( EventLoopTimerRef inTimer, EventLoopIdleTimerMessage inState, void *inUserData );
@@ -45,6 +47,8 @@ WebInitForCarbon()
         InstallEventLoopIdleTimer( GetMainEventLoop(), 1.0, 0, PoolCleaner, 0, NULL );
         
         sAppKitLoaded = true;     
+
+        [NSBitmapImageRep _setEnableFlippedImageFix:YES];
     }
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2112634..ac549ce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-04-07  Richard Williamson   <rjw at apple.com>
+
+	Fix for 3604388.  The runtime version check (_CFExecutableLinkedOnOrAfter) used by many of
+	our frameworks doesn't work for CFM apps.  So, conditional panther bugs fixes aren't
+	being pickup by CFM apps that use WebKit, specifically Contribute.  This particular radar
+	describes a problem that was conditionally fixed in the AppKit for panther.  The work-around
+	is to force NSBitmapImageRep to execute to conditional code.
+
+        Reviewed by Maciej.
+
+        * Carbon.subproj/CarbonUtils.m:
+        (WebInitForCarbon):
+
 2004-04-06  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3510805.  Only release pool in timer if the current nesting level of the

-- 
WebKit Debian packaging