OLD | NEW |
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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); | 385 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); |
386 prefs.allow_file_access_from_file_urls = | 386 prefs.allow_file_access_from_file_urls = |
387 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); | 387 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); |
388 | 388 |
389 prefs.layer_squashing_enabled = true; | 389 prefs.layer_squashing_enabled = true; |
390 if (command_line.HasSwitch(switches::kEnableLayerSquashing)) | 390 if (command_line.HasSwitch(switches::kEnableLayerSquashing)) |
391 prefs.layer_squashing_enabled = true; | 391 prefs.layer_squashing_enabled = true; |
392 if (command_line.HasSwitch(switches::kDisableLayerSquashing)) | 392 if (command_line.HasSwitch(switches::kDisableLayerSquashing)) |
393 prefs.layer_squashing_enabled = false; | 393 prefs.layer_squashing_enabled = false; |
394 | 394 |
| 395 prefs.display_list_2d_canvas_enabled = |
| 396 command_line.HasSwitch(switches::kEnableDisplayList2dCanvas); |
395 prefs.accelerated_2d_canvas_enabled = | 397 prefs.accelerated_2d_canvas_enabled = |
396 GpuProcessHost::gpu_enabled() && | 398 GpuProcessHost::gpu_enabled() && |
397 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); | 399 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); |
398 prefs.antialiased_2d_canvas_disabled = | 400 prefs.antialiased_2d_canvas_disabled = |
399 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); | 401 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); |
400 prefs.accelerated_2d_canvas_msaa_sample_count = | 402 prefs.accelerated_2d_canvas_msaa_sample_count = |
401 atoi(command_line.GetSwitchValueASCII( | 403 atoi(command_line.GetSwitchValueASCII( |
402 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); | 404 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); |
403 prefs.deferred_filters_enabled = | 405 prefs.deferred_filters_enabled = |
404 !command_line.HasSwitch(switches::kDisableDeferredFilters); | 406 !command_line.HasSwitch(switches::kDisableDeferredFilters); |
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1582 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1584 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1583 | 1585 |
1584 frame_tree->ResetForMainFrameSwap(); | 1586 frame_tree->ResetForMainFrameSwap(); |
1585 } | 1587 } |
1586 | 1588 |
1587 void RenderViewHostImpl::SelectWordAroundCaret() { | 1589 void RenderViewHostImpl::SelectWordAroundCaret() { |
1588 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1590 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1589 } | 1591 } |
1590 | 1592 |
1591 } // namespace content | 1593 } // namespace content |
OLD | NEW |