Index: Source/core/testing/InternalSettings.cpp |
diff --git a/Source/core/testing/InternalSettings.cpp b/Source/core/testing/InternalSettings.cpp |
index 8797c6169da024ad4bb7f805d0e30edb3ec11d75..be9d719f25810480b42f2b3620468df132e69bbd 100644 |
--- a/Source/core/testing/InternalSettings.cpp |
+++ b/Source/core/testing/InternalSettings.cpp |
@@ -76,7 +76,6 @@ InternalSettings::Backup::Backup(Settings* settings) |
, m_originalTextAutosizingEnabled(settings->textAutosizingEnabled()) |
, m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowSizeOverride()) |
, m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleFactor()) |
- , m_originalResolutionOverride(settings->resolutionOverride()) |
, m_originalMediaTypeOverride(settings->mediaTypeOverride()) |
#if ENABLE(DIALOG_ELEMENT) |
, m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnabled()) |
@@ -104,7 +103,6 @@ void InternalSettings::Backup::restoreTo(Settings* settings) |
settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); |
settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride); |
settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScaleFactor); |
- settings->setResolutionOverride(m_originalResolutionOverride); |
settings->setMediaTypeOverride(m_originalMediaTypeOverride); |
#if ENABLE(DIALOG_ELEMENT) |
RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled); |
@@ -161,6 +159,7 @@ InternalSettings::InternalSettings(Page* page) |
void InternalSettings::resetToConsistentState() |
{ |
+ page()->setDeviceScaleFactor(1); |
page()->setPageScaleFactor(1, IntPoint(0, 0)); |
page()->setCanStartMedia(true); |
@@ -284,13 +283,6 @@ void InternalSettings::setTextAutosizingWindowSizeOverride(int width, int height |
settings()->setTextAutosizingWindowSizeOverride(IntSize(width, height)); |
} |
-void InternalSettings::setResolutionOverride(int dotsPerCSSInchHorizontally, int dotsPerCSSInchVertically, ExceptionCode& ec) |
-{ |
- InternalSettingsGuardForSettings(); |
- // An empty size resets the override. |
- settings()->setResolutionOverride(IntSize(dotsPerCSSInchHorizontally, dotsPerCSSInchVertically)); |
-} |
- |
void InternalSettings::setMediaTypeOverride(const String& mediaType, ExceptionCode& ec) |
{ |
InternalSettingsGuardForSettings(); |