| 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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 | 457 |
| 458 prefs.allow_file_access_from_file_urls = | 458 prefs.allow_file_access_from_file_urls = |
| 459 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); | 459 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); |
| 460 | 460 |
| 461 prefs.accelerated_2d_canvas_enabled = | 461 prefs.accelerated_2d_canvas_enabled = |
| 462 GpuProcessHost::gpu_enabled() && | 462 GpuProcessHost::gpu_enabled() && |
| 463 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); | 463 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); |
| 464 prefs.antialiased_2d_canvas_disabled = | 464 prefs.antialiased_2d_canvas_disabled = |
| 465 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); | 465 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); |
| 466 prefs.antialiased_clips_2d_canvas_enabled = | 466 prefs.antialiased_clips_2d_canvas_enabled = |
| 467 command_line.HasSwitch(switches::kEnable2dCanvasClipAntialiasing); | 467 !command_line.HasSwitch(switches::kDisable2dCanvasClipAntialiasing); |
| 468 prefs.accelerated_2d_canvas_msaa_sample_count = | 468 prefs.accelerated_2d_canvas_msaa_sample_count = |
| 469 atoi(command_line.GetSwitchValueASCII( | 469 atoi(command_line.GetSwitchValueASCII( |
| 470 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); | 470 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); |
| 471 | 471 |
| 472 prefs.inert_visual_viewport = | 472 prefs.inert_visual_viewport = |
| 473 command_line.HasSwitch(switches::kInertVisualViewport); | 473 command_line.HasSwitch(switches::kInertVisualViewport); |
| 474 | 474 |
| 475 prefs.pinch_overlay_scrollbar_thickness = 10; | 475 prefs.pinch_overlay_scrollbar_thickness = 10; |
| 476 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); | 476 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); |
| 477 | 477 |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 // Note: We are using the origin URL provided by the sender here. It may be | 1321 // Note: We are using the origin URL provided by the sender here. It may be |
| 1322 // different from the receiver's. | 1322 // different from the receiver's. |
| 1323 file_system_file.url = | 1323 file_system_file.url = |
| 1324 GURL(storage::GetIsolatedFileSystemRootURIString( | 1324 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1325 file_system_url.origin(), filesystem_id, std::string()) | 1325 file_system_url.origin(), filesystem_id, std::string()) |
| 1326 .append(register_name)); | 1326 .append(register_name)); |
| 1327 } | 1327 } |
| 1328 } | 1328 } |
| 1329 | 1329 |
| 1330 } // namespace content | 1330 } // namespace content |
| OLD | NEW |