Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 910373002: [Android] Disable pull-to-refresh with overflow:hidden (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/output/compositor_frame_metadata.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 if (top_controls_manager_) { 1460 if (top_controls_manager_) {
1461 metadata.location_bar_offset = 1461 metadata.location_bar_offset =
1462 gfx::Vector2dF(0.f, top_controls_manager_->ControlsTopOffset()); 1462 gfx::Vector2dF(0.f, top_controls_manager_->ControlsTopOffset());
1463 metadata.location_bar_content_translation = 1463 metadata.location_bar_content_translation =
1464 gfx::Vector2dF(0.f, top_controls_manager_->ContentTopOffset()); 1464 gfx::Vector2dF(0.f, top_controls_manager_->ContentTopOffset());
1465 } 1465 }
1466 1466
1467 active_tree_->GetViewportSelection(&metadata.selection_start, 1467 active_tree_->GetViewportSelection(&metadata.selection_start,
1468 &metadata.selection_end); 1468 &metadata.selection_end);
1469 1469
1470 LayerImpl* root_layer_for_overflow = OuterViewportScrollLayer()
1471 ? OuterViewportScrollLayer()
1472 : InnerViewportScrollLayer();
1473 if (root_layer_for_overflow) {
1474 metadata.root_overflow_x_hidden =
1475 !root_layer_for_overflow->user_scrollable_horizontal();
1476 metadata.root_overflow_y_hidden =
1477 !root_layer_for_overflow->user_scrollable_vertical();
1478 }
1479
1470 if (!InnerViewportScrollLayer()) 1480 if (!InnerViewportScrollLayer())
1471 return metadata; 1481 return metadata;
1472 1482
1473 // TODO(miletus) : Change the metadata to hold ScrollOffset. 1483 // TODO(miletus) : Change the metadata to hold ScrollOffset.
1474 metadata.root_scroll_offset = gfx::ScrollOffsetToVector2dF( 1484 metadata.root_scroll_offset = gfx::ScrollOffsetToVector2dF(
1475 active_tree_->TotalScrollOffset()); 1485 active_tree_->TotalScrollOffset());
1476 1486
1477 return metadata; 1487 return metadata;
1478 } 1488 }
1479 1489
(...skipping 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after
3506 (*it)->OnSetNeedsRedrawOnImpl(); 3516 (*it)->OnSetNeedsRedrawOnImpl();
3507 } 3517 }
3508 3518
3509 void LayerTreeHostImpl::NotifySwapPromiseMonitorsOfForwardingToMainThread() { 3519 void LayerTreeHostImpl::NotifySwapPromiseMonitorsOfForwardingToMainThread() {
3510 std::set<SwapPromiseMonitor*>::iterator it = swap_promise_monitor_.begin(); 3520 std::set<SwapPromiseMonitor*>::iterator it = swap_promise_monitor_.begin();
3511 for (; it != swap_promise_monitor_.end(); it++) 3521 for (; it != swap_promise_monitor_.end(); it++)
3512 (*it)->OnForwardScrollUpdateToMainThreadOnImpl(); 3522 (*it)->OnForwardScrollUpdateToMainThreadOnImpl();
3513 } 3523 }
3514 3524
3515 } // namespace cc 3525 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/compositor_frame_metadata.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698