2008-11-24 Darin Fisher <darin@chromium.org>
authordarin@chromium.org <darin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2008 23:28:14 +0000 (23:28 +0000)
committerdarin@chromium.org <darin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2008 23:28:14 +0000 (23:28 +0000)
        Fix bustage.

        https://bugs.webkit.org/show_bug.cgi?id=22448

        * Api/qwebframe.cpp:
        (QWebFrame::evaluateJavaScript):

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

WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog

index 7dfb13f..ba709d8 100644 (file)
@@ -65,8 +65,8 @@
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include "ScriptController.h"
+#include "ScriptSourceCode.h"
 #include "ScriptValue.h"
-#include "StringSourceProvider.h"
 
 #include "wtf/HashMap.h"
 
@@ -935,7 +935,7 @@ QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource)
     ScriptController *proxy = d->frame->script();
     QVariant rc;
     if (proxy) {
-        JSC::JSValue* v = proxy->evaluate(makeSource(scriptSource)).jsValue();
+        JSC::JSValue* v = proxy->evaluate(ScriptSourceCode(scriptSource)).jsValue();
         if (v) {
             int distance = 0;
             rc = JSC::Bindings::convertValueToQVariant(proxy->globalObject()->globalExec(), v, QMetaType::Void, &distance);
index 2be32c2..813cb8e 100644 (file)
@@ -1,3 +1,12 @@
+2008-11-24  Darin Fisher  <darin@chromium.org>
+
+        Fix bustage.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22448
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::evaluateJavaScript):
+
 2008-11-20  Sam Weinig  <sam@webkit.org>
 
         Fix Qt build.