2008-08-06 Ariya Hidayat <ariya.hidayat@trolltech.com>

        Fix the Qt build due to recent ScriptController refactoring.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 160d55adbedf6e5b1a0b5cd4e42b0755b24d5c31..8090ed54875d02471955d954fcbdb8e58d3a942f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-06  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Fix the Qt build due to recent ScriptController refactoring.
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::getValue):
+        (WebCore::PluginView::~PluginView):
+
 2008-08-06  Eric Seidel  <eric@webkit.org>
 
         Build fix only, no review.

diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 942bcde12140633457274c6d891824847e65a3ba..b907af8cd9aa9461e5602479901e36370bd212d3 100644 (file)
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -342,7 +342,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
         if (m_isJavaScriptPaused)
             return NPERR_GENERIC_ERROR;
 
-        NPObject* windowScriptObject = m_parentFrame->windowScriptNPObject();
+        NPObject* windowScriptObject = m_parentFrame->script()->windowScriptNPObject();
 
         // Return value is expected to be retained, as described here: <http://www.mozilla.org/projects/plugin/npruntime.html>
         if (windowScriptObject)
@@ -409,7 +409,7 @@ PluginView::~PluginView()
     freeStringArray(m_paramNames, m_paramCount);
     freeStringArray(m_paramValues, m_paramCount);
 
-    m_parentFrame->cleanupScriptObjectsForPlugin(this);
+    m_parentFrame->script()->cleanupScriptObjectsForPlugin(this);
 
     if (m_plugin && !(m_plugin->quirks().contains(PluginQuirkDontUnloadPlugin)))
         m_plugin->unload();

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index dd1362fb564fccd4c76c0ddf41ea67f8ae5e3682..f8ea85362b265f83d015a56301541f8ba8cea2c5 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -211,7 +211,7 @@ QWebFrame::~QWebFrame()
 void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object)
 {
       JSDOMWindow *window = toJSDOMWindow(d->frame);
-      KJS::Bindings::RootObject *root = d->frame->bindingRootObject();
+      KJS::Bindings::RootObject *root = d->frame->script()->bindingRootObject();
       if (!window) {
           qDebug() << "Warning: couldn't get window object";
           return;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3989f89b68f1b81b9050dd407b974b21fca35139..4189b65045cfd5559e429a08b45f317bc2fbeba5 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-06  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Fix the Qt build due to recent ScriptController refactoring.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::addToJavaScriptWindowObject):
+
 2008-08-05  Tor Arne Vestbø  <tavestbo@trolltech.com>
 
         Reviewed by Simon.