Bug 48958

gistfile1.diff

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 348e841..f95e6cd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-27  Zsolt Fehér  <h490267@stud.u-szeged.hu>
+
+        Reviewed by NOBODY (OOPS!).
+
+        DRT sideeffect revealed by r71268
+        https://bugs.webkit.org/show_bug.cgi?id=48958
+
+        * platform/qt/Skipped: Unskip svg/custom/text-zoom.xhtml
+
 2011-04-26  Chang Shu  <cshu@webkit.org>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3df238f..0ed6220 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2283,10 +2283,6 @@ fast/media/color-does-not-include-alpha.html
 # Requires WebP support.
 fast/images/webp-image-decoding.html
 
-# [Qt] DRT sideeffect revealed by r71268
-# https://bugs.webkit.org/show_bug.cgi?id=48958
-svg/custom/text-zoom.xhtml
-
 # [Qt] svg/animations/animate-path-nested-transforms.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=48987
 svg/animations/animate-path-nested-transforms.html
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 73bd217..c0de5f6 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2011-04-27  Zsolt Fehér  <h490267@stud.u-szeged.hu>
+
+        Reviewed by NOBODY (OOPS!).
+
+        DRT sideeffect revealed by r71268.
+        https://bugs.webkit.org/show_bug.cgi?id=48958
+
+        Reset QWebSettings::ZoomTextOnly attribute before all tests. 
+
+        Call setTextSizeMultiplier(1.0) to reset TextZoomFactor and 
+        PageZoomFactor too. It should be done before resetsettings() 
+        to guarantee resetting QWebSettings::ZoomTextOnly correctly.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::resetSettings):
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
 2011-04-25  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 1a6c833..606f93a 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -194,6 +194,7 @@ void WebPage::resetSettings()
     settings()->resetAttribute(QWebSettings::PluginsEnabled);
     settings()->resetAttribute(QWebSettings::JavascriptCanAccessClipboard);
     settings()->resetAttribute(QWebSettings::AutoLoadImages);
+    settings()->resetAttribute(QWebSettings::ZoomTextOnly);
 
     m_drt->layoutTestController()->setCaretBrowsingEnabled(false);
     m_drt->layoutTestController()->setFrameFlatteningEnabled(false);
@@ -552,12 +553,16 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
     m_eventSender->resetClickCount();
 
     closeRemainingWindows();
+    
+    //Call setTextSizeMultiplier(1.0) to reset TextZoomFactor and PageZoomFactor too. 
+    //It should be done before resetSettings() to guarantee resetting QWebSettings::ZoomTextOnly correctly.
+    m_page->mainFrame()->setTextSizeMultiplier(1.0);
 
     m_page->resetSettings();
 #ifndef QT_NO_UNDOSTACK
     m_page->undoStack()->clear();
 #endif
-    m_page->mainFrame()->setZoomFactor(1.0);
+    
     clearHistory(m_page);
     DumpRenderTreeSupportQt::clearFrameName(m_page->mainFrame());