Diff
Modified: trunk/LayoutTests/ChangeLog (121428 => 121429)
--- trunk/LayoutTests/ChangeLog 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/LayoutTests/ChangeLog 2012-06-28 14:27:27 UTC (rev 121429)
@@ -1,3 +1,14 @@
+2012-06-28 Alexander Pavlov <[email protected]>
+
+ [Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
+ https://bugs.webkit.org/show_bug.cgi?id=90167
+
+ Reviewed by Csaba Osztrogonác.
+
+ Unskip the previously offensive test.
+
+ * platform/qt/Skipped:
+
2012-06-28 Csaba Osztrogonác <[email protected]>
[WK2] New fast/events/drag-display-none-element.html fails
Modified: trunk/LayoutTests/platform/qt/Skipped (121428 => 121429)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-28 14:27:27 UTC (rev 121429)
@@ -2532,7 +2532,3 @@
# [Qt] css3/filters/huge-region-composited.html makes css3/filters/huge-region.html crash
# https://bugs.webkit.org/show_bug.cgi?id=90165
css3/filters/huge-region-composited.html
-
-# [Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
-# https://bugs.webkit.org/show_bug.cgi?id=90167
-inspector/styles/inject-stylesheet.html
Modified: trunk/Source/WebKit/qt/ChangeLog (121428 => 121429)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-28 14:27:27 UTC (rev 121429)
@@ -1,3 +1,14 @@
+2012-06-28 Alexander Pavlov <[email protected]>
+
+ [Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
+ https://bugs.webkit.org/show_bug.cgi?id=90167
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::removeUserStyleSheets):
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2012-06-28 Csaba Osztrogonác <[email protected]>
[Qt] Restore original value of mock scrollbars between tests
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (121428 => 121429)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-28 14:27:27 UTC (rev 121429)
@@ -922,6 +922,11 @@
page->handle()->page->group().addUserStyleSheetToWorld(mainThreadNormalWorld(), sourceCode, QUrl(), nullptr, nullptr, WebCore::InjectInAllFrames);
}
+void DumpRenderTreeSupportQt::removeUserStyleSheets(QWebPage* page)
+{
+ page->handle()->page->group().removeUserStyleSheetsFromWorld(mainThreadNormalWorld());
+}
+
void DumpRenderTreeSupportQt::simulateDesktopNotificationClick(const QString& title)
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (121428 => 121429)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-06-28 14:27:27 UTC (rev 121429)
@@ -196,6 +196,7 @@
static QString pageSizeAndMarginsInPixels(QWebFrame* frame, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
static QString pageProperty(QWebFrame* frame, const QString& propertyName, int pageNumber);
static void addUserStyleSheet(QWebPage* page, const QString& sourceCode);
+ static void removeUserStyleSheets(QWebPage*);
static void simulateDesktopNotificationClick(const QString& title);
static QString viewportAsText(QWebPage*, int deviceDPI, const QSize& deviceSize, const QSize& availableSize);
Modified: trunk/Tools/ChangeLog (121428 => 121429)
--- trunk/Tools/ChangeLog 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/Tools/ChangeLog 2012-06-28 14:27:27 UTC (rev 121429)
@@ -1,3 +1,15 @@
+2012-06-28 Alexander Pavlov <[email protected]>
+
+ [Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
+ https://bugs.webkit.org/show_bug.cgi?id=90167
+
+ Reviewed by Csaba Osztrogonác.
+
+ DRT should remove user stylesheets from the page group when resetting before running another test.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
2012-06-28 Csaba Osztrogonác <[email protected]>
[Qt][DRT] Reset AcceleratedCompositingEnabled between tests
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (121428 => 121429)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-28 14:10:12 UTC (rev 121428)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-28 14:27:27 UTC (rev 121429)
@@ -538,10 +538,11 @@
#ifndef QT_NO_UNDOSTACK
m_page->undoStack()->clear();
#endif
-
+
clearHistory(m_page);
DumpRenderTreeSupportQt::scalePageBy(m_page->mainFrame(), 1, QPoint(0, 0));
DumpRenderTreeSupportQt::clearFrameName(m_page->mainFrame());
+ DumpRenderTreeSupportQt::removeUserStyleSheets(m_page);
m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
