8 files changed, 19 insertions, 20 deletions
diff --git a/WebKit/qt/Api/headers.pri b/WebKit/qt/Api/headers.pri
index e9fe28d..29bb125 100644
--- a/WebKit/qt/Api/headers.pri
+++ b/WebKit/qt/Api/headers.pri
@@ -12,5 +12,4 @@ WEBKIT_API_HEADERS = $$PWD/qwebframe.h \
                      $$PWD/qwebpluginfactory.h \
                      $$PWD/qwebhistory.h \
                      $$PWD/qwebinspector.h \
-                     $$PWD/qwebkitversion.h \
-                     $$PWD/qwebscriptworld.h
+                     $$PWD/qwebkitversion.h
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 8361970..6d6acc5 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -151,6 +151,8 @@ void QGraphicsWebViewPrivate::_q_contentsSizeChanged(const QSize& size)
 void QGraphicsWebViewPrivate::_q_scaleChanged()
 {
 #if ENABLE(TILED_BACKING_STORE)
+    if (!page)
+        return;
     static_cast<PageClientQGraphicsWidget*>(page->d->client)->updateTiledBackingStoreScale();
 #endif
 }
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index c42cfa3..c4cb597 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1378,22 +1378,6 @@ QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource)
     return rc;
 }
 
-QVariant QWebFrame::evaluateScriptInIsolatedWorld(QWebScriptWorld* scriptWorld, const QString& scriptSource)
-{
-    ScriptController *proxy = d->frame->script();
-    QVariant rc;
-
-    if (proxy) {
-        JSC::JSValue v = proxy->executeScriptInWorld(scriptWorld->world(), scriptSource, true).jsValue();
-        if (!d->frame) // In case the script removed our frame from the page.
-          return QString();
-        int distance = 0;
-        rc = JSC::Bindings::convertValueToQVariant(proxy->globalObject(mainThreadNormalWorld())->globalExec(), v, QMetaType::Void, &distance);
-    }
-    return rc;
-}
-
-
 /*!
     \since 4.5
 
diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 5f3dbd4..e78fb07 100644
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -200,7 +200,6 @@ public:
 
 public Q_SLOTS:
     QVariant evaluateJavaScript(const QString& scriptSource);
-    QVariant evaluateScriptInIsolatedWorld(QWebScriptWorld* scriptWorld, const QString& scriptSource);
 #ifndef QT_NO_PRINTER
     void print(QPrinter *printer) const;
 #endif
diff --git a/WebKit/qt/Api/qwebscriptworld.cpp b/WebKit/qt/Api/qwebscriptworld.cpp
index 5d912cc..84b678d 100644
--- a/WebKit/qt/Api/qwebscriptworld.cpp
+++ b/WebKit/qt/Api/qwebscriptworld.cpp
@@ -35,6 +35,17 @@ QWebScriptWorld::QWebScriptWorld()
     d = new QWebScriptWorldPrivate(ScriptController::createWorld());
 }
 
+QWebScriptWorld::QWebScriptWorld(const QWebScriptWorld& other)
+    : d(other.d)
+{
+}
+
+QWebScriptWorld &QWebScriptWorld::operator=(const QWebScriptWorld& other)
+{
+    d = other.d;
+    return *this;
+}
+
 DOMWrapperWorld* QWebScriptWorld::world() const
 {
     return d->world.get();
diff --git a/WebKit/qt/Api/qwebscriptworld.h b/WebKit/qt/Api/qwebscriptworld.h
index 6e728ab..6a9d6e0 100644
--- a/WebKit/qt/Api/qwebscriptworld.h
+++ b/WebKit/qt/Api/qwebscriptworld.h
@@ -35,6 +35,8 @@ class QWebFrame;
 class QWEBKIT_EXPORT QWebScriptWorld {
 public:
     QWebScriptWorld();
+    QWebScriptWorld(const QWebScriptWorld&);
+    QWebScriptWorld &operator=(const QWebScriptWorld&);
     ~QWebScriptWorld();
 
     WebCore::DOMWrapperWorld* world() const;
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index b2766a7..ff7c101 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -90,6 +90,7 @@ static WebGraphicHash* graphics()
         hash->insert(QWebSettings::DefaultFrameIconGraphic, QPixmap(QLatin1String(":webkit/resources/urlIcon.png")));
         hash->insert(QWebSettings::TextAreaSizeGripCornerGraphic, QPixmap(QLatin1String(":webkit/resources/textAreaResizeCorner.png")));
         hash->insert(QWebSettings::DeleteButtonGraphic, QPixmap(QLatin1String(":webkit/resources/deleteButton.png")));
+        hash->insert(QWebSettings::InputSpeechButtonGraphic, QPixmap(QLatin1String(":webkit/resources/inputSpeech.png")));
     }
 
     return hash;
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 38a2b3f..8967e7c 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -82,7 +82,8 @@ public:
         MissingPluginGraphic,
         DefaultFrameIconGraphic,
         TextAreaSizeGripCornerGraphic,
-        DeleteButtonGraphic
+        DeleteButtonGraphic,
+        InputSpeechButtonGraphic
     };
     enum FontSize {
         MinimumFontSize,