Created
April 27, 2011 13:09
-
-
Save Smith1123/944218 to your computer and use it in GitHub Desktop.
Patch for bug 48958
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped | |
index 3df238f..5e4db0f 100644 | |
--- a/LayoutTests/platform/qt/Skipped | |
+++ b/LayoutTests/platform/qt/Skipped | |
@@ -2285,7 +2285,7 @@ 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 | |
+#svg/custom/text-zoom.xhtml | |
# [Qt] svg/animations/animate-path-nested-transforms.html fails | |
# https://bugs.webkit.org/show_bug.cgi?id=48987 | |
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | |
index 1a6c833..2c48769 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,12 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url) | |
m_eventSender->resetClickCount(); | |
closeRemainingWindows(); | |
- | |
+ 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()); | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment