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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 12335103: Enable the threaded HTML parser by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Without DEPS change Created 7 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 | « no previous file | content/public/common/content_switches.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures); 529 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
530 prefs.css_shaders_enabled = 530 prefs.css_shaders_enabled =
531 command_line.HasSwitch(switches::kEnableCssShaders); 531 command_line.HasSwitch(switches::kEnableCssShaders);
532 prefs.css_variables_enabled = 532 prefs.css_variables_enabled =
533 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures); 533 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
534 prefs.css_grid_layout_enabled = 534 prefs.css_grid_layout_enabled =
535 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures); 535 command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
536 prefs.record_rendering_stats = 536 prefs.record_rendering_stats =
537 command_line.HasSwitch(switches::kEnableGpuBenchmarking); 537 command_line.HasSwitch(switches::kEnableGpuBenchmarking);
538 prefs.threaded_html_parser = 538 prefs.threaded_html_parser =
539 command_line.HasSwitch(switches::kEnableThreadedHTMLParser); 539 !command_line.HasSwitch(switches::kDisableThreadedHTMLParser);
540 540
541 bool touch_device_present = false; 541 bool touch_device_present = false;
542 touch_device_present = ui::IsTouchDevicePresent(); 542 touch_device_present = ui::IsTouchDevicePresent();
543 const std::string touch_enabled_switch = 543 const std::string touch_enabled_switch =
544 command_line.HasSwitch(switches::kTouchEvents) ? 544 command_line.HasSwitch(switches::kTouchEvents) ?
545 command_line.GetSwitchValueASCII(switches::kTouchEvents) : 545 command_line.GetSwitchValueASCII(switches::kTouchEvents) :
546 switches::kTouchEventsAuto; 546 switches::kTouchEventsAuto;
547 547
548 if (touch_enabled_switch.empty() || 548 if (touch_enabled_switch.empty() ||
549 touch_enabled_switch == switches::kTouchEventsEnabled) { 549 touch_enabled_switch == switches::kTouchEventsEnabled) {
(...skipping 2986 matching lines...) Expand 10 before | Expand all | Expand 10 after
3536 3536
3537 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { 3537 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const {
3538 return browser_plugin_guest_.get(); 3538 return browser_plugin_guest_.get();
3539 } 3539 }
3540 3540
3541 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const { 3541 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const {
3542 return browser_plugin_embedder_.get(); 3542 return browser_plugin_embedder_.get();
3543 } 3543 }
3544 3544
3545 } // namespace content 3545 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698