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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 383f493ce8f803d3607bc4d623782d8d91f04fce
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 23 20:53:10 2010 +0000

    2010-10-23  David Kilzer  <ddkilzer at apple.com>
    
            <http://webkit.org/b/48181> Add missing include of MacErrors.h
    
            Reviewed by Alexey Proskuryakov.
    
            * platform/network/mac/FormDataStreamMac.mm: Added #import of
            <MacErrors.h> for iOS since the formOpen() method uses "fnfErr",
            which was added in r55670.  The same header is included through
            <CoreServices/CoreServices.h> on Mac OS X.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0d4841f..0fce9b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-23  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/48181> Add missing include of MacErrors.h
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/network/mac/FormDataStreamMac.mm: Added #import of
+        <MacErrors.h> for iOS since the formOpen() method uses "fnfErr",
+        which was added in r55670.  The same header is included through
+        <CoreServices/CoreServices.h> on Mac OS X.
+
 2010-10-23  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebCore/platform/network/mac/FormDataStreamMac.mm b/WebCore/platform/network/mac/FormDataStreamMac.mm
index 9b5884f..69af91a 100644
--- a/WebCore/platform/network/mac/FormDataStreamMac.mm
+++ b/WebCore/platform/network/mac/FormDataStreamMac.mm
@@ -46,6 +46,12 @@
 #import <wtf/StdLibExtras.h>
 #import <wtf/Threading.h>
 
+#if PLATFORM(IOS)
+#import <MacErrors.h>
+#else
+#import <CoreServices/CoreServices.h>
+#endif
+
 namespace WebCore {
 
 typedef HashMap<CFReadStreamRef, RefPtr<FormData> > StreamFormDataMap;

-- 
WebKit Debian packaging