| 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 "android_webview/browser/browser_view_renderer_client.h" | 7 #include "android_webview/browser/browser_view_renderer_client.h" |
| 8 #include "base/auto_reset.h" | 8 #include "base/auto_reset.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 DCHECK_GT(page_scale_factor_, 0.f); | 561 DCHECK_GT(page_scale_factor_, 0.f); |
| 562 | 562 |
| 563 client_->UpdateScrollState(max_scroll_offset(), | 563 client_->UpdateScrollState(max_scroll_offset(), |
| 564 scrollable_size_dip, | 564 scrollable_size_dip, |
| 565 page_scale_factor, | 565 page_scale_factor, |
| 566 min_page_scale_factor, | 566 min_page_scale_factor, |
| 567 max_page_scale_factor); | 567 max_page_scale_factor); |
| 568 SetTotalRootLayerScrollOffset(total_scroll_offset_dip); | 568 SetTotalRootLayerScrollOffset(total_scroll_offset_dip); |
| 569 } | 569 } |
| 570 | 570 |
| 571 scoped_refptr<base::debug::ConvertableToTraceFormat> | 571 scoped_refptr<base::trace_event::ConvertableToTraceFormat> |
| 572 BrowserViewRenderer::RootLayerStateAsValue( | 572 BrowserViewRenderer::RootLayerStateAsValue( |
| 573 const gfx::Vector2dF& total_scroll_offset_dip, | 573 const gfx::Vector2dF& total_scroll_offset_dip, |
| 574 const gfx::SizeF& scrollable_size_dip) { | 574 const gfx::SizeF& scrollable_size_dip) { |
| 575 scoped_refptr<base::debug::TracedValue> state = | 575 scoped_refptr<base::trace_event::TracedValue> state = |
| 576 new base::debug::TracedValue(); | 576 new base::trace_event::TracedValue(); |
| 577 | 577 |
| 578 state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x()); | 578 state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x()); |
| 579 state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y()); | 579 state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y()); |
| 580 | 580 |
| 581 state->SetDouble("max_scroll_offset_dip.x", max_scroll_offset_dip_.x()); | 581 state->SetDouble("max_scroll_offset_dip.x", max_scroll_offset_dip_.x()); |
| 582 state->SetDouble("max_scroll_offset_dip.y", max_scroll_offset_dip_.y()); | 582 state->SetDouble("max_scroll_offset_dip.y", max_scroll_offset_dip_.y()); |
| 583 | 583 |
| 584 state->SetDouble("scrollable_size_dip.width", scrollable_size_dip.width()); | 584 state->SetDouble("scrollable_size_dip.width", scrollable_size_dip.width()); |
| 585 state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height()); | 585 state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height()); |
| 586 | 586 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 base::StringAppendF(&str, | 746 base::StringAppendF(&str, |
| 747 "overscroll_rounding_error_: %s ", | 747 "overscroll_rounding_error_: %s ", |
| 748 overscroll_rounding_error_.ToString().c_str()); | 748 overscroll_rounding_error_.ToString().c_str()); |
| 749 base::StringAppendF( | 749 base::StringAppendF( |
| 750 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); | 750 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); |
| 751 base::StringAppendF(&str, "clear_view: %d ", clear_view_); | 751 base::StringAppendF(&str, "clear_view: %d ", clear_view_); |
| 752 return str; | 752 return str; |
| 753 } | 753 } |
| 754 | 754 |
| 755 } // namespace android_webview | 755 } // namespace android_webview |
| OLD | NEW |