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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Fix Android compile. Created 3 years, 8 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
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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool has_scrolled_by_touch) override {} 93 bool has_scrolled_by_touch) override {}
94 void RequestNewCompositorFrameSink() override; 94 void RequestNewCompositorFrameSink() override;
95 void DidInitializeCompositorFrameSink() override; 95 void DidInitializeCompositorFrameSink() override;
96 void DidFailToInitializeCompositorFrameSink() override; 96 void DidFailToInitializeCompositorFrameSink() override;
97 void WillCommit() override {} 97 void WillCommit() override {}
98 void DidCommit() override; 98 void DidCommit() override;
99 void DidCommitAndDrawFrame() override {} 99 void DidCommitAndDrawFrame() override {}
100 void DidReceiveCompositorFrameAck() override; 100 void DidReceiveCompositorFrameAck() override;
101 void DidCompletePageScaleAnimation() override {} 101 void DidCompletePageScaleAnimation() override {}
102 102
103 bool IsForSubframe() override;
104
103 // LayerTreeHostSingleThreadClient implementation. 105 // LayerTreeHostSingleThreadClient implementation.
104 void DidSubmitCompositorFrame() override; 106 void DidSubmitCompositorFrame() override;
105 void DidLoseCompositorFrameSink() override; 107 void DidLoseCompositorFrameSink() override;
106 108
107 // WindowAndroidCompositor implementation. 109 // WindowAndroidCompositor implementation.
108 void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override; 110 void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override;
109 void RequestCopyOfOutputOnRootLayer( 111 void RequestCopyOfOutputOnRootLayer(
110 std::unique_ptr<cc::CopyOutputRequest> request) override; 112 std::unique_ptr<cc::CopyOutputRequest> request) override;
111 void SetNeedsAnimate() override; 113 void SetNeedsAnimate() override;
112 cc::FrameSinkId GetFrameSinkId() override; 114 cc::FrameSinkId GetFrameSinkId() override;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> 183 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash>
182 pending_child_frame_sink_ids_; 184 pending_child_frame_sink_ids_;
183 base::WeakPtrFactory<CompositorImpl> weak_factory_; 185 base::WeakPtrFactory<CompositorImpl> weak_factory_;
184 186
185 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 187 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
186 }; 188 };
187 189
188 } // namespace content 190 } // namespace content
189 191
190 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 192 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698