OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/glue/webpreferences.h" | 5 #include "webkit/glue/webpreferences.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" | 9 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" |
10 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 10 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 // and support is compiled in. | 89 // and support is compiled in. |
90 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled); | 90 settings->setExperimentalWebGLEnabled(experimental_webgl_enabled); |
91 | 91 |
92 // Display colored borders around composited render layers if requested | 92 // Display colored borders around composited render layers if requested |
93 // on command line. | 93 // on command line. |
94 settings->setShowDebugBorders(show_composited_layer_borders); | 94 settings->setShowDebugBorders(show_composited_layer_borders); |
95 | 95 |
96 // Enable gpu-accelerated compositing if requested on the command line. | 96 // Enable gpu-accelerated compositing if requested on the command line. |
97 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); | 97 settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); |
98 | 98 |
| 99 // Enable gpu-accelerated 2d canvas if requested on the command line. |
| 100 settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled); |
| 101 |
99 // Enable memory info reporting to page if requested on the command line. | 102 // Enable memory info reporting to page if requested on the command line. |
100 settings->setMemoryInfoEnabled(memory_info_enabled); | 103 settings->setMemoryInfoEnabled(memory_info_enabled); |
101 | 104 |
102 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); | 105 for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); |
103 it != inspector_settings.end(); ++it) | 106 it != inspector_settings.end(); ++it) |
104 web_view->setInspectorSetting(WebString::fromUTF8(it->first), | 107 web_view->setInspectorSetting(WebString::fromUTF8(it->first), |
105 WebString::fromUTF8(it->second)); | 108 WebString::fromUTF8(it->second)); |
106 | 109 |
107 // Tabs to link is not part of the settings. WebCore calls | 110 // Tabs to link is not part of the settings. WebCore calls |
108 // ChromeClient::tabsToLinks which is part of the glue code. | 111 // ChromeClient::tabsToLinks which is part of the glue code. |
109 web_view->setTabsToLinks(tabs_to_links); | 112 web_view->setTabsToLinks(tabs_to_links); |
110 } | 113 } |
OLD | NEW |