- Revision
- 135002
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-16 14:31:19 -0800 (Fri, 16 Nov 2012)
Log Message
Rename applyDefaultDeviceScaleFactorInCompositor to setApplyDeviceScaleFactorInCompositor
https://bugs.webkit.org/show_bug.cgi?id=102462
Patch by Tien-Ren Chen <trc...@chromium.org> on 2012-11-16
Reviewed by James Robinson.
As we no longer have this "default" device scale factor.
Source/WebKit/chromium:
* public/WebSettings.h:
(WebKit::WebSettings::setApplyDefaultDeviceScaleFactorInCompositor):
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::WebSettingsImpl):
(WebKit::WebSettingsImpl::setApplyDeviceScaleFactorInCompositor):
* src/WebSettingsImpl.h:
(WebSettingsImpl):
(WebKit::WebSettingsImpl::applyDeviceScaleFactorInCompositor):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setDeviceScaleFactor):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
Tools:
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::applyTo):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (135001 => 135002)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-16 22:31:19 UTC (rev 135002)
@@ -1,3 +1,24 @@
+2012-11-16 Tien-Ren Chen <trc...@chromium.org>
+
+ Rename applyDefaultDeviceScaleFactorInCompositor to setApplyDeviceScaleFactorInCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=102462
+
+ Reviewed by James Robinson.
+
+ As we no longer have this "default" device scale factor.
+
+ * public/WebSettings.h:
+ (WebKit::WebSettings::setApplyDefaultDeviceScaleFactorInCompositor):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::WebSettingsImpl):
+ (WebKit::WebSettingsImpl::setApplyDeviceScaleFactorInCompositor):
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ (WebKit::WebSettingsImpl::applyDeviceScaleFactorInCompositor):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setDeviceScaleFactor):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
2012-11-16 Jon Lee <jon...@apple.com>
Fix build error on Chromium due to r134995.
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (135001 => 135002)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-16 22:31:19 UTC (rev 135002)
@@ -73,7 +73,7 @@
virtual void setAllowRunningOfInsecureContent(bool) = 0;
virtual void setAllowScriptsToCloseWindows(bool) = 0;
virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
- virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool) = 0;
+ virtual void setApplyDeviceScaleFactorInCompositor(bool) = 0;
virtual void setApplyPageScaleFactorInCompositor(bool) = 0;
virtual void setAsynchronousSpellCheckingEnabled(bool) = 0;
virtual void setAutoZoomFocusedNodeToLegibleScale(bool) = 0;
@@ -169,8 +169,8 @@
virtual void setWebSecurityEnabled(bool) = 0;
virtual void setXSSAuditorEnabled(bool) = 0;
- // DEPRECATED
- virtual void setDefaultDeviceScaleFactor(int) { }
+ // DEPRECATED (renamed. remove this after all call sites changed to the new name)
+ void setApplyDefaultDeviceScaleFactorInCompositor(bool enabled) { setApplyDeviceScaleFactorInCompositor(enabled); }
protected:
~WebSettings() { }
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (135001 => 135002)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-16 22:31:19 UTC (rev 135002)
@@ -53,7 +53,7 @@
, m_showPaintRects(false)
, m_renderVSyncEnabled(true)
, m_viewportEnabled(false)
- , m_applyDefaultDeviceScaleFactorInCompositor(false)
+ , m_applyDeviceScaleFactorInCompositor(false)
, m_gestureTapHighlightEnabled(true)
, m_autoZoomFocusedNodeToLegibleScale(false)
, m_deferredImageDecodingEnabled(false)
@@ -139,9 +139,9 @@
return m_settings->deviceSupportsTouch();
}
-void WebSettingsImpl::setApplyDefaultDeviceScaleFactorInCompositor(bool applyDefaultDeviceScaleFactorInCompositor)
+void WebSettingsImpl::setApplyDeviceScaleFactorInCompositor(bool applyDeviceScaleFactorInCompositor)
{
- m_applyDefaultDeviceScaleFactorInCompositor = applyDefaultDeviceScaleFactorInCompositor;
+ m_applyDeviceScaleFactorInCompositor = applyDeviceScaleFactorInCompositor;
}
void WebSettingsImpl::setApplyPageScaleFactorInCompositor(bool applyPageScaleFactorInCompositor)
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (135001 => 135002)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-16 22:31:19 UTC (rev 135002)
@@ -65,7 +65,7 @@
virtual void setAllowRunningOfInsecureContent(bool);
virtual void setAllowScriptsToCloseWindows(bool);
virtual void setAllowUniversalAccessFromFileURLs(bool);
- virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool);
+ virtual void setApplyDeviceScaleFactorInCompositor(bool);
virtual void setApplyPageScaleFactorInCompositor(bool);
virtual void setAsynchronousSpellCheckingEnabled(bool);
virtual void setAuthorAndUserStylesEnabled(bool);
@@ -168,7 +168,7 @@
bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
bool showPaintRects() const { return m_showPaintRects; }
bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }
- bool applyDefaultDeviceScaleFactorInCompositor() const { return m_applyDefaultDeviceScaleFactorInCompositor; }
+ bool applyDeviceScaleFactorInCompositor() const { return m_applyDeviceScaleFactorInCompositor; }
bool applyPageScaleFactorInCompositor() const;
bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; }
bool gestureTapHighlightEnabled() const { return m_gestureTapHighlightEnabled; }
@@ -185,7 +185,7 @@
bool m_showPaintRects;
bool m_renderVSyncEnabled;
bool m_viewportEnabled;
- bool m_applyDefaultDeviceScaleFactorInCompositor;
+ bool m_applyDeviceScaleFactorInCompositor;
bool m_gestureTapHighlightEnabled;
bool m_autoZoomFocusedNodeToLegibleScale;
bool m_deferredImageDecodingEnabled;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (135001 => 135002)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-11-16 22:31:19 UTC (rev 135002)
@@ -2934,7 +2934,7 @@
page()->setDeviceScaleFactor(scaleFactor);
- if (m_layerTreeView && m_webSettings->applyDefaultDeviceScaleFactorInCompositor()) {
+ if (m_layerTreeView && m_webSettings->applyDeviceScaleFactorInCompositor()) {
m_deviceScaleInCompositor = page()->deviceScaleFactor();
m_layerTreeView->setDeviceScaleFactor(m_deviceScaleInCompositor);
}
@@ -4012,7 +4012,7 @@
m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(this, *m_rootLayer, layerTreeViewSettings));
if (m_layerTreeView) {
- if (m_webSettings->applyDefaultDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) {
+ if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) {
ASSERT(page()->deviceScaleFactor());
m_deviceScaleInCompositor = page()->deviceScaleFactor();
Modified: trunk/Tools/ChangeLog (135001 => 135002)
--- trunk/Tools/ChangeLog 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Tools/ChangeLog 2012-11-16 22:31:19 UTC (rev 135002)
@@ -1,3 +1,15 @@
+2012-11-16 Tien-Ren Chen <trc...@chromium.org>
+
+ Rename applyDefaultDeviceScaleFactorInCompositor to setApplyDeviceScaleFactorInCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=102462
+
+ Reviewed by James Robinson.
+
+ As we no longer have this "default" device scale factor.
+
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::applyTo):
+
2012-11-15 Takashi Sakamoto <ta...@google.com>
[Win] key event's location does not work on Windows platform.
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (135001 => 135002)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-16 22:02:21 UTC (rev 135001)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-16 22:31:19 UTC (rev 135002)
@@ -238,7 +238,7 @@
settings->setDeferredImageDecodingEnabled(deferredImageDecodingEnabled);
settings->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
- settings->setApplyDefaultDeviceScaleFactorInCompositor(forceCompositingMode);
+ settings->setApplyDeviceScaleFactorInCompositor(forceCompositingMode);
settings->setShouldRespectImageOrientation(shouldRespectImageOrientation);
// Fixed values.
