Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 6591126: Revert 76631 because it causes fullscreen layout tests to timeout on linux... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 gl_multisampling_enabled(true), 65 gl_multisampling_enabled(true),
66 show_composited_layer_borders(false), 66 show_composited_layer_borders(false),
67 asynchronous_spell_checking_enabled(true), 67 asynchronous_spell_checking_enabled(true),
68 accelerated_compositing_enabled(false), 68 accelerated_compositing_enabled(false),
69 composite_to_texture_enabled(false), 69 composite_to_texture_enabled(false),
70 accelerated_layers_enabled(false), 70 accelerated_layers_enabled(false),
71 accelerated_video_enabled(false), 71 accelerated_video_enabled(false),
72 accelerated_2d_canvas_enabled(false), 72 accelerated_2d_canvas_enabled(false),
73 accelerated_plugins_enabled(false), 73 accelerated_plugins_enabled(false),
74 memory_info_enabled(false), 74 memory_info_enabled(false),
75 interactive_form_validation_enabled(true), 75 interactive_form_validation_enabled(true) {
76 fullscreen_enabled(false) {
77 } 76 }
78 77
79 WebPreferences::~WebPreferences() { 78 WebPreferences::~WebPreferences() {
80 } 79 }
81 80
82 void WebPreferences::Apply(WebView* web_view) const { 81 void WebPreferences::Apply(WebView* web_view) const {
83 WebSettings* settings = web_view->settings(); 82 WebSettings* settings = web_view->settings();
84 settings->setStandardFontFamily(standard_font_family); 83 settings->setStandardFontFamily(standard_font_family);
85 settings->setFixedFontFamily(fixed_font_family); 84 settings->setFixedFontFamily(fixed_font_family);
86 settings->setSerifFontFamily(serif_font_family); 85 settings->setSerifFontFamily(serif_font_family);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 it != inspector_settings.end(); ++it) 198 it != inspector_settings.end(); ++it)
200 web_view->setInspectorSetting(WebString::fromUTF8(it->first), 199 web_view->setInspectorSetting(WebString::fromUTF8(it->first),
201 WebString::fromUTF8(it->second)); 200 WebString::fromUTF8(it->second));
202 201
203 // Tabs to link is not part of the settings. WebCore calls 202 // Tabs to link is not part of the settings. WebCore calls
204 // ChromeClient::tabsToLinks which is part of the glue code. 203 // ChromeClient::tabsToLinks which is part of the glue code.
205 web_view->setTabsToLinks(tabs_to_links); 204 web_view->setTabsToLinks(tabs_to_links);
206 205
207 settings->setInteractiveFormValidationEnabled( 206 settings->setInteractiveFormValidationEnabled(
208 interactive_form_validation_enabled); 207 interactive_form_validation_enabled);
209
210 settings->setFullScreenEnabled(fullscreen_enabled);
211 } 208 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698