| 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); | 515 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); |
| 516 | 516 |
| 517 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); | 517 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); |
| 518 | 518 |
| 519 if (delegate_ && delegate_->IsOverridingUserAgent()) | 519 if (delegate_ && delegate_->IsOverridingUserAgent()) |
| 520 prefs.viewport_meta_enabled = false; | 520 prefs.viewport_meta_enabled = false; |
| 521 | 521 |
| 522 prefs.main_frame_resizes_are_orientation_changes = | 522 prefs.main_frame_resizes_are_orientation_changes = |
| 523 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); | 523 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); |
| 524 | 524 |
| 525 prefs.color_canvas_extensions_enabled = |
| 526 command_line.HasSwitch(switches::kEnableColorCanvasExtensions); |
| 527 |
| 525 prefs.color_correct_rendering_enabled = | 528 prefs.color_correct_rendering_enabled = |
| 526 command_line.HasSwitch(switches::kEnableColorCorrectRendering); | 529 command_line.HasSwitch(switches::kEnableColorCorrectRendering); |
| 527 | 530 |
| 528 prefs.color_correct_rendering_default_mode_enabled = | |
| 529 command_line.HasSwitch( | |
| 530 switches::kEnableColorCorrectRenderingDefaultMode); | |
| 531 | |
| 532 prefs.spatial_navigation_enabled = command_line.HasSwitch( | 531 prefs.spatial_navigation_enabled = command_line.HasSwitch( |
| 533 switches::kEnableSpatialNavigation); | 532 switches::kEnableSpatialNavigation); |
| 534 | 533 |
| 535 prefs.disable_reading_from_canvas = command_line.HasSwitch( | 534 prefs.disable_reading_from_canvas = command_line.HasSwitch( |
| 536 switches::kDisableReadingFromCanvas); | 535 switches::kDisableReadingFromCanvas); |
| 537 | 536 |
| 538 prefs.strict_mixed_content_checking = command_line.HasSwitch( | 537 prefs.strict_mixed_content_checking = command_line.HasSwitch( |
| 539 switches::kEnableStrictMixedContentChecking); | 538 switches::kEnableStrictMixedContentChecking); |
| 540 | 539 |
| 541 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( | 540 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 963 } | 962 } |
| 964 | 963 |
| 965 void RenderViewHostImpl::ClosePageTimeout() { | 964 void RenderViewHostImpl::ClosePageTimeout() { |
| 966 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) | 965 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) |
| 967 return; | 966 return; |
| 968 | 967 |
| 969 ClosePageIgnoringUnloadEvents(); | 968 ClosePageIgnoringUnloadEvents(); |
| 970 } | 969 } |
| 971 | 970 |
| 972 } // namespace content | 971 } // namespace content |
| OLD | NEW |