[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:34:10 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit dcc526691f1d42f477e93acec38f092763309c52
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 08:19:04 2009 +0000

    [Qt] Rename QWebElement::evaluateScript
    to QWebElement::evaluateJavaScript.
    https://bugs.webkit.org/show_bug.cgi?id=29709
    
    Patch by Jocelyn Turcotte <jocelyn.turcotte at nokia.com> on 2009-09-25
    Reviewed by Simon Hausmann.
    
    * Api/qwebelement.cpp:
    (QWebElement::evaluateJavaScript):
    * Api/qwebelement.h:
    * tests/qwebelement/tst_qwebelement.cpp:
    (tst_QWebElement::evaluateJavaScript):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index f7621e0..c656bde 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -707,7 +707,7 @@ static bool setupScriptObject(WebCore::Element* element, ScriptObject& object, S
 
     \sa callFunction()
 */
-QVariant QWebElement::evaluateScript(const QString& scriptSource)
+QVariant QWebElement::evaluateJavaScript(const QString& scriptSource)
 {
     if (scriptSource.isEmpty())
         return QVariant();
diff --git a/WebKit/qt/Api/qwebelement.h b/WebKit/qt/Api/qwebelement.h
index e7e03af..132de09 100644
--- a/WebKit/qt/Api/qwebelement.h
+++ b/WebKit/qt/Api/qwebelement.h
@@ -120,7 +120,7 @@ public:
     void removeFromDocument();
     void removeChildren();
 
-    QVariant evaluateScript(const QString& scriptSource);
+    QVariant evaluateJavaScript(const QString& scriptSource);
 
     QVariant callFunction(const QString& functionName, const QVariantList& arguments = QVariantList());
     QStringList functions() const;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f283d0a..0340859 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] Rename QWebElement::evaluateScript
+        to QWebElement::evaluateJavaScript.
+        https://bugs.webkit.org/show_bug.cgi?id=29709
+
+        * Api/qwebelement.cpp:
+        (QWebElement::evaluateJavaScript):
+        * Api/qwebelement.h:
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::evaluateJavaScript):
+
+2009-09-25  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Update the stypeProperty API of QWebElement.
         https://bugs.webkit.org/show_bug.cgi?id=29711
 
diff --git a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index e934df5..ecf3837 100644
--- a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -71,7 +71,7 @@ private slots:
     void classes();
     void namespaceURI();
     void foreachManipulation();
-    void evaluateScript();
+    void evaluateJavaScript();
     void callFunction();
     void callFunctionSubmitForm();
     void functionNames();
@@ -282,27 +282,27 @@ void tst_QWebElement::foreachManipulation()
     QCOMPARE(body.findAll("div").count(), 4);
 }
 
-void tst_QWebElement::evaluateScript()
+void tst_QWebElement::evaluateJavaScript()
 {
     QVariant result;
     m_mainFrame->setHtml("<body><p>test");
     QWebElement para = m_mainFrame->findFirstElement("p");
 
-    result = para.evaluateScript("this.tagName");
+    result = para.evaluateJavaScript("this.tagName");
     QVERIFY(result.isValid());
     QVERIFY(result.type() == QVariant::String);
     QCOMPARE(result.toString(), QLatin1String("P"));
 
     QVERIFY(para.functions().contains("hasAttributes"));
-    result = para.evaluateScript("this.hasAttributes()");
+    result = para.evaluateJavaScript("this.hasAttributes()");
     QVERIFY(result.isValid());
     QVERIFY(result.type() == QVariant::Bool);
     QVERIFY(!result.toBool());
 
-    para.evaluateScript("this.setAttribute('align', 'left');");
+    para.evaluateJavaScript("this.setAttribute('align', 'left');");
     QCOMPARE(para.attribute("align"), QLatin1String("left"));
 
-    result = para.evaluateScript("this.hasAttributes()");
+    result = para.evaluateJavaScript("this.hasAttributes()");
     QVERIFY(result.isValid());
     QVERIFY(result.type() == QVariant::Bool);
     QVERIFY(result.toBool());

-- 
WebKit Debian packaging

