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

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: Rebase to master@{#465268}. 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 bool has_scrolled_by_touch) override {} 95 bool has_scrolled_by_touch) override {}
96 void RequestNewCompositorFrameSink() override; 96 void RequestNewCompositorFrameSink() override;
97 void DidInitializeCompositorFrameSink() override; 97 void DidInitializeCompositorFrameSink() override;
98 void DidFailToInitializeCompositorFrameSink() override; 98 void DidFailToInitializeCompositorFrameSink() override;
99 void WillCommit() override {} 99 void WillCommit() override {}
100 void DidCommit() override; 100 void DidCommit() override;
101 void DidCommitAndDrawFrame() override {} 101 void DidCommitAndDrawFrame() override {}
102 void DidReceiveCompositorFrameAck() override; 102 void DidReceiveCompositorFrameAck() override;
103 void DidCompletePageScaleAnimation() override {} 103 void DidCompletePageScaleAnimation() override {}
104 104
105 bool IsForSubframe() override;
Charlie Reis 2017/04/18 21:59:03 nit: No blank line before, since this is part of t
wjmaclean 2017/04/18 23:26:49 Done.
106
105 // LayerTreeHostSingleThreadClient implementation. 107 // LayerTreeHostSingleThreadClient implementation.
106 void DidSubmitCompositorFrame() override; 108 void DidSubmitCompositorFrame() override;
107 void DidLoseCompositorFrameSink() override; 109 void DidLoseCompositorFrameSink() override;
108 110
109 // WindowAndroidCompositor implementation. 111 // WindowAndroidCompositor implementation.
110 void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override; 112 void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override;
111 void RequestCopyOfOutputOnRootLayer( 113 void RequestCopyOfOutputOnRootLayer(
112 std::unique_ptr<cc::CopyOutputRequest> request) override; 114 std::unique_ptr<cc::CopyOutputRequest> request) override;
113 void SetNeedsAnimate() override; 115 void SetNeedsAnimate() override;
114 cc::FrameSinkId GetFrameSinkId() override; 116 cc::FrameSinkId GetFrameSinkId() override;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> 185 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash>
184 pending_child_frame_sink_ids_; 186 pending_child_frame_sink_ids_;
185 base::WeakPtrFactory<CompositorImpl> weak_factory_; 187 base::WeakPtrFactory<CompositorImpl> weak_factory_;
186 188
187 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 189 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
188 }; 190 };
189 191
190 } // namespace content 192 } // namespace content
191 193
192 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 194 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698