Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: Source/core/testing/InternalSettings.cpp

Issue 14408004: Fix incorrect evaluation of resolution media queries (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/testing/InternalSettings.cpp
diff --git a/Source/core/testing/InternalSettings.cpp b/Source/core/testing/InternalSettings.cpp
index e0183786ffece6ea0787beb2bbb17e107fa017eb..f7d13351bc1e45c00e9419f6d6c611f60e3c87c8 100644
--- a/Source/core/testing/InternalSettings.cpp
+++ b/Source/core/testing/InternalSettings.cpp
@@ -75,7 +75,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())
, m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnabled())
, m_originalLazyLayoutEnabled(RuntimeEnabledFeatures::lazyLayoutEnabled())
@@ -100,7 +99,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);
RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled);
RuntimeEnabledFeatures::setLazyLayoutEnabled(m_originalLazyLayoutEnabled);
@@ -259,13 +257,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();

Powered by Google App Engine
This is Rietveld 408576698