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

sullivan sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:41:51 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 7501c41aacdd2325a8e40210e1beb7a4431d5125
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 13 16:40:44 2003 +0000

    	fixed build break
    
            Reviewed by Darin
    
            * WebCoreSupport.subproj/WebImageRenderer.m:
            (-[WebImageRenderer initWithData:MIMEType:]):
    	move #ifdefs; two required methods were being #ifdeffed
    	out on Panther
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4358 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 028fd01..163b5f4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-13  John Sullivan  <sullivan at apple.com>
+
+	fixed build break
+
+        Reviewed by Darin
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer initWithData:MIMEType:]):
+	move #ifdefs; two required methods were being #ifdeffed
+	out on Panther
+
 2003-05-12  Richard Williamson  <rjw at apple.com>
 
         Fixed 3251316.  *** Public API Change ***
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 046dcc1..d4bbd93 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -89,6 +89,8 @@ static NSMutableArray *activeImageRenderers;
     }
 }
 
+#endif
+
 - (id)initWithMIMEType:(NSString *)MIME
 {
     [super init];
@@ -99,13 +101,14 @@ static NSMutableArray *activeImageRenderers;
 // Part of the workaround for bug 3090341.
 - (id)initWithData:(NSData *)data MIMEType:(NSString *)MIME
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
     [self checkDataForGIFExtensionSignature:data];
+#endif
     [super initWithData:data];
     MIMEType = [MIME copy];
     return self;
 }
 
-#endif
 
 - copyWithZone:(NSZone *)zone
 {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list