Diff
Modified: trunk/LayoutTests/ChangeLog (121424 => 121425)
--- trunk/LayoutTests/ChangeLog 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/LayoutTests/ChangeLog 2012-06-28 11:39:31 UTC (rev 121425)
@@ -1,3 +1,12 @@
+2012-06-28 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Restore original value of mock scrollbars between tests
+ https://bugs.webkit.org/show_bug.cgi?id=90155
+
+ Reviewed by Simon Hausmann.
+
+ * platform/qt/Skipped: Unskip tests which doesn't break anything now.
+
2012-06-28 Mikhail Pozdnyakov <[email protected]>
[EFL] Gardening after r121388
Modified: trunk/LayoutTests/platform/qt/Skipped (121424 => 121425)
--- trunk/LayoutTests/platform/qt/Skipped 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-06-28 11:39:31 UTC (rev 121425)
@@ -1906,11 +1906,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=87469
fast/events/domactivate-sets-underlying-click-event-as-handled.html
-# [Qt] New fast/dom/window-scroll-scaling.html made 3-400 tests flakey
-# Restore original value of mock scrollbars enabled in InternalSettings
-# https://bugs.webkit.org/show_bug.cgi?id=87680
-fast/dom/window-scroll-scaling.html
-
# New fast/dom/Window/mozilla-focus-blur.html introduced in r118916 fails
# https://bugs.webkit.org/show_bug.cgi?id=87951
fast/dom/Window/mozilla-focus-blur.html
@@ -2533,7 +2528,3 @@
fast/block/float/previous-sibling-float-001.html
fast/block/negative-margin-start-positive-margin-end.html
fast/block/positive-margin-start-negative-margin-end-align-center.html
-
-# Restore original value of mock scrollbars enabled in InternalSettings
-# https://bugs.webkit.org/show_bug.cgi?id=87680
-css3/filters/blur-filter-page-scroll.html
Modified: trunk/Source/WebKit/qt/ChangeLog (121424 => 121425)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-28 11:39:31 UTC (rev 121425)
@@ -1,3 +1,14 @@
+2012-06-28 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Restore original value of mock scrollbars between tests
+ https://bugs.webkit.org/show_bug.cgi?id=90155
+
+ Reviewed by Simon Hausmann.
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::setMockScrollbarsEnabled):
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2012-06-25 Mark Hahnenberg <[email protected]>
JSLock should be per-JSGlobalData
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (121424 => 121425)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-28 11:39:31 UTC (rev 121425)
@@ -248,6 +248,11 @@
QWebPagePrivate::core(page)->settings()->setFrameFlatteningEnabled(enabled);
}
+void DumpRenderTreeSupportQt::setMockScrollbarsEnabled(QWebPage* page, bool enabled)
+{
+ QWebPagePrivate::core(page)->settings()->setMockScrollbarsEnabled(enabled);
+}
+
void DumpRenderTreeSupportQt::webPageSetGroupName(QWebPage* page, const QString& groupName)
{
page->handle()->page->setGroupName(groupName);
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (121424 => 121425)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-06-28 11:39:31 UTC (rev 121425)
@@ -117,6 +117,7 @@
static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
static void setFrameFlatteningEnabled(QWebPage*, bool);
+ static void setMockScrollbarsEnabled(QWebPage*, bool);
static void setCaretBrowsingEnabled(QWebPage* page, bool value);
static void setAuthorAndUserStylesEnabled(QWebPage*, bool);
static void setMediaType(QWebFrame* qframe, const QString& type);
Modified: trunk/Tools/ChangeLog (121424 => 121425)
--- trunk/Tools/ChangeLog 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Tools/ChangeLog 2012-06-28 11:39:31 UTC (rev 121425)
@@ -1,3 +1,17 @@
+2012-06-28 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Restore original value of mock scrollbars between tests
+ https://bugs.webkit.org/show_bug.cgi?id=90155
+
+ Reviewed by Simon Hausmann.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::WebPage::resetSettings):
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::setMockScrollbarsEnabled):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+ (LayoutTestController):
+
2012-06-27 Mark Rowe <[email protected]>
<http://webkit.org/b/90096> Building within Xcode sometimes does a full rebuild after building via build-webkit
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (121424 => 121425)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2012-06-28 11:39:31 UTC (rev 121425)
@@ -195,6 +195,7 @@
m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
m_drt->layoutTestController()->setAuthorAndUserStylesEnabled(true);
m_drt->layoutTestController()->setFrameFlatteningEnabled(false);
+ m_drt->layoutTestController()->setMockScrollbarsEnabled(false);
m_drt->layoutTestController()->setSmartInsertDeleteEnabled(true);
m_drt->layoutTestController()->setSelectTrailingWhitespaceEnabled(false);
m_drt->layoutTestController()->setDefersLoading(false);
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (121424 => 121425)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2012-06-28 11:39:31 UTC (rev 121425)
@@ -442,6 +442,11 @@
DumpRenderTreeSupportQt::setFrameFlatteningEnabled(m_drt->webPage(), enabled);
}
+void LayoutTestController::setMockScrollbarsEnabled(bool enabled)
+{
+ DumpRenderTreeSupportQt::setMockScrollbarsEnabled(m_drt->webPage(), enabled);
+}
+
void LayoutTestController::goBack()
{
DumpRenderTreeSupportQt::goBack(m_drt->webPage());
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (121424 => 121425)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2012-06-28 09:57:20 UTC (rev 121424)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2012-06-28 11:39:31 UTC (rev 121425)
@@ -154,6 +154,7 @@
void removeAllVisitedLinks();
void setMediaType(const QString& type);
void setFrameFlatteningEnabled(bool enable);
+ void setMockScrollbarsEnabled(bool enable);
void setAllowUniversalAccessFromFileURLs(bool enable);
void setAllowFileAccessFromFileURLs(bool enable);
void setAppCacheMaximumSize(unsigned long long quota);
