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

Side by Side Diff: android_webview/browser/browser_view_renderer.h

Issue 2263043002: android_webview: Let AwContents manage TouchHandleDrawable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use SynchronousCompositorClient Created 4 years, 3 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
6 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 6 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 12
13 #include "android_webview/browser/compositor_frame_producer.h" 13 #include "android_webview/browser/compositor_frame_producer.h"
14 #include "android_webview/browser/compositor_id.h" 14 #include "android_webview/browser/compositor_id.h"
15 #include "android_webview/browser/parent_compositor_draw_constraints.h" 15 #include "android_webview/browser/parent_compositor_draw_constraints.h"
16 #include "base/callback.h" 16 #include "base/callback.h"
17 #include "base/cancelable_callback.h" 17 #include "base/cancelable_callback.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/trace_event/trace_event.h" 19 #include "base/trace_event/trace_event.h"
20 #include "content/public/browser/android/synchronous_compositor.h" 20 #include "content/public/browser/android/synchronous_compositor.h"
21 #include "content/public/browser/android/synchronous_compositor_client.h" 21 #include "content/public/browser/android/synchronous_compositor_client.h"
22 #include "third_party/skia/include/core/SkRefCnt.h" 22 #include "third_party/skia/include/core/SkRefCnt.h"
23 #include "ui/gfx/geometry/rect.h" 23 #include "ui/gfx/geometry/rect.h"
24 #include "ui/gfx/geometry/size_f.h" 24 #include "ui/gfx/geometry/size_f.h"
25 #include "ui/gfx/geometry/vector2d_f.h" 25 #include "ui/gfx/geometry/vector2d_f.h"
26 #include "ui/touch_selection/touch_handle.h"
boliu 2016/08/24 23:35:30 include should not be needed in header, since it m
Jinsuk Kim 2016/08/25 07:32:21 Done.
26 27
27 class SkCanvas; 28 class SkCanvas;
28 class SkPicture; 29 class SkPicture;
29 30
30 namespace content { 31 namespace content {
31 class RenderViewHost; 32 class RenderViewHost;
32 class WebContents; 33 class WebContents;
33 } 34 }
34 35
35 namespace android_webview { 36 namespace android_webview {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 const gfx::Vector2dF& total_scroll_offset_dip, 123 const gfx::Vector2dF& total_scroll_offset_dip,
123 const gfx::Vector2dF& max_scroll_offset_dip, 124 const gfx::Vector2dF& max_scroll_offset_dip,
124 const gfx::SizeF& scrollable_size_dip, 125 const gfx::SizeF& scrollable_size_dip,
125 float page_scale_factor, 126 float page_scale_factor,
126 float min_page_scale_factor, 127 float min_page_scale_factor,
127 float max_page_scale_factor) override; 128 float max_page_scale_factor) override;
128 void DidOverscroll(content::SynchronousCompositor* compositor, 129 void DidOverscroll(content::SynchronousCompositor* compositor,
129 const gfx::Vector2dF& accumulated_overscroll, 130 const gfx::Vector2dF& accumulated_overscroll,
130 const gfx::Vector2dF& latest_overscroll_delta, 131 const gfx::Vector2dF& latest_overscroll_delta,
131 const gfx::Vector2dF& current_fling_velocity) override; 132 const gfx::Vector2dF& current_fling_velocity) override;
133 ui::TouchHandleDrawable* CreateDrawable() override;
132 134
133 // CompositorFrameProducer overrides 135 // CompositorFrameProducer overrides
134 void OnParentDrawConstraintsUpdated( 136 void OnParentDrawConstraintsUpdated(
135 CompositorFrameConsumer* compositor_frame_consumer) override; 137 CompositorFrameConsumer* compositor_frame_consumer) override;
136 void RemoveCompositorFrameConsumer( 138 void RemoveCompositorFrameConsumer(
137 CompositorFrameConsumer* compositor_frame_consumer) override; 139 CompositorFrameConsumer* compositor_frame_consumer) override;
138 140
139 void SetActiveCompositorID(const CompositorID& compositor_id); 141 void SetActiveCompositorID(const CompositorID& compositor_id);
140 142
141 // Visible for testing. 143 // Visible for testing.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 gfx::Vector2dF overscroll_rounding_error_; 222 gfx::Vector2dF overscroll_rounding_error_;
221 223
222 ParentCompositorDrawConstraints external_draw_constraints_; 224 ParentCompositorDrawConstraints external_draw_constraints_;
223 225
224 DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer); 226 DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
225 }; 227 };
226 228
227 } // namespace android_webview 229 } // namespace android_webview
228 230
229 #endif // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 231 #endif // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698