+2008-07-02 Simon Hausmann <hausmann@webkit.org>
+
+ Build fix. Implemented missing functions for single-threaded build.
+
+ * kjs/JSLock.cpp:
+ (KJS::JSLock::JSLock):
+ (KJS::JSLock::lock):
+ (KJS::JSLock::unlock):
+ (KJS::JSLock::DropAllLocks::DropAllLocks):
+
2008-07-02 Alexey Proskuryakov <ap@webkit.org>
Another non-AllInOne build fix.
#else
+JSLock::JSLock(ExecState* exec)
+ : m_lockingForReal(false)
+{
+}
+
// If threading support is off, set the lock count to a constant value of 1 so assertions
// that the lock is held don't fail
int JSLock::lockCount()
return true;
}
-void JSLock::lock()
+void JSLock::lock(bool)
+{
+}
+
+void JSLock::unlock(bool)
{
}
-void JSLock::unlock()
+void JSLock::lock(ExecState*)
+{
+}
+
+void JSLock::unlock(ExecState*)
{
}
{
}
-JSLock::DropAllLocks::DropAllLocks()
+JSLock::DropAllLocks::DropAllLocks(ExecState*)
+{
+}
+
+JSLock::DropAllLocks::DropAllLocks(bool)
{
}
+2008-07-02 Simon Hausmann <hausmann@webkit.org>
+
+ Build fixes.
+
+ * WebCore.pro: Added plugins/PluginMainThreadScheduler.cpp to the
+ build.
+ * bridge/qt/qt_instance.cpp: Adjust to JSLock API change.
+ * bridge/qt/qt_runtime.cpp: Ditto.
+ (KJS::Bindings::convertValueToQVariant):
+ (KJS::Bindings::convertQVariantToValue):
+ (KJS::Bindings::QtRuntimeMetaMethod::call):
+ (KJS::Bindings::QtRuntimeConnectionMethod::call):
+ (KJS::Bindings::QtConnectionObject::execute):
+ * page/JavaScriptProfileNode.cpp: Inlude kjs/JSValue.h instead of
+ JavaScriptCore/JSValue.h.
+ * plugins/qt/PluginViewQt.cpp: Adjust to JSLock API changes.
+ (WebCore::PluginView::setNPWindowRect): Ditto.
+ (WebCore::PluginView::stop): Ditto.
+ (WebCore::PluginView::init): Ditto.
+
2008-07-02 Alexey Proskuryakov <ap@webkit.org>
Build fix.
contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
- SOURCES += plugins/npapi.cpp
+ SOURCES += plugins/npapi.cpp \
+ plugins/PluginMainThreadScheduler.cpp
unix:!mac {
SOURCES += \
#include "qt_instance.h"
#include "JSGlobalObject.h"
+#include "JSLock.h"
#include "list.h"
#include "qt_class.h"
#include "qt_runtime.h"
void QtRuntimeObjectImp::removeFromCache()
{
- JSLock lock;
+ JSLock lock(false);
QtInstance* key = cachedObjects.key(this);
if (key)
cachedObjects.remove(key);
QtInstance::~QtInstance()
{
- JSLock lock;
+ JSLock lock(false);
cachedObjects.remove(this);
cachedInstances.remove(m_hashkey);
PassRefPtr<QtInstance> QtInstance::getQtInstance(QObject* o, PassRefPtr<RootObject> rootObject)
{
- JSLock lock;
+ JSLock lock(false);
foreach(QtInstance* instance, cachedInstances.values(o)) {
if (instance->rootObject() == rootObject)
RuntimeObjectImp* QtInstance::getRuntimeObject(ExecState* exec, PassRefPtr<QtInstance> instance)
{
- JSLock lock;
+ JSLock lock(false);
RuntimeObjectImp* ret = static_cast<RuntimeObjectImp*>(cachedObjects.value(instance.get()));
if (!ret) {
ret = new (exec) QtRuntimeObjectImp(instance);
#include "qt_runtime.h"
#include "qt_instance.h"
#include "JSGlobalObject.h"
+#include "JSLock.h"
#include "JSObject.h"
#include "JSArray.h"
#include "DateInstance.h"
return QVariant();
}
- JSLock lock;
+ JSLock lock(false);
JSRealType type = valueRealType(exec, value);
if (hint == QMetaType::Void) {
switch(type) {
return jsNull();
}
- JSLock lock;
+ JSLock lock(false);
if (type == QMetaType::Bool)
return jsBoolean(variant.toBool());
return jsUndefined();
// We have to pick a method that matches..
- JSLock lock;
+ JSLock lock(false);
QObject *obj = d->m_instance->getObject();
if (obj) {
{
QtRuntimeConnectionMethodData* d = static_cast<QtRuntimeConnectionMethod *>(functionObject)->d_func();
- JSLock lock;
+ JSLock lock(false);
QObject* sender = d->m_instance->getObject();
int argc = parameterTypes.count();
- JSLock lock;
+ JSLock lock(false);
// ### Should the Interpreter/ExecState come from somewhere else?
RefPtr<RootObject> ro = m_instance->rootObject();
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/JSRetainPtr.h>
#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/JSValue.h>
+#include <kjs/JSValue.h>
using namespace KJS;
if (m_plugin->pluginFuncs()->setwindow) {
PluginView::setCurrentPluginView(this);
- KJS::JSLock::DropAllLocks dropAllLocks;
+ KJS::JSLock::DropAllLocks dropAllLocks(false);
setCallingPlugin(true);
m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
setCallingPlugin(false);
m_isStarted = false;
- KJS::JSLock::DropAllLocks dropAllLocks;
+ KJS::JSLock::DropAllLocks dropAllLocks(false);
// Clear the window
m_npWindow.window = 0;
if (m_plugin->pluginFuncs()->getvalue) {
PluginView::setCurrentPluginView(this);
- KJS::JSLock::DropAllLocks dropAllLocks;
+ KJS::JSLock::DropAllLocks dropAllLocks(false);
setCallingPlugin(true);
m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
setCallingPlugin(false);
break;
case SetTextDirectionDefault:
- editor->setBaseWritingDirection("inherit");
+ editor->setBaseWritingDirection(NaturalWritingDirection);
break;
case SetTextDirectionLeftToRight:
- editor->setBaseWritingDirection("ltr");
+ editor->setBaseWritingDirection(LeftToRightWritingDirection);
break;
case SetTextDirectionRightToLeft:
- editor->setBaseWritingDirection("rtl");
+ editor->setBaseWritingDirection(RightToLeftWritingDirection);
break;
case ToggleBold:
+2008-07-02 Simon Hausmann <hausmann@webkit.org>
+
+ Build fix.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::triggerAction): The signature of setBaseWritingDirection
+ changed to take an enum instead of a string.
+
2008-07-01 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Darin.