Title: [94601] trunk/Source/WebKit/qt
- Revision
- 94601
- Author
- [email protected]
- Date
- 2011-09-06 15:15:38 -0700 (Tue, 06 Sep 2011)
Log Message
[Qt] Fix API test failure after r92823 and r93001.
https://bugs.webkit.org/show_bug.cgi?id=67676
Reviewed by Kenneth Rohde Christiansen.
r92823 and r93001 make WebKit no longer produce wrapping style
spans on copy and paste and class="Apple-style-span" anymore.
Our expectations need to be updated.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::cursorMovements):
(tst_QWebPage::textSelection):
(tst_QWebPage::findText):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (94600 => 94601)
--- trunk/Source/WebKit/qt/ChangeLog 2011-09-06 21:51:01 UTC (rev 94600)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-09-06 22:15:38 UTC (rev 94601)
@@ -1,3 +1,19 @@
+2011-09-06 Alexis Menard <[email protected]>
+
+ [Qt] Fix API test failure after r92823 and r93001.
+ https://bugs.webkit.org/show_bug.cgi?id=67676
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ r92823 and r93001 make WebKit no longer produce wrapping style
+ spans on copy and paste and class="Apple-style-span" anymore.
+ Our expectations need to be updated.
+
+ * tests/qwebpage/tst_qwebpage.cpp:
+ (tst_QWebPage::cursorMovements):
+ (tst_QWebPage::textSelection):
+ (tst_QWebPage::findText):
+
2011-09-06 Ademar de Souza Reis Jr. <[email protected]>
[Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian
Modified: trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (94600 => 94601)
--- trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp 2011-09-06 21:51:01 UTC (rev 94600)
+++ trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp 2011-09-06 22:15:38 UTC (rev 94601)
@@ -1037,7 +1037,7 @@
QRegExp regExp(" style=\".*\"");
regExp.setMinimal(true);
- QCOMPARE(page->selectedHtml().trimmed().replace(regExp, ""), QString::fromLatin1("<span class=\"Apple-style-span\"><p id=\"one\">The quick brown fox</p></span>"));
+ QCOMPARE(page->selectedHtml().trimmed().replace(regExp, ""), QString::fromLatin1("<p id=\"one\">The quick brown fox</p>"));
// these actions must exist
QVERIFY(page->action(QWebPage::MoveToNextChar) != 0);
@@ -1270,7 +1270,7 @@
QCOMPARE(page->selectedText().trimmed(), QString::fromLatin1("The quick brown fox"));
QRegExp regExp(" style=\".*\"");
regExp.setMinimal(true);
- QCOMPARE(page->selectedHtml().trimmed().replace(regExp, ""), QString::fromLatin1("<span class=\"Apple-style-span\"><p id=\"one\">The quick brown fox</p></span>"));
+ QCOMPARE(page->selectedHtml().trimmed().replace(regExp, ""), QString::fromLatin1("<p id=\"one\">The quick brown fox</p>"));
// Make sure hasSelection returns true, since there is selected text now...
QCOMPARE(page->hasSelection(), true);
@@ -2880,7 +2880,7 @@
foreach (QString subString, words) {
m_page->findText(subString, QWebPage::FindWrapsAroundDocument);
QCOMPARE(m_page->selectedText(), subString);
- QCOMPARE(m_page->selectedHtml().trimmed().replace(regExp, ""), QString("<span class=\"Apple-style-span\">%1</span>").arg(subString));
+ QCOMPARE(m_page->selectedHtml().trimmed().replace(regExp, ""), QString("<span>%1</span>").arg(subString));
m_page->findText("");
QVERIFY(m_page->selectedText().isEmpty());
QVERIFY(m_page->selectedHtml().isEmpty());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
