| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 | 440 |
| 441 void RenderWidgetCompositor::UpdateTopControlsState( | 441 void RenderWidgetCompositor::UpdateTopControlsState( |
| 442 cc::TopControlsState constraints, | 442 cc::TopControlsState constraints, |
| 443 cc::TopControlsState current, | 443 cc::TopControlsState current, |
| 444 bool animate) { | 444 bool animate) { |
| 445 layer_tree_host_->UpdateTopControlsState(constraints, | 445 layer_tree_host_->UpdateTopControlsState(constraints, |
| 446 current, | 446 current, |
| 447 animate); | 447 animate); |
| 448 } | 448 } |
| 449 | 449 |
| 450 void RenderWidgetCompositor::SetTopControlsLayoutHeight( | |
| 451 float top_controls_layout_height) { | |
| 452 layer_tree_host_->SetTopControlsLayoutHeight(top_controls_layout_height); | |
| 453 } | |
| 454 | |
| 455 void RenderWidgetCompositor::SetNeedsRedrawRect(gfx::Rect damage_rect) { | 450 void RenderWidgetCompositor::SetNeedsRedrawRect(gfx::Rect damage_rect) { |
| 456 layer_tree_host_->SetNeedsRedrawRect(damage_rect); | 451 layer_tree_host_->SetNeedsRedrawRect(damage_rect); |
| 457 } | 452 } |
| 458 | 453 |
| 459 void RenderWidgetCompositor::SetNeedsForcedRedraw() { | 454 void RenderWidgetCompositor::SetNeedsForcedRedraw() { |
| 460 layer_tree_host_->SetNextCommitForcesRedraw(); | 455 layer_tree_host_->SetNextCommitForcesRedraw(); |
| 461 setNeedsAnimate(); | 456 setNeedsAnimate(); |
| 462 } | 457 } |
| 463 | 458 |
| 464 scoped_ptr<cc::SwapPromiseMonitor> | 459 scoped_ptr<cc::SwapPromiseMonitor> |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 } | 728 } |
| 734 | 729 |
| 735 void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) { | 730 void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) { |
| 736 cc::LayerTreeDebugState debug_state = layer_tree_host_->debug_state(); | 731 cc::LayerTreeDebugState debug_state = layer_tree_host_->debug_state(); |
| 737 debug_state.show_touch_event_handler_rects = show; | 732 debug_state.show_touch_event_handler_rects = show; |
| 738 debug_state.show_wheel_event_handler_rects = show; | 733 debug_state.show_wheel_event_handler_rects = show; |
| 739 debug_state.show_non_fast_scrollable_rects = show; | 734 debug_state.show_non_fast_scrollable_rects = show; |
| 740 layer_tree_host_->SetDebugState(debug_state); | 735 layer_tree_host_->SetDebugState(debug_state); |
| 741 } | 736 } |
| 742 | 737 |
| 738 void RenderWidgetCompositor::setTopControlsContentOffset(int offset) { |
| 739 layer_tree_host_->SetTopControlsContentOffset(offset); |
| 740 } |
| 741 |
| 743 void RenderWidgetCompositor::WillBeginMainFrame(int frame_id) { | 742 void RenderWidgetCompositor::WillBeginMainFrame(int frame_id) { |
| 744 widget_->InstrumentWillBeginFrame(frame_id); | 743 widget_->InstrumentWillBeginFrame(frame_id); |
| 745 widget_->willBeginCompositorFrame(); | 744 widget_->willBeginCompositorFrame(); |
| 746 } | 745 } |
| 747 | 746 |
| 748 void RenderWidgetCompositor::DidBeginMainFrame() { | 747 void RenderWidgetCompositor::DidBeginMainFrame() { |
| 749 widget_->InstrumentDidBeginFrame(); | 748 widget_->InstrumentDidBeginFrame(); |
| 750 } | 749 } |
| 751 | 750 |
| 752 void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) { | 751 void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) { |
| 753 double frame_time = (args.frame_time - base::TimeTicks()).InSecondsF(); | 752 double frame_time = (args.frame_time - base::TimeTicks()).InSecondsF(); |
| 754 WebBeginFrameArgs web_begin_frame_args = WebBeginFrameArgs(frame_time); | 753 WebBeginFrameArgs web_begin_frame_args = WebBeginFrameArgs(frame_time); |
| 755 widget_->webwidget()->beginFrame(web_begin_frame_args); | 754 widget_->webwidget()->beginFrame(web_begin_frame_args); |
| 756 } | 755 } |
| 757 | 756 |
| 758 void RenderWidgetCompositor::Layout() { | 757 void RenderWidgetCompositor::Layout() { |
| 759 widget_->webwidget()->layout(); | 758 widget_->webwidget()->layout(); |
| 760 } | 759 } |
| 761 | 760 |
| 761 void RenderWidgetCompositor::SetTopControlsContentOffset(int offset) { |
| 762 widget_->webwidget()->setTopControlsContentOffset(offset); |
| 763 } |
| 764 |
| 762 void RenderWidgetCompositor::ApplyScrollAndScale( | 765 void RenderWidgetCompositor::ApplyScrollAndScale( |
| 763 const gfx::Vector2d& scroll_delta, | 766 const gfx::Vector2d& scroll_delta, |
| 764 float page_scale) { | 767 float page_scale) { |
| 765 widget_->webwidget()->applyScrollAndScale(scroll_delta, page_scale); | 768 widget_->webwidget()->applyScrollAndScale(scroll_delta, page_scale); |
| 766 } | 769 } |
| 767 | 770 |
| 768 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface( | 771 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface( |
| 769 bool fallback) { | 772 bool fallback) { |
| 770 return widget_->CreateOutputSurface(fallback); | 773 return widget_->CreateOutputSurface(fallback); |
| 771 } | 774 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 widget_->OnSwapBuffersAborted(); | 807 widget_->OnSwapBuffersAborted(); |
| 805 } | 808 } |
| 806 | 809 |
| 807 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 810 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
| 808 cc::ContextProvider* provider = | 811 cc::ContextProvider* provider = |
| 809 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); | 812 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); |
| 810 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 813 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
| 811 } | 814 } |
| 812 | 815 |
| 813 } // namespace content | 816 } // namespace content |
| OLD | NEW |