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

Side by Side Diff: cc/layer_tree_host_impl.h

Issue 12090014: Add a bit to not bubble scrolls to parent scrolling layers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added test and using scrollType instead of bool Created 7 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 | Annotate | Revision Log
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 #ifndef CC_LAYER_TREE_HOST_IMPL_H_ 5 #ifndef CC_LAYER_TREE_HOST_IMPL_H_
6 #define CC_LAYER_TREE_HOST_IMPL_H_ 6 #define CC_LAYER_TREE_HOST_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 scoped_ptr<LayerTreeImpl> m_activeTree; 320 scoped_ptr<LayerTreeImpl> m_activeTree;
321 321
322 // In impl-side painting mode, tree with possibly incomplete rasterized 322 // In impl-side painting mode, tree with possibly incomplete rasterized
323 // content. May be promoted to active by activatePendingTreeIfNeeded(). 323 // content. May be promoted to active by activatePendingTreeIfNeeded().
324 scoped_ptr<LayerTreeImpl> m_pendingTree; 324 scoped_ptr<LayerTreeImpl> m_pendingTree;
325 325
326 // In impl-side painting mode, inert tree with layers that can be recycled 326 // In impl-side painting mode, inert tree with layers that can be recycled
327 // by the next sync from the main thread. 327 // by the next sync from the main thread.
328 scoped_ptr<LayerTreeImpl> m_recycleTree; 328 scoped_ptr<LayerTreeImpl> m_recycleTree;
329 329
330 bool m_didScrollOnce;
Sami 2013/01/30 19:28:31 At the risk of bikeshedding I think this name is a
jamesr 2013/01/30 19:32:23 Or maybe it's time to move the transient scroll pr
Yusuf 2013/01/30 21:01:02 Done.
331 bool m_shouldBubbleScrolls;
330 bool m_scrollDeltaIsInViewportSpace; 332 bool m_scrollDeltaIsInViewportSpace;
331 LayerTreeSettings m_settings; 333 LayerTreeSettings m_settings;
332 LayerTreeDebugState m_debugState; 334 LayerTreeDebugState m_debugState;
333 gfx::Size m_layoutViewportSize; 335 gfx::Size m_layoutViewportSize;
334 gfx::Size m_deviceViewportSize; 336 gfx::Size m_deviceViewportSize;
335 float m_deviceScaleFactor; 337 float m_deviceScaleFactor;
336 bool m_visible; 338 bool m_visible;
337 ManagedMemoryPolicy m_managedMemoryPolicy; 339 ManagedMemoryPolicy m_managedMemoryPolicy;
338 340
339 bool m_pinchGestureActive; 341 bool m_pinchGestureActive;
(...skipping 24 matching lines...) Expand all
364 size_t m_lastSentMemoryUseBytes; 366 size_t m_lastSentMemoryUseBytes;
365 367
366 scoped_ptr<AnimationRegistrar> m_animationRegistrar; 368 scoped_ptr<AnimationRegistrar> m_animationRegistrar;
367 369
368 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 370 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
369 }; 371 };
370 372
371 } // namespace cc 373 } // namespace cc
372 374
373 #endif // CC_LAYER_TREE_HOST_IMPL_H_ 375 #endif // CC_LAYER_TREE_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « cc/input_handler.h ('k') | cc/layer_tree_host_impl.cc » ('j') | cc/layer_tree_host_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698