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

Side by Side Diff: ui/compositor/compositor.h

Issue 2197503002: Route Scroll events through a cc::InputHandler Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-ScrollWheelAsScrollEvent
Patch Set: Abandon DeliverInputForBeginFrame: will not help fix the header row Created 4 years 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 | « ui/compositor/BUILD.gn ('k') | ui/compositor/compositor.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class GpuMemoryBufferManager; 58 class GpuMemoryBufferManager;
59 } 59 }
60 60
61 namespace ui { 61 namespace ui {
62 62
63 class Compositor; 63 class Compositor;
64 class CompositorVSyncManager; 64 class CompositorVSyncManager;
65 class LatencyInfo; 65 class LatencyInfo;
66 class Layer; 66 class Layer;
67 class Reflector; 67 class Reflector;
68 class UIScrollInputManager;
68 69
69 #if defined(USE_AURA) 70 #if defined(USE_AURA)
70 class Window; 71 class Window;
71 #endif 72 #endif
72 73
73 const int kCompositorLockTimeoutMs = 67; 74 const int kCompositorLockTimeoutMs = 67;
74 75
75 class COMPOSITOR_EXPORT ContextFactoryObserver { 76 class COMPOSITOR_EXPORT ContextFactoryObserver {
76 public: 77 public:
77 virtual ~ContextFactoryObserver() {} 78 virtual ~ContextFactoryObserver() {}
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 const cc::LayerTreeDebugState& GetLayerTreeDebugState() const; 373 const cc::LayerTreeDebugState& GetLayerTreeDebugState() const;
373 void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state); 374 void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state);
374 const cc::RendererSettings& GetRendererSettings() const; 375 const cc::RendererSettings& GetRendererSettings() const;
375 376
376 LayerAnimatorCollection* layer_animator_collection() { 377 LayerAnimatorCollection* layer_animator_collection() {
377 return &layer_animator_collection_; 378 return &layer_animator_collection_;
378 } 379 }
379 380
380 const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; } 381 const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
381 382
383 UIScrollInputManager* scroll_input_manager() {
384 return scroll_input_manager_.get();
385 }
386
382 private: 387 private:
383 friend class base::RefCounted<Compositor>; 388 friend class base::RefCounted<Compositor>;
384 friend class CompositorLock; 389 friend class CompositorLock;
385 390
386 // Called by CompositorLock. 391 // Called by CompositorLock.
387 void UnlockCompositor(); 392 void UnlockCompositor();
388 393
389 // Called to release any pending CompositorLock 394 // Called to release any pending CompositorLock
390 void CancelCompositorLock(); 395 void CancelCompositorLock();
391 396
(...skipping 28 matching lines...) Expand all
420 // layers on. 425 // layers on.
421 float device_scale_factor_; 426 float device_scale_factor_;
422 427
423 bool locks_will_time_out_; 428 bool locks_will_time_out_;
424 CompositorLock* compositor_lock_; 429 CompositorLock* compositor_lock_;
425 430
426 LayerAnimatorCollection layer_animator_collection_; 431 LayerAnimatorCollection layer_animator_collection_;
427 scoped_refptr<cc::AnimationTimeline> animation_timeline_; 432 scoped_refptr<cc::AnimationTimeline> animation_timeline_;
428 433
429 gfx::ColorSpace color_space_; 434 gfx::ColorSpace color_space_;
435 std::unique_ptr<UIScrollInputManager> scroll_input_manager_;
430 436
431 base::WeakPtrFactory<Compositor> weak_ptr_factory_; 437 base::WeakPtrFactory<Compositor> weak_ptr_factory_;
432 438
433 DISALLOW_COPY_AND_ASSIGN(Compositor); 439 DISALLOW_COPY_AND_ASSIGN(Compositor);
434 }; 440 };
435 441
436 } // namespace ui 442 } // namespace ui
437 443
438 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 444 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « ui/compositor/BUILD.gn ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698