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 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 if (temporary_copy_output_request_) { | 810 if (temporary_copy_output_request_) { |
811 DCHECK(layer_tree_host_->root_layer()); | 811 DCHECK(layer_tree_host_->root_layer()); |
812 layer_tree_host_->root_layer()->RequestCopyOfOutput( | 812 layer_tree_host_->root_layer()->RequestCopyOfOutput( |
813 temporary_copy_output_request_.Pass()); | 813 temporary_copy_output_request_.Pass()); |
814 } | 814 } |
815 } | 815 } |
816 | 816 |
817 void RenderWidgetCompositor::ApplyViewportDeltas( | 817 void RenderWidgetCompositor::ApplyViewportDeltas( |
818 const gfx::Vector2d& inner_delta, | 818 const gfx::Vector2d& inner_delta, |
819 const gfx::Vector2d& outer_delta, | 819 const gfx::Vector2d& outer_delta, |
| 820 const gfx::Vector2dF& elastic_overscroll_delta, |
820 float page_scale, | 821 float page_scale, |
821 float top_controls_delta) { | 822 float top_controls_delta) { |
822 widget_->webwidget()->applyViewportDeltas( | 823 widget_->webwidget()->applyViewportDeltas( |
823 inner_delta, | 824 inner_delta, |
824 outer_delta, | 825 outer_delta, |
| 826 elastic_overscroll_delta, |
825 page_scale, | 827 page_scale, |
826 top_controls_delta); | 828 top_controls_delta); |
827 } | 829 } |
828 | 830 |
829 void RenderWidgetCompositor::ApplyViewportDeltas( | 831 void RenderWidgetCompositor::ApplyViewportDeltas( |
830 const gfx::Vector2d& scroll_delta, | 832 const gfx::Vector2d& scroll_delta, |
831 float page_scale, | 833 float page_scale, |
832 float top_controls_delta) { | 834 float top_controls_delta) { |
833 widget_->webwidget()->applyViewportDeltas( | 835 widget_->webwidget()->applyViewportDeltas( |
834 scroll_delta, | 836 scroll_delta, |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 widget_->OnSwapBuffersAborted(); | 893 widget_->OnSwapBuffersAborted(); |
892 } | 894 } |
893 | 895 |
894 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 896 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
895 cc::ContextProvider* provider = | 897 cc::ContextProvider* provider = |
896 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); | 898 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); |
897 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 899 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
898 } | 900 } |
899 | 901 |
900 } // namespace content | 902 } // namespace content |
OLD | NEW |