[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[oliver at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 03c64c1394959e326a66f161073021e0a0fcd5a3
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 21:04:34 2010 +0000

    Force JSC to create a prototype chain for API classes with a
    parent class but no static functions.
    
    Reviewed by Geoff Garen.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSClassRef.cpp b/JavaScriptCore/API/JSClassRef.cpp
index e443dc6..5b7fdbc 100644
--- a/JavaScriptCore/API/JSClassRef.cpp
+++ b/JavaScriptCore/API/JSClassRef.cpp
@@ -122,7 +122,8 @@ static void clearReferenceToPrototype(JSObjectRef prototype)
 
 PassRefPtr<OpaqueJSClass> OpaqueJSClass::create(const JSClassDefinition* definition)
 {
-    if (const JSStaticFunction* staticFunctions = definition->staticFunctions) {
+    const JSStaticFunction* staticFunctions = definition->staticFunctions;
+    if (staticFunctions || definition->parentClass) {
         // copy functions into a prototype class
         JSClassDefinition protoDefinition = kJSClassDefinitionEmpty;
         protoDefinition.staticFunctions = staticFunctions;
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7c8d411..11ecdfd 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-21  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Force JSC to create a prototype chain for API classes with a
+        parent class but no static functions.
+
+        * API/JSClassRef.cpp:
+        (OpaqueJSClass::create):
+
 2010-01-21  Kent Hansen  <kent.hansen at nokia.com>
 
         Reviewed by Geoffrey Garen.

-- 
WebKit Debian packaging