Changeset 34954 in webkit


Ignore:
Timestamp:
Jul 2, 2008 4:28:43 AM (16 years ago)
Author:
vestbo@webkit.org
Message:

Build fixes

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r34950 r34954  
     12008-07-02  Simon Hausmann  <hausmann@webkit.org>
     2
     3        Build fix. Implemented missing functions for single-threaded build.
     4
     5        * kjs/JSLock.cpp:
     6        (KJS::JSLock::JSLock):
     7        (KJS::JSLock::lock):
     8        (KJS::JSLock::unlock):
     9        (KJS::JSLock::DropAllLocks::DropAllLocks):
     10
    1112008-07-02  Alexey Proskuryakov  <ap@webkit.org>
    212

  • trunk/JavaScriptCore/kjs/JSLock.cpp

    r34947 r34954  
    159159#else
    160160
     161JSLock::JSLock(ExecState* exec)
     162    : m_lockingForReal(false)
     163{
     164}
     165
    161166// If threading support is off, set the lock count to a constant value of 1 so assertions
    162167// that the lock is held don't fail
    … …  
    171176}
    172177
    173 void JSLock::lock()
    174 {
    175 }
    176 
    177 void JSLock::unlock()
     178void JSLock::lock(bool)
     179{
     180}
     181
     182void JSLock::unlock(bool)
     183{
     184}
     185
     186void JSLock::lock(ExecState*)
     187{
     188}
     189
     190void JSLock::unlock(ExecState*)
    178191{
    179192}
    … …  
    183196}
    184197
    185 JSLock::DropAllLocks::DropAllLocks()
     198JSLock::DropAllLocks::DropAllLocks(ExecState*)
     199{
     200}
     201
     202JSLock::DropAllLocks::DropAllLocks(bool)
    186203{
    187204}

  • trunk/WebCore/ChangeLog

    r34951 r34954  
     12008-07-02  Simon Hausmann  <hausmann@webkit.org>
     2
     3        Build fixes.
     4
     5        * WebCore.pro: Added plugins/PluginMainThreadScheduler.cpp to the
     6        build.
     7        * bridge/qt/qt_instance.cpp: Adjust to JSLock API change.
     8        * bridge/qt/qt_runtime.cpp: Ditto.
     9        (KJS::Bindings::convertValueToQVariant):
     10        (KJS::Bindings::convertQVariantToValue):
     11        (KJS::Bindings::QtRuntimeMetaMethod::call):
     12        (KJS::Bindings::QtRuntimeConnectionMethod::call):
     13        (KJS::Bindings::QtConnectionObject::execute):
     14        * page/JavaScriptProfileNode.cpp: Inlude kjs/JSValue.h instead of
     15        JavaScriptCore/JSValue.h.
     16        * plugins/qt/PluginViewQt.cpp: Adjust to JSLock API changes.
     17        (WebCore::PluginView::setNPWindowRect): Ditto.
     18        (WebCore::PluginView::stop): Ditto.
     19        (WebCore::PluginView::init): Ditto.
     20
    1212008-07-02  Alexey Proskuryakov  <ap@webkit.org>
    222

  • trunk/WebCore/WebCore.pro

    r34806 r34954  
    10431043contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
    10441044
    1045         SOURCES += plugins/npapi.cpp
     1045        SOURCES += plugins/npapi.cpp \
     1046                   plugins/PluginMainThreadScheduler.cpp
    10461047
    10471048        unix:!mac {

  • trunk/WebCore/bridge/qt/qt_instance.cpp

    r34854 r34954  
    2222
    2323#include "JSGlobalObject.h"
     24#include "JSLock.h"
    2425#include "list.h"
    2526#include "qt_class.h"
    … …  
    8485void QtRuntimeObjectImp::removeFromCache()
    8586{
    86     JSLock lock;
     87    JSLock lock(false);
    8788    QtInstance* key = cachedObjects.key(this);
    8889    if (key)
    … …  
    135136QtInstance::~QtInstance()
    136137{
    137     JSLock lock;
     138    JSLock lock(false);
    138139
    139140    cachedObjects.remove(this);
    … …  
    151152PassRefPtr<QtInstance> QtInstance::getQtInstance(QObject* o, PassRefPtr<RootObject> rootObject)
    152153{
    153     JSLock lock;
     154    JSLock lock(false);
    154155
    155156    foreach(QtInstance* instance, cachedInstances.values(o)) {
    … …  
    166167RuntimeObjectImp* QtInstance::getRuntimeObject(ExecState* exec, PassRefPtr<QtInstance> instance)
    167168{
    168     JSLock lock;
     169    JSLock lock(false);
    169170    RuntimeObjectImp* ret = static_cast<RuntimeObjectImp*>(cachedObjects.value(instance.get()));
    170171    if (!ret) {

  • trunk/WebCore/bridge/qt/qt_runtime.cpp

    r34908 r34954  
    2222#include "qt_instance.h"
    2323#include "JSGlobalObject.h"
     24#include "JSLock.h"
    2425#include "JSObject.h"
    2526#include "JSArray.h"
    … …  
    151152    }
    152153
    153     JSLock lock;
     154    JSLock lock(false);
    154155    JSRealType type = valueRealType(exec, value);
    155156    if (hint == QMetaType::Void) {
    … …  
    718719    }
    719720
    720     JSLock lock;
     721    JSLock lock(false);
    721722
    722723    if (type == QMetaType::Bool)
    … …  
    12951296
    12961297    // We have to pick a method that matches..
    1297     JSLock lock;
     1298    JSLock lock(false);
    12981299
    12991300    QObject *obj = d->m_instance->getObject();
    … …  
    13881389    QtRuntimeConnectionMethodData* d = static_cast<QtRuntimeConnectionMethod *>(functionObject)->d_func();
    13891390
    1390     JSLock lock;
     1391    JSLock lock(false);
    13911392
    13921393    QObject* sender = d->m_instance->getObject();
    … …  
    16181619        int argc = parameterTypes.count();
    16191620
    1620         JSLock lock;
     1621        JSLock lock(false);
    16211622
    16221623        // ### Should the Interpreter/ExecState come from somewhere else?

  • trunk/WebCore/page/JavaScriptProfileNode.cpp

    r34947 r34954  
    3535#include <JavaScriptCore/JSRetainPtr.h>
    3636#include <JavaScriptCore/JSStringRef.h>
    37 #include <JavaScriptCore/JSValue.h>
     37#include <kjs/JSValue.h>
    3838
    3939using namespace KJS;

  • trunk/WebCore/plugins/qt/PluginViewQt.cpp

    r34581 r34954  
    188188    if (m_plugin->pluginFuncs()->setwindow) {
    189189        PluginView::setCurrentPluginView(this);
    190         KJS::JSLock::DropAllLocks dropAllLocks;
     190        KJS::JSLock::DropAllLocks dropAllLocks(false);
    191191        setCallingPlugin(true);
    192192        m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
    … …  
    237237    m_isStarted = false;
    238238
    239     KJS::JSLock::DropAllLocks dropAllLocks;
     239    KJS::JSLock::DropAllLocks dropAllLocks(false);
    240240
    241241    // Clear the window
    … …  
    447447    if (m_plugin->pluginFuncs()->getvalue) {
    448448        PluginView::setCurrentPluginView(this);
    449         KJS::JSLock::DropAllLocks dropAllLocks;
     449        KJS::JSLock::DropAllLocks dropAllLocks(false);
    450450        setCallingPlugin(true);
    451451        m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);

  • trunk/WebKit/qt/Api/qwebpage.cpp

    r34738 r34954  
    13651365
    13661366        case SetTextDirectionDefault:
    1367             editor->setBaseWritingDirection("inherit");
     1367            editor->setBaseWritingDirection(NaturalWritingDirection);
    13681368            break;
    13691369        case SetTextDirectionLeftToRight:
    1370             editor->setBaseWritingDirection("ltr");
     1370            editor->setBaseWritingDirection(LeftToRightWritingDirection);
    13711371            break;
    13721372        case SetTextDirectionRightToLeft:
    1373             editor->setBaseWritingDirection("rtl");
     1373            editor->setBaseWritingDirection(RightToLeftWritingDirection);
    13741374            break;
    13751375

  • trunk/WebKit/qt/ChangeLog

    r34947 r34954  
     12008-07-02  Simon Hausmann  <hausmann@webkit.org>
     2
     3        Build fix.
     4
     5        * Api/qwebpage.cpp:
     6        (QWebPage::triggerAction): The signature of setBaseWritingDirection
     7        changed to take an enum instead of a string.
     8
    192008-07-01  Alexey Proskuryakov  <ap@webkit.org>
    210
Note: See TracChangeset for help on using the changeset viewer.