Add Settings::deviceScaleAdjustment.

Source/core/page/Settings.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 96 matching lines @@
 #if OS(WIN)
 static const bool defaultSelectTrailingWhitespaceEnabled = true;
 #else
 static const bool defaultSelectTrailingWhitespaceEnabled = false;
 #endif
 
 Settings::Settings(Page* page)
     : m_page(0)
     , m_mediaTypeOverride("screen")
     , m_textAutosizingFontScaleFactor(1)
+    , m_deviceScaleAdjustment(1.0f)
 #if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
     , m_textAutosizingWindowSizeOverride(320, 480)
     , m_textAutosizingEnabled(true)
 #else
     , m_textAutosizingEnabled(false)
 #endif
     , m_useWideViewport(true)
     , m_loadWithOverviewMode(true)
     SETTINGS_INITIALIZER_LIST
     , m_isJavaEnabled(false)
@@ skipping 124 matching lines @@
 void Settings::setLoadWithOverviewMode(bool loadWithOverviewMode)
 {
     if (m_loadWithOverviewMode == loadWithOverviewMode)
         return;
 
     m_loadWithOverviewMode = loadWithOverviewMode;
     if (m_page->mainFrame())
         m_page->chrome().dispatchViewportPropertiesDidChange(m_page->mainFrame()->document()->viewportDescription());
 }
 
-void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
+void Settings::recalculateTextAutosizingMultipliers()
 {
-    m_textAutosizingFontScaleFactor = fontScaleFactor;
-
     // FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->textAutosizer()->recalculateMultipliers();
 
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
+void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
+{
+    m_textAutosizingFontScaleFactor = fontScaleFactor;
+    recalculateTextAutosizingMultipliers();
+}
+
+void Settings::setDeviceScaleAdjustment(float deviceScaleAdjustment)
+{
+    m_deviceScaleAdjustment = deviceScaleAdjustment;
+    recalculateTextAutosizingMultipliers();
+}
+
 void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
 {
     if (m_mediaTypeOverride == mediaTypeOverride)
         return;
 
     m_mediaTypeOverride = mediaTypeOverride;
 
     Frame* mainFrame = m_page->mainFrame();
     ASSERT(mainFrame);
     FrameView* view = mainFrame->view();
@@ skipping 104 matching lines @@
 {
     if (m_viewportEnabled == enabled)
         return;
 
     m_viewportEnabled = enabled;
     if (m_page->mainFrame())
         m_page->mainFrame()->document()->updateViewportDescription();
 }
 
 } // namespace WebCore