Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)

New snapshot that fixes build without QtWidgets

1 files changed, 17 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.cpp b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
index 988c5e66b..a667bedf5 100644
--- a/Source/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/Source/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -32,6 +32,7 @@
 #include "WebSettingsImpl.h"
 
 #include "FontRenderingMode.h"
+#include "ImageDecodingStore.h"
 #include "Settings.h"
 #include <public/WebString.h>
 #include <public/WebURL.h>
@@ -55,6 +56,8 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings)
     , m_applyDefaultDeviceScaleFactorInCompositor(false)
     , m_gestureTapHighlightEnabled(true)
     , m_autoZoomFocusedNodeToLegibleScale(false)
+    , m_deferredImageDecodingEnabled(false)
+    , m_doubleTapToZoomEnabled(false)
     , m_defaultTileSize(WebSize(256, 256))
     , m_maxUntiledLayerSize(WebSize(512, 512))
 {
@@ -264,6 +267,11 @@ void WebSettingsImpl::setPageCacheSupportsPlugins(bool pageCacheSupportsPlugins)
     m_settings->setPageCacheSupportsPlugins(pageCacheSupportsPlugins);
 }
 
+void WebSettingsImpl::setDoubleTapToZoomEnabled(bool doubleTapToZoomEnabled)
+{
+    m_doubleTapToZoomEnabled = doubleTapToZoomEnabled;
+}
+
 void WebSettingsImpl::setDownloadableBinaryFontsEnabled(bool enabled)
 {
     m_settings->setDownloadableBinaryFontsEnabled(enabled);
@@ -480,6 +488,15 @@ void WebSettingsImpl::setDeferred2dCanvasEnabled(bool enabled)
     m_settings->setDeferred2dCanvasEnabled(enabled);
 }
 
+void WebSettingsImpl::setDeferredImageDecodingEnabled(bool enabled)
+{
+    if (!m_deferredImageDecodingEnabled && enabled)
+        ImageDecodingStore::initializeOnMainThread();
+    if (m_deferredImageDecodingEnabled && !enabled)
+        ImageDecodingStore::shutdown();
+    m_deferredImageDecodingEnabled = enabled;
+}
+
 void WebSettingsImpl::setAcceleratedCompositingForFixedPositionEnabled(bool enabled)
 {
     m_settings->setAcceleratedCompositingForFixedPositionEnabled(enabled);