Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 15 insertions, 24 deletions

diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.cpp b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
index c51fffbf7..5f8776b58 100644
--- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -47,6 +47,7 @@ namespace WebKit {
 
 WebSettingsImpl::WebSettingsImpl(Settings* settings)
     : m_settings(settings)
+    , m_forceSoftwareCompositing(false)
     , m_showFPSCounter(false)
     , m_showPlatformLayerTree(false)
     , m_showPaintRects(false)
@@ -88,6 +89,11 @@ void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode sc
     m_settings->setFantasyFontFamily(font, script);
 }
 
+void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
+{
+    m_settings->setPictographFontFamily(font, script);
+}
+
 void WebSettingsImpl::setDefaultFontSize(int size)
 {
     m_settings->setDefaultFontSize(size);
@@ -113,19 +119,14 @@ void WebSettingsImpl::setMinimumLogicalFontSize(int size)
     m_settings->setMinimumLogicalFontSize(size);
 }
 
-void WebSettingsImpl::setDefaultDeviceScaleFactor(int defaultDeviceScaleFactor)
-{
-    m_settings->setDefaultDeviceScaleFactor(defaultDeviceScaleFactor);
-}
-
-int WebSettingsImpl::defaultDeviceScaleFactor()
+void WebSettingsImpl::setDeviceSupportsTouch(bool deviceSupportsTouch)
 {
-    return m_settings->defaultDeviceScaleFactor();
+    m_settings->setDeviceSupportsTouch(deviceSupportsTouch);
 }
 
-void WebSettingsImpl::setDeviceSupportsTouch(bool deviceSupportsTouch)
+void WebSettingsImpl::setDeviceSupportsMouse(bool deviceSupportsMouse)
 {
-    m_settings->setDeviceSupportsTouch(deviceSupportsTouch);
+    m_settings->setDeviceSupportsMouse(deviceSupportsMouse);
 }
 
 bool WebSettingsImpl::deviceSupportsTouch()
@@ -388,6 +389,11 @@ void WebSettingsImpl::setForceCompositingMode(bool enabled)
     m_settings->setForceCompositingMode(enabled);
 }
 
+void WebSettingsImpl::setForceSoftwareCompositing(bool enabled)
+{
+    m_forceSoftwareCompositing = enabled;
+}
+
 void WebSettingsImpl::setMockScrollbarsEnabled(bool enabled)
 {
     m_settings->setMockScrollbarsEnabled(enabled);
@@ -586,21 +592,6 @@ void WebSettingsImpl::setAcceleratedPaintingEnabled(bool enabled)
     m_settings->setAcceleratedDrawingEnabled(enabled);
 }
 
-void WebSettingsImpl::setPerTilePaintingEnabled(bool enabled)
-{
-    m_settings->setPerTileDrawingEnabled(enabled);
-}
-
-void WebSettingsImpl::setPartialSwapEnabled(bool enabled)
-{
-    m_settings->setPartialSwapEnabled(enabled);
-}
-
-void WebSettingsImpl::setThreadedAnimationEnabled(bool enabled)
-{
-    m_settings->setThreadedAnimationEnabled(enabled);
-}
-
 void WebSettingsImpl::setMediaPlaybackRequiresUserGesture(bool required)
 {
     m_settings->setMediaPlaybackRequiresUserGesture(required);