| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "android_webview/browser/browser_view_renderer.h" | 5 #include "android_webview/browser/browser_view_renderer.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/browser_view_renderer_client.h" | 9 #include "android_webview/browser/browser_view_renderer_client.h" |
| 10 #include "android_webview/browser/child_frame.h" | 10 #include "android_webview/browser/child_frame.h" |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 min_page_scale_factor_ = min_page_scale_factor; | 651 min_page_scale_factor_ = min_page_scale_factor; |
| 652 max_page_scale_factor_ = max_page_scale_factor; | 652 max_page_scale_factor_ = max_page_scale_factor; |
| 653 | 653 |
| 654 client_->UpdateScrollState(max_scroll_offset(), scrollable_size_dip, | 654 client_->UpdateScrollState(max_scroll_offset(), scrollable_size_dip, |
| 655 page_scale_factor, min_page_scale_factor, | 655 page_scale_factor, min_page_scale_factor, |
| 656 max_page_scale_factor); | 656 max_page_scale_factor); |
| 657 } | 657 } |
| 658 SetTotalRootLayerScrollOffset(total_scroll_offset_dip); | 658 SetTotalRootLayerScrollOffset(total_scroll_offset_dip); |
| 659 } | 659 } |
| 660 | 660 |
| 661 scoped_refptr<base::trace_event::ConvertableToTraceFormat> | 661 scoped_ptr<base::trace_event::ConvertableToTraceFormat> |
| 662 BrowserViewRenderer::RootLayerStateAsValue( | 662 BrowserViewRenderer::RootLayerStateAsValue( |
| 663 const gfx::Vector2dF& total_scroll_offset_dip, | 663 const gfx::Vector2dF& total_scroll_offset_dip, |
| 664 const gfx::SizeF& scrollable_size_dip) { | 664 const gfx::SizeF& scrollable_size_dip) { |
| 665 scoped_refptr<base::trace_event::TracedValue> state = | 665 scoped_ptr<base::trace_event::TracedValue> state( |
| 666 new base::trace_event::TracedValue(); | 666 new base::trace_event::TracedValue()); |
| 667 | 667 |
| 668 state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x()); | 668 state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x()); |
| 669 state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y()); | 669 state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y()); |
| 670 | 670 |
| 671 state->SetDouble("max_scroll_offset_dip.x", max_scroll_offset_dip_.x()); | 671 state->SetDouble("max_scroll_offset_dip.x", max_scroll_offset_dip_.x()); |
| 672 state->SetDouble("max_scroll_offset_dip.y", max_scroll_offset_dip_.y()); | 672 state->SetDouble("max_scroll_offset_dip.y", max_scroll_offset_dip_.y()); |
| 673 | 673 |
| 674 state->SetDouble("scrollable_size_dip.width", scrollable_size_dip.width()); | 674 state->SetDouble("scrollable_size_dip.width", scrollable_size_dip.width()); |
| 675 state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height()); | 675 state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height()); |
| 676 | 676 |
| 677 state->SetDouble("page_scale_factor", page_scale_factor_); | 677 state->SetDouble("page_scale_factor", page_scale_factor_); |
| 678 return state; | 678 return std::move(state); |
| 679 } | 679 } |
| 680 | 680 |
| 681 void BrowserViewRenderer::DidOverscroll( | 681 void BrowserViewRenderer::DidOverscroll( |
| 682 const gfx::Vector2dF& accumulated_overscroll, | 682 const gfx::Vector2dF& accumulated_overscroll, |
| 683 const gfx::Vector2dF& latest_overscroll_delta, | 683 const gfx::Vector2dF& latest_overscroll_delta, |
| 684 const gfx::Vector2dF& current_fling_velocity) { | 684 const gfx::Vector2dF& current_fling_velocity) { |
| 685 const float physical_pixel_scale = dip_scale_ * page_scale_factor_; | 685 const float physical_pixel_scale = dip_scale_ * page_scale_factor_; |
| 686 if (accumulated_overscroll == latest_overscroll_delta) | 686 if (accumulated_overscroll == latest_overscroll_delta) |
| 687 overscroll_rounding_error_ = gfx::Vector2dF(); | 687 overscroll_rounding_error_ = gfx::Vector2dF(); |
| 688 gfx::Vector2dF scaled_overscroll_delta = | 688 gfx::Vector2dF scaled_overscroll_delta = |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 base::StringAppendF(&str, | 804 base::StringAppendF(&str, |
| 805 "overscroll_rounding_error_: %s ", | 805 "overscroll_rounding_error_: %s ", |
| 806 overscroll_rounding_error_.ToString().c_str()); | 806 overscroll_rounding_error_.ToString().c_str()); |
| 807 base::StringAppendF( | 807 base::StringAppendF( |
| 808 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); | 808 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); |
| 809 base::StringAppendF(&str, "clear_view: %d ", clear_view_); | 809 base::StringAppendF(&str, "clear_view: %d ", clear_view_); |
| 810 return str; | 810 return str; |
| 811 } | 811 } |
| 812 | 812 |
| 813 } // namespace android_webview | 813 } // namespace android_webview |
| OLD | NEW |