2008-09-04 Tor Arne Vestbø <tavestbo@trolltech.com>
authorvestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Sep 2008 14:24:58 +0000 (14:24 +0000)
committervestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Sep 2008 14:24:58 +0000 (14:24 +0000)
        Reviewed by Simon

        Fix the QtWebKit build to match changes in r36016

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@36089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.pri
WebCore/ChangeLog
WebCore/WebCore.pro
WebCore/bridge/qt/qt_instance.cpp
WebCore/bridge/qt/qt_runtime.cpp
WebCore/platform/graphics/qt/FontQt.cpp
WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog

index 1f30fea7b3f68625905944e46cad0fb53ed56a0c..551dc219a08069455e1aeff489efb3528e7d8c23 100644 (file)
@@ -1,3 +1,11 @@
+2008-09-04  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Fix the QtWebKit build to match changes in r36016
+
+        * JavaScriptCore.pri:
+
 2008-09-04  Mark Rowe  <mrowe@apple.com>
 
         Fix the 64-bit build.
index 13b513917570ffdde33e8009b864ac2d4d90fc63..453af7c611b040fbcdd47fa2cffd7461cbf8ef3c 100644 (file)
@@ -135,6 +135,7 @@ SOURCES += \
     kjs/StringConstructor.cpp \
     kjs/StringObject.cpp \
     kjs/StringPrototype.cpp \
+    kjs/StructureID.cpp \
     kjs/ustring.cpp \
     profiler/HeavyProfile.cpp \
     profiler/Profile.cpp \
index 38b2d8d5992546b0a0f8c550d4a3442b40154270..6f3916865c95c9d0b74f9ad4f83a6c0a04dec83d 100644 (file)
@@ -1,3 +1,16 @@
+2008-09-04  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Fix the QtWebKit build to match changes in r36016
+
+        * WebCore.pro:
+        * bridge/qt/qt_instance.cpp:
+        (KJS::Bindings::QtInstance::getRuntimeObject):
+        * bridge/qt/qt_runtime.cpp:
+        (KJS::Bindings::convertQVariantToValue):
+        (KJS::Bindings::QtConnectionObject::execute):
+
 2008-09-04  Tor Arne Vestbø  <tavestbo@trolltech.com>
 
         Reviewed by Simon.
index 232275191ac9eaef5a5e7f93d35d26c65f5791bb..eeda670b4ff9a5687052e94e40520ed0a3075752 100644 (file)
@@ -331,6 +331,7 @@ IDL_BINDINGS += \
     html/HTMLTitleElement.idl \
     html/HTMLUListElement.idl \
     html/ImageData.idl \
+    html/TextMetrics.idl \
     page/BarInfo.idl \
     page/Console.idl \
     page/DOMSelection.idl \
index 6698d0b52af515158b874a9d351c9a84cc04e36e..58328ded617f4473d48a7b0a017ebb71e379c773 100644 (file)
@@ -49,7 +49,7 @@ static InstanceJSObjectMap cachedObjects;
 // Derived RuntimeObject
 class QtRuntimeObjectImp : public RuntimeObjectImp {
     public:
-        QtRuntimeObjectImp(PassRefPtr<Instance>);
+        QtRuntimeObjectImp(ExecState* exec, PassRefPtr<Instance>);
         ~QtRuntimeObjectImp();
         virtual void invalidate();
 
@@ -67,8 +67,8 @@ class QtRuntimeObjectImp : public RuntimeObjectImp {
         void removeFromCache();
 };
 
-QtRuntimeObjectImp::QtRuntimeObjectImp(PassRefPtr<Instance> instance)
-    : RuntimeObjectImp(instance)
+QtRuntimeObjectImp::QtRuntimeObjectImp(ExecState* exec, PassRefPtr<Instance> instance)
+    : RuntimeObjectImp(exec, instance)
 {
 }
 
@@ -170,7 +170,7 @@ RuntimeObjectImp* QtInstance::getRuntimeObject(ExecState* exec, PassRefPtr<QtIns
     JSLock lock(false);
     RuntimeObjectImp* ret = static_cast<RuntimeObjectImp*>(cachedObjects.value(instance.get()));
     if (!ret) {
-        ret = new (exec) QtRuntimeObjectImp(instance);
+        ret = new (exec) QtRuntimeObjectImp(exec, instance);
         cachedObjects.insert(instance.get(), ret);
     }
     return ret;
index 00325356d3b9deeadb53756c7bda56971b468d7b..933f45d78ec5320c2e43bcdcc6c586ea2cfbc85a 100644 (file)
@@ -807,9 +807,11 @@ JSValue* convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, co
         while (i != map.constEnd()) {
             QString s = i.key();
             JSValue* val = convertQVariantToValue(exec, root, i.value());
-            if (val)
-                ret->put(exec, Identifier(exec, (const UChar *)s.constData(), s.length()), val);
-            // ### error case?
+            if (val) {
+                PutPropertySlot slot;
+                ret->put(exec, Identifier(exec, (const UChar *)s.constData(), s.length()), val, slot);
+                // ### error case?
+            }
             ++i;
         }
 
@@ -1647,8 +1649,9 @@ void QtConnectionObject::execute(void **argv)
                         JSFunction* fimp = static_cast<JSFunction*>(m_funcObject.get());
 
                         JSObject* qt_sender = Instance::createRuntimeObject(exec, QtInstance::create(sender(), ro));
-                        JSObject* wrapper = new (exec) JSObject();
-                        wrapper->put(exec, Identifier(exec, "__qt_sender__"), qt_sender);
+                        JSObject* wrapper = new (exec) JSObject(exec->globalData().nullProtoStructureID);
+                        PutPropertySlot slot;
+                        wrapper->put(exec, Identifier(exec, "__qt_sender__"), qt_sender, slot);
                         ScopeChain oldsc = fimp->scope();
                         ScopeChain sc = oldsc;
                         sc.push(wrapper);
index 0f34afa109cc4da7e22b461f86efbda54b3cb0de..c4d62f91df3be2eb5db9d28cde5eea0f089f7fd5 100644 (file)
@@ -683,6 +683,11 @@ int Font::lineSpacing() const
     return QFontMetrics(m_font).lineSpacing();
 }
 
+int Font::lineGap() const
+{
+    return QFontMetrics(m_font).leading();
+}
+
 float Font::xHeight() const
 {
     return QFontMetrics(m_font).xHeight();
index 54b74280b29dd5e7efb57dc145663361220308a2..d0ef7236932f261c5ce4f4400ab99d4722f1057c 100644 (file)
@@ -32,6 +32,7 @@
 #include "FrameView.h"
 #include "IconDatabase.h"
 #include "Page.h"
+#include "PutPropertySlot.h"
 #include "ResourceRequest.h"
 #include "RenderView.h"
 #include "SelectionController.h"
@@ -224,7 +225,8 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object
       KJS::JSObject *runtimeObject =
         KJS::Bindings::Instance::createRuntimeObject(exec, KJS::Bindings::QtInstance::create(object, root));
 
-      window->put(exec, KJS::Identifier(exec, (const UChar *) name.constData(), name.length()), runtimeObject);
+      KJS::PutPropertySlot slot;
+      window->put(exec, KJS::Identifier(exec, (const UChar *) name.constData(), name.length()), runtimeObject, slot);
 }
 
 /*!
index 43456fdc849b816ebac668903be80bd6843afd59..55500f5cc3ba20a3b4d8335d4c1cad5bc52f0dce 100644 (file)
@@ -1,3 +1,12 @@
+2008-09-04  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon
+
+        Fix the QtWebKit build to match changes in r36016
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::addToJavaScriptWindowObject):
+
 2008-09-04  Tor Arne Vestbø  <tavestbo@trolltech.com>
 
         Reviewed by Simon.