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

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit de998118a9d8b6c9a99ca1297086f7467e106be0
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 21 19:01:56 2009 +0000

    Attempt to fix the Tiger build
    
    * WebView/WebPDFDocumentExtras.mm:
    (web_PDFDocumentAllScripts):
    (addWebPDFDocumentExtras):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index eec275f..1eb1237 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -3,6 +3,14 @@
         Attempt to fix the Tiger build
 
         * WebView/WebPDFDocumentExtras.mm:
+        (web_PDFDocumentAllScripts):
+        (addWebPDFDocumentExtras):
+
+2009-09-21  Dan Bernstein  <mitz at apple.com>
+
+        Attempt to fix the Tiger build
+
+        * WebView/WebPDFDocumentExtras.mm:
         * WebView/WebPDFRepresentation.mm:
 
 2009-09-21  Dan Bernstein  <mitz at apple.com>
diff --git a/WebKit/mac/WebView/WebPDFDocumentExtras.mm b/WebKit/mac/WebView/WebPDFDocumentExtras.mm
index 6e99e00..8296148 100644
--- a/WebKit/mac/WebView/WebPDFDocumentExtras.mm
+++ b/WebKit/mac/WebView/WebPDFDocumentExtras.mm
@@ -121,7 +121,7 @@ static NSArray *web_PDFDocumentAllScripts(id self, SEL _cmd)
         if (!bytes)
             continue;
 
-        NSStringEncoding encoding = (length > 1 && bytes[0] == 0xFE && bytes[1] == 0xFF) ? NSUTF16StringEncoding : NSUTF8StringEncoding;
+        NSStringEncoding encoding = (length > 1 && bytes[0] == 0xFE && bytes[1] == 0xFF) ? NSUnicodeStringEncoding : NSUTF8StringEncoding;
         NSString *script = [[NSString alloc] initWithBytes:bytes length:length encoding:encoding];
         [scripts addObject:script];
         [script release];
@@ -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), (IMP)web_PDFDocumentAllScripts, "@@:" } };
+    struct objc_method_list methodList = { 0, 1, { @selector(_web_allScripts), "@@:", (IMP)web_PDFDocumentAllScripts } };
     class_addMethods(pdfDocumentClass, &methodList);
 #endif
 }

-- 
WebKit Debian packaging