diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp index 35247ef..948b448 100644 --- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp +++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "WebPreferences.h" -#include "public/WebView.h" +#include "WebView.h" using namespace WebKit; @@ -102,6 +102,7 @@ void WebPreferences::reset() tabsToLinks = false; hyperlinkAuditingEnabled = false; + acceleratedCompositingEnabled = false; accelerated2dCanvasEnabled = false; } @@ -159,10 +160,7 @@ void WebPreferences::applyTo(WebView* webView) settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded(); settings->setUsesEncodingDetector(false); settings->setImagesEnabled(true); - - // FIXME: crbug.com/51879 - settings->setAcceleratedCompositingEnabled(false); - + settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled); settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled); } |