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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1ebe71390f0a6ef977c5794edee82dbb581bacad
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 18:02:45 2010 +0000

    2010-11-04  John Reck  <jreck at google.com>
    
            Reviewed by Steve Block.
    
            Fix a linker failure when building for Android
            https://bugs.webkit.org/show_bug.cgi?id=48964
    
            The Android stub for setCookieStoragePrivateBrowsingEnabled(bool) wasn't in the WebCore namespace, which caused
            a linker failure when building for Android. Moved the stub to the WebCore namespace. This was caused by
            http://trac.webkit.org/changeset/70400
    
            No new tests, build fix only
    
            * platform/android/TemporaryLinkStubs.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b425036..6bbb7e0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-04  John Reck  <jreck at google.com>
+
+        Reviewed by Steve Block.
+
+        Fix a linker failure when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=48964
+        
+        The Android stub for setCookieStoragePrivateBrowsingEnabled(bool) wasn't in the WebCore namespace, which caused
+        a linker failure when building for Android. Moved the stub to the WebCore namespace. This was caused by 
+        http://trac.webkit.org/changeset/70400
+        
+        No new tests, build fix only
+
+        * platform/android/TemporaryLinkStubs.cpp:
+
 2010-11-04  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index a4d0a95..28611e3 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -501,9 +501,13 @@ OpaqueJSClassContextData::~OpaqueJSClassContextData()
     notImplemented();
 }
 
+#endif
+
+namespace WebCore {
+
 void setCookieStoragePrivateBrowsingEnabled(bool)
 {
     notImplemented();
 }
 
-#endif
+} // namespace WebCore

-- 
WebKit Debian packaging