| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 5fb4b6d11253ec983dada5606dcd9f5d31910467..ae3892ba822897c480d21a0afc87bced8cd43e68 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -414,7 +414,7 @@ bool LayerTreeHostImpl::CanDraw() const {
|
| if (resourceless_software_draw_)
|
| return true;
|
|
|
| - if (DrawViewportSize().IsEmpty()) {
|
| + if (DeviceViewport().IsEmpty()) {
|
| TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::CanDraw empty viewport",
|
| TRACE_EVENT_SCOPE_THREAD);
|
| return false;
|
| @@ -2496,17 +2496,6 @@ void LayerTreeHostImpl::SetViewportSize(const gfx::Size& device_viewport_size) {
|
| active_tree_->set_needs_update_draw_properties();
|
| }
|
|
|
| -const gfx::Rect LayerTreeHostImpl::ViewportRectForTilePriority() const {
|
| - if (viewport_rect_for_tile_priority_.IsEmpty())
|
| - return DeviceViewport();
|
| -
|
| - return viewport_rect_for_tile_priority_;
|
| -}
|
| -
|
| -gfx::Size LayerTreeHostImpl::DrawViewportSize() const {
|
| - return DeviceViewport().size();
|
| -}
|
| -
|
| gfx::Rect LayerTreeHostImpl::DeviceViewport() const {
|
| if (external_viewport_.IsEmpty())
|
| return gfx::Rect(device_viewport_size_);
|
| @@ -2514,6 +2503,13 @@ gfx::Rect LayerTreeHostImpl::DeviceViewport() const {
|
| return external_viewport_;
|
| }
|
|
|
| +const gfx::Rect LayerTreeHostImpl::ViewportRectForTilePriority() const {
|
| + if (viewport_rect_for_tile_priority_.IsEmpty())
|
| + return DeviceViewport();
|
| +
|
| + return viewport_rect_for_tile_priority_;
|
| +}
|
| +
|
| const gfx::Transform& LayerTreeHostImpl::DrawTransform() const {
|
| return external_transform_;
|
| }
|
| @@ -3577,7 +3573,7 @@ std::unique_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
|
| }
|
|
|
| void LayerTreeHostImpl::SetFullViewportDamage() {
|
| - SetViewportDamage(gfx::Rect(DrawViewportSize()));
|
| + SetViewportDamage(gfx::Rect(DeviceViewport().size()));
|
| }
|
|
|
| bool LayerTreeHostImpl::AnimatePageScale(base::TimeTicks monotonic_time) {
|
|
|