Diff
Modified: trunk/Source/WebCore/ChangeLog (109154 => 109155)
--- trunk/Source/WebCore/ChangeLog 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebCore/ChangeLog 2012-02-28 23:05:23 UTC (rev 109155)
@@ -1,3 +1,18 @@
+2012-02-28 Tim Dresser <[email protected]>
+
+ Provide DefaultDeviceScaleFactor though WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=79534
+
+ Reviewed by Darin Fisher.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setDefaultDeviceScaleFactor):
+ (WebCore):
+ * page/Settings.h:
+ (Settings):
+ (WebCore::Settings::defaultDeviceScaleFactor):
+
2012-02-28 Oliver Hunt <[email protected]>
Fix build.
Modified: trunk/Source/WebCore/page/Settings.cpp (109154 => 109155)
--- trunk/Source/WebCore/page/Settings.cpp 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-02-28 23:05:23 UTC (rev 109155)
@@ -115,6 +115,7 @@
, m_minimumLogicalFontSize(0)
, m_defaultFontSize(0)
, m_defaultFixedFontSize(0)
+ , m_defaultDeviceScaleFactor(1)
, m_validationMessageTimerMagnification(50)
, m_minimumAccelerated2dCanvasSize(128 * 128)
, m_layoutFallbackWidth(980)
@@ -363,6 +364,11 @@
m_page->setNeedsRecalcStyleInAllFrames();
}
+void Settings::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
+{
+ m_defaultDeviceScaleFactor = defaultDeviceScaleFactor;
+}
+
void Settings::setLoadsImagesAutomatically(bool loadsImagesAutomatically)
{
m_loadsImagesAutomatically = loadsImagesAutomatically;
Modified: trunk/Source/WebCore/page/Settings.h (109154 => 109155)
--- trunk/Source/WebCore/page/Settings.h 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebCore/page/Settings.h 2012-02-28 23:05:23 UTC (rev 109155)
@@ -103,6 +103,9 @@
void setDefaultFixedFontSize(int);
int defaultFixedFontSize() const { return m_defaultFixedFontSize; }
+ void setDefaultDeviceScaleFactor(int);
+ int defaultDeviceScaleFactor() const { return m_defaultDeviceScaleFactor; }
+
// Unlike areImagesEnabled, this only suppresses the network load of
// the image URL. A cached image will still be rendered if requested.
void setLoadsImagesAutomatically(bool);
@@ -562,6 +565,7 @@
int m_minimumLogicalFontSize;
int m_defaultFontSize;
int m_defaultFixedFontSize;
+ int m_defaultDeviceScaleFactor;
int m_validationMessageTimerMagnification;
int m_minimumAccelerated2dCanvasSize;
int m_layoutFallbackWidth;
Modified: trunk/Source/WebKit/chromium/ChangeLog (109154 => 109155)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-28 23:05:23 UTC (rev 109155)
@@ -1,3 +1,17 @@
+2012-02-28 Tim Dresser <[email protected]>
+
+ Provide DefaultDeviceScaleFactor though WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=79534
+
+ Reviewed by Darin Fisher.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setDefaultDeviceScaleFactor):
+ (WebKit):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-02-28 Gary Kacmarcik <[email protected]>
[chromium] Set nativeKeyCode to include Windows scan code
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (109154 => 109155)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-02-28 23:05:23 UTC (rev 109155)
@@ -62,6 +62,7 @@
virtual void setDefaultFixedFontSize(int) = 0;
virtual void setMinimumFontSize(int) = 0;
virtual void setMinimumLogicalFontSize(int) = 0;
+ virtual void setDefaultDeviceScaleFactor(int) = 0;
virtual void setDefaultTextEncodingName(const WebString&) = 0;
virtual void setJavaScriptEnabled(bool) = 0;
virtual void setWebSecurityEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (109154 => 109155)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-02-28 23:05:23 UTC (rev 109155)
@@ -109,6 +109,11 @@
m_settings->setMinimumLogicalFontSize(size);
}
+void WebSettingsImpl::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
+{
+ m_settings->setDefaultDeviceScaleFactor(defaultDeviceScaleFactor);
+}
+
void WebSettingsImpl::setDefaultTextEncodingName(const WebString& encoding)
{
m_settings->setDefaultTextEncodingName((String)encoding);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (109154 => 109155)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-02-28 22:58:17 UTC (rev 109154)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-02-28 23:05:23 UTC (rev 109155)
@@ -54,6 +54,7 @@
virtual void setDefaultFixedFontSize(int);
virtual void setMinimumFontSize(int);
virtual void setMinimumLogicalFontSize(int);
+ virtual void setDefaultDeviceScaleFactor(int);
virtual void setDefaultTextEncodingName(const WebString&);
virtual void setJavaScriptEnabled(bool);
virtual void setWebSecurityEnabled(bool);
