[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[snej at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 374837cbff67dd117188cb9ddb47b3f2b31fa0e0
Author: snej at chromium.org <snej at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 21:26:38 2009 +0000

    Fix a link error in unofficial GCC 4.4 builds on Linux.
    https://bugs.webkit.org/show_bug.cgi?id=31477
    
    Reviewed by Dimitri Glazkov.
    
    * bindings/v8/V8Binding.cpp:  Add explicit instantiations of v8StringToWebCoreString template.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7d50f01..3f37c70 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-13  Jens Alfke  <snej at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix a link error in unofficial GCC 4.4 builds on Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=31477
+
+        * bindings/v8/V8Binding.cpp:  Add explicit instantiations of v8StringToWebCoreString template.
+
 2009-11-13  Eric Seidel  <eric at webkit.org>
 
         No review, build fix only.
diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp
index f069c03..c25a81c 100644
--- a/WebCore/bindings/v8/V8Binding.cpp
+++ b/WebCore/bindings/v8/V8Binding.cpp
@@ -279,6 +279,12 @@ StringType v8StringToWebCoreString(v8::Handle<v8::String> v8String, ExternalMode
     }
     return result;
 }
+    
+// Explicitly instantiate the above template with the expected parameterizations,
+// to ensure the compiler generates the code; otherwise link errors can result in GCC 4.4.
+template String v8StringToWebCoreString<String>(v8::Handle<v8::String>, ExternalMode);
+template AtomicString v8StringToWebCoreString<AtomicString>(v8::Handle<v8::String>, ExternalMode);
+
 
 String v8NonStringValueToWebCoreString(v8::Handle<v8::Value> object)
 {

-- 
WebKit Debian packaging