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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1174183003: [SP] Enable Slimming Paint by default in Chromium and Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge changes. Created 5 years, 6 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
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/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 461
462 #if defined(OS_ANDROID) 462 #if defined(OS_ANDROID)
463 prefs.device_supports_mouse = false; 463 prefs.device_supports_mouse = false;
464 #endif 464 #endif
465 465
466 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); 466 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints();
467 467
468 prefs.touch_adjustment_enabled = 468 prefs.touch_adjustment_enabled =
469 !command_line.HasSwitch(switches::kDisableTouchAdjustment); 469 !command_line.HasSwitch(switches::kDisableTouchAdjustment);
470 470
471 prefs.slimming_paint_enabled = 471 prefs.slimming_paint_enabled = command_line.HasSwitch(
472 command_line.HasSwitch(switches::kEnableSlimmingPaint); 472 switches::kEnableSlimmingPaint) ||
473 !command_line.HasSwitch(switches::kDisableSlimmingPaint);
473 474
474 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) 475 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
475 bool default_enable_scroll_animator = true; 476 bool default_enable_scroll_animator = true;
476 #else 477 #else
477 bool default_enable_scroll_animator = false; 478 bool default_enable_scroll_animator = false;
478 #endif 479 #endif
479 prefs.enable_scroll_animator = default_enable_scroll_animator; 480 prefs.enable_scroll_animator = default_enable_scroll_animator;
480 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) 481 if (command_line.HasSwitch(switches::kEnableSmoothScrolling))
481 prefs.enable_scroll_animator = true; 482 prefs.enable_scroll_animator = true;
482 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) 483 if (command_line.HasSwitch(switches::kDisableSmoothScrolling))
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 if (!policy->CanReadFile(GetProcess()->GetID(), file)) 1429 if (!policy->CanReadFile(GetProcess()->GetID(), file))
1429 policy->GrantReadFile(GetProcess()->GetID(), file); 1430 policy->GrantReadFile(GetProcess()->GetID(), file);
1430 } 1431 }
1431 } 1432 }
1432 1433
1433 void RenderViewHostImpl::SelectWordAroundCaret() { 1434 void RenderViewHostImpl::SelectWordAroundCaret() {
1434 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1435 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1435 } 1436 }
1436 1437
1437 } // namespace content 1438 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698