[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

mitz at apple.com mitz at apple.com
Thu Oct 29 20:31:54 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit b1aaa8648ffacdb2cd9b7bc6a9d6071d4f184e13
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 22 14:26:21 2009 +0000

    <rdar://problem/7240911> REGRESSION (r48586): Crash occurs when loading
    a PDF
    
    Reviewed by John Sullivan.
    
    * WebView/WebPDFDocumentExtras.mm:
    (addWebPDFDocumentExtras): Made methodList static, because
    class_addMethods() doesn't copy it.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 12b5c02..733112a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-22  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/7240911> REGRESSION (r48586): Crash occurs when loading
+        a PDF
+
+        * WebView/WebPDFDocumentExtras.mm:
+        (addWebPDFDocumentExtras): Made methodList static, because
+        class_addMethods() doesn't copy it.
+
 2009-09-21  Dan Bernstein  <mitz at apple.com>
 
         Attempt to fix the Tiger build
diff --git a/WebKit/mac/WebView/WebPDFDocumentExtras.mm b/WebKit/mac/WebView/WebPDFDocumentExtras.mm
index 7265568..9253a5d 100644
--- a/WebKit/mac/WebView/WebPDFDocumentExtras.mm
+++ b/WebKit/mac/WebView/WebPDFDocumentExtras.mm
@@ -135,7 +135,7 @@ void addWebPDFDocumentExtras(Class pdfDocumentClass)
 #ifndef BUILDING_ON_TIGER
     class_addMethod(pdfDocumentClass, @selector(_web_allScripts), (IMP)web_PDFDocumentAllScripts, "@@:");
 #else
-    struct objc_method_list methodList = { 0, 1, { @selector(_web_allScripts), (char*)"@@:", (IMP)web_PDFDocumentAllScripts } };
+    static struct objc_method_list methodList = { 0, 1, { @selector(_web_allScripts), (char*)"@@:", (IMP)web_PDFDocumentAllScripts } };
     class_addMethods(pdfDocumentClass, &methodList);
 #endif
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list