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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:49 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1ae1baffb69d6337f83e60e9e3cf3e3c0c1c0c3d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 9 19:42:45 2002 +0000

    2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
    
            Reviewed by: Chris Blumenberg
    
            Fix for this bug:
    
            Radar 2922673 (Remove use of private NSData interface in IFURLFileDatabase.m)
    
            * Database.subproj/IFURLFileDatabase.m:
            (-[IFURLFileReader initWithPath:]): Code now uses new Jaguar public API
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 4829850..8e4656d 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -47,13 +47,6 @@ enum
 
 // implementation IFURLFileReader -------------------------------------------------------------
 
-/*
- * FIXME: [kocienda] Radar 2922673 (Remove use of private NSData interface in IFURLFileDatabase.m)
- */
- at interface NSData (IFExtensions)
-- (id)initWithBytes:(void *)bytes length:(unsigned)length copy:(BOOL)copy freeWhenDone:(BOOL)freeBytes bytesAreVM:(BOOL)vm;
- at end
-
 static NSMutableSet *notMappableFileNameSet = nil;
 static NSLock *mutex;
 
@@ -115,7 +108,7 @@ static void URLFileReaderInit(void)
             else {
                 // On success, create data object using mapped bytes.
                 mappedLength = statInfo.st_size;
-                data = [[NSData alloc] initWithBytes:mappedBytes length:mappedLength copy:NO freeWhenDone:YES bytesAreVM:YES];
+                data = [[NSData alloc] initWithBytesNoCopy:mappedBytes length:mappedLength freeWhenDone:YES];
                 // ok data creation failed but we know file exists
                 // be stubborn....try to read bytes again
                 if (!data) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list