| 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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 2459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2470 params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor); | 2470 params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor); |
| 2471 params.browser_controls_shrink_blink_size = false; | 2471 params.browser_controls_shrink_blink_size = false; |
| 2472 params.top_controls_height = 0.f; | 2472 params.top_controls_height = 0.f; |
| 2473 params.is_fullscreen_granted = is_fullscreen_granted(); | 2473 params.is_fullscreen_granted = is_fullscreen_granted(); |
| 2474 params.display_mode = display_mode_; | 2474 params.display_mode = display_mode_; |
| 2475 OnResize(params); | 2475 OnResize(params); |
| 2476 } | 2476 } |
| 2477 | 2477 |
| 2478 void RenderViewImpl::SetDeviceColorProfileForTesting( | 2478 void RenderViewImpl::SetDeviceColorProfileForTesting( |
| 2479 const gfx::ICCProfile& icc_profile) { | 2479 const gfx::ICCProfile& icc_profile) { |
| 2480 // TODO(ccameron): Remove this call when color correct rendering is the | |
| 2481 // default. | |
| 2482 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 2483 switches::kEnableColorCorrectRendering)) { | |
| 2484 return; | |
| 2485 } | |
| 2486 | |
| 2487 if (webview()) | |
| 2488 webview()->SetDeviceColorProfile(icc_profile); | |
| 2489 | |
| 2490 ResizeParams params; | 2480 ResizeParams params; |
| 2491 params.screen_info = screen_info_; | 2481 params.screen_info = screen_info_; |
| 2492 params.screen_info.icc_profile = icc_profile; | 2482 params.screen_info.icc_profile = icc_profile; |
| 2493 params.new_size = size(); | 2483 params.new_size = size(); |
| 2494 params.visible_viewport_size = visible_viewport_size_; | 2484 params.visible_viewport_size = visible_viewport_size_; |
| 2495 params.physical_backing_size = physical_backing_size_; | 2485 params.physical_backing_size = physical_backing_size_; |
| 2496 params.browser_controls_shrink_blink_size = false; | 2486 params.browser_controls_shrink_blink_size = false; |
| 2497 params.top_controls_height = 0.f; | 2487 params.top_controls_height = 0.f; |
| 2498 params.is_fullscreen_granted = is_fullscreen_granted(); | 2488 params.is_fullscreen_granted = is_fullscreen_granted(); |
| 2499 params.display_mode = display_mode_; | 2489 params.display_mode = display_mode_; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2576 input_event.GetCoalescedEventsPointers(), latency_info, | 2566 input_event.GetCoalescedEventsPointers(), latency_info, |
| 2577 dispatch_type); | 2567 dispatch_type); |
| 2578 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 2568 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 2579 } | 2569 } |
| 2580 idle_user_detector_->ActivityDetected(); | 2570 idle_user_detector_->ActivityDetected(); |
| 2581 return RenderWidget::HandleInputEvent(input_event, latency_info, | 2571 return RenderWidget::HandleInputEvent(input_event, latency_info, |
| 2582 dispatch_type); | 2572 dispatch_type); |
| 2583 } | 2573 } |
| 2584 | 2574 |
| 2585 } // namespace content | 2575 } // namespace content |
| OLD | NEW |