Changeset 86697 in webkit

Timestamp:

May 17, 2011 12:35:37 PM (13 years ago)

Author:

caio.oliveira@openbossa.org

Message:

2011-05-17 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Andreas Kling.

[Qt] Simplify syntax in test code to make prepare-ChangeLog less confused
​https://bugs.webkit.org/show_bug.cgi?id=60978

Backslash to escape newlines was confusing both prepare-ChangeLog and the
QtCreator highlight system.

• tests/qwebframe/tst_qwebframe.cpp: (tst_QWebFrame::evalJSV): Remove usage of backslash to escape newlines in string literal.

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebframe/tst_qwebframe.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-17  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Simplify syntax in test code to make prepare-ChangeLog less confused
+        https://bugs.webkit.org/show_bug.cgi?id=60978
+
+        Backslash to escape newlines was confusing both prepare-ChangeLog and the
+        QtCreator highlight system.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (tst_QWebFrame::evalJSV):
+        Remove usage of backslash to escape newlines in string literal.
+
 2011-05-17  Young Han Lee  <joybro@company100.net>
 

trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -683 +683 @@
         QString escaped = s;
         escaped.replace('\'', "\\'"); // Don't preescape your single quotes!
-        evalJS("var retvalue;\
-               var typevalue; \
-               try {\
-               retvalue = eval('" + escaped + "'); \
-               typevalue = typeof retvalue; \
-               if (retvalue instanceof Array) \
-               typevalue = 'array'; \
-           } \
-               catch(e) {\
-               retvalue = e.name + ': ' + e.message;\
-               typevalue = 'error';\
-           }");
+        QString code("var retvalue; "
+                     "var typevalue; "
+                     "try { "
+                     "    retvalue = eval('%1'); "
+                     "    typevalue = typeof retvalue; "
+                     "    if (retvalue instanceof Array) "
+                     "        typevalue = 'array'; "
+                     "} catch(e) { "
+                     "    retvalue = e.name + ': ' + e.message; "
+                     "    typevalue = 'error'; "
+                     "}");
+        evalJS(code.arg(escaped));
+
         QVariant ret = evalJSV("retvalue");
         if (ret.userType() != QMetaType::Void)