[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mitz at apple.com mitz at apple.com
Wed Dec 22 15:37:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 39064cc3697c6b150683f71dce623508afeea216
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 18:19:33 2010 +0000

    <rdar://problem/8646456> WebProcess crashes reproducibly on complex text
    
    Rubber-stamped by Darin Adler.
    
    * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
    (InitWebCoreSystemInterface): Initialize wkCreateCTTypesetterWithUniCharProviderAndOptions
    and wkCreateCTLineWithUniCharProvider.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f7467e5..0a171da 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09  Dan Bernstein  <mitz at apple.com>
+
+        Rubber-stamped by Darin Adler.
+
+        <rdar://problem/8646456> WebProcess crashes reproducibly on complex text
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize wkCreateCTTypesetterWithUniCharProviderAndOptions
+        and wkCreateCTLineWithUniCharProvider.
+
 2010-11-09  Sam Weinig  <sam at webkit.org>
 
         Fix Windows build.
diff --git a/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index 9450745..90b9a64 100644
--- a/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -40,6 +40,7 @@ void InitWebCoreSystemInterface(void)
         INIT(CGContextGetShouldSmoothFonts);
         INIT(CopyCONNECTProxyResponse);
         INIT(CopyNSURLResponseStatusLine);
+        INIT(CreateCTLineWithUniCharProvider);
         INIT(CreateCustomCFReadStream);
         INIT(CreateNSURLConnectionDelegateProxy);
         INIT(DrawBezeledTextArea);
@@ -90,8 +91,10 @@ void InitWebCoreSystemInterface(void)
         INIT(SignalCFReadStreamError);
         INIT(SignalCFReadStreamHasBytes);
 
-    #if defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+        INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
+#else
         INIT(GetHyphenationLocationBeforeIndex);
-    #endif
+#endif
     });
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list