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

Side by Side Diff: ui/android/window_android.cc

Issue 2564403002: [android] Make RWHVAndroid a BeginFrameObserver. (Closed)
Patch Set: fix crbug.com/675289 Created 3 years, 12 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "ui/android/window_android.h" 5 #include "ui/android/window_android.h"
6 6
7 #include <unordered_set>
8
7 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 11 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 12 #include "base/android/jni_string.h"
11 #include "base/android/jni_weak_ref.h" 13 #include "base/android/jni_weak_ref.h"
12 #include "base/android/scoped_java_ref.h" 14 #include "base/android/scoped_java_ref.h"
15 #include "base/auto_reset.h"
16 #include "base/observer_list.h"
17 #include "base/stl_util.h"
18 #include "cc/output/begin_frame_args.h"
19 #include "cc/scheduler/begin_frame_source.h"
13 #include "jni/WindowAndroid_jni.h" 20 #include "jni/WindowAndroid_jni.h"
14 #include "ui/android/window_android_compositor.h" 21 #include "ui/android/window_android_compositor.h"
15 #include "ui/android/window_android_observer.h" 22 #include "ui/android/window_android_observer.h"
16 23
17 namespace ui { 24 namespace ui {
18 25
19 using base::android::AttachCurrentThread; 26 using base::android::AttachCurrentThread;
20 using base::android::JavaParamRef; 27 using base::android::JavaParamRef;
21 using base::android::JavaRef; 28 using base::android::JavaRef;
22 using base::android::ScopedJavaLocalRef; 29 using base::android::ScopedJavaLocalRef;
23 30
31 class WindowAndroid::WindowBeginFrameSource : public cc::BeginFrameSource {
32 public:
33 explicit WindowBeginFrameSource(WindowAndroid* window)
34 : window_(window),
35 observer_count_(0),
36 in_on_vsync_(false) {}
37 ~WindowBeginFrameSource() override {}
38
39 // cc::BeginFrameSource implementation.
40 void AddObserver(cc::BeginFrameObserver* obs) override;
41 void RemoveObserver(cc::BeginFrameObserver* obs) override;
42 void DidFinishFrame(cc::BeginFrameObserver* obs,
43 size_t remaining_frames) override {}
44 bool IsThrottled() const override { return true; }
45
46 void OnVSync(base::TimeTicks frame_time,
47 base::TimeDelta vsync_period);
48
49 private:
50 WindowAndroid* const window_;
51 base::ObserverList<cc::BeginFrameObserver> observers_;
52 int observer_count_;
53 cc::BeginFrameArgs last_begin_frame_args_;
54 bool in_on_vsync_;
55 };
56
57 void WindowAndroid::WindowBeginFrameSource::AddObserver(
58 cc::BeginFrameObserver* obs) {
59 DCHECK(obs);
60 DCHECK(!observers_.HasObserver(obs));
61
62 observers_.AddObserver(obs);
63 observer_count_++;
64 obs->OnBeginFrameSourcePausedChanged(false);
65 window_->SetNeedsBeginFrames(true);
66
67 // Send a MISSED BeginFrame if possible and necessary. If an observer is added
68 // during OnVSync(), it will get a NORMAL BeginFrame from OnVSync() instead.
69 if (!in_on_vsync_ && last_begin_frame_args_.IsValid()) {
70 cc::BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
71 if (!last_args.IsValid() ||
72 last_args.frame_time < last_begin_frame_args_.frame_time) {
73 last_begin_frame_args_.type = cc::BeginFrameArgs::MISSED;
74 // TODO(crbug.com/602485): A deadline doesn't make too much sense
75 // for a missed BeginFrame (the intention rather is 'immediately'),
76 // but currently the retro frame logic is very strict in discarding
77 // BeginFrames.
78 last_begin_frame_args_.deadline =
79 base::TimeTicks::Now() + last_begin_frame_args_.interval;
80 obs->OnBeginFrame(last_begin_frame_args_);
81 }
82 }
83 }
84
85 void WindowAndroid::WindowBeginFrameSource::RemoveObserver(
86 cc::BeginFrameObserver* obs) {
87 DCHECK(obs);
88 DCHECK(observers_.HasObserver(obs));
89
90 observers_.RemoveObserver(obs);
91 observer_count_--;
92 if (observer_count_ <= 0)
93 window_->SetNeedsBeginFrames(false);
94 }
95
96 void WindowAndroid::WindowBeginFrameSource::OnVSync(
97 base::TimeTicks frame_time,
98 base::TimeDelta vsync_period) {
99 // frame time is in the past, so give the next vsync period as the deadline.
100 base::TimeTicks deadline = frame_time + vsync_period;
101 last_begin_frame_args_ =
102 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline,
103 vsync_period, cc::BeginFrameArgs::NORMAL);
104 DCHECK(last_begin_frame_args_.IsValid());
105
106 // We support adding/removing observers during observer iteration through
107 // base::ObserverList. We also prevent observers that are added during
108 // observer iteration from receiving a MISSED BeginFrame by means of
109 // |in_on_vsync_| - they will receive the current NORMAL one during the
110 // iteration instead. Note that SynchronousCompositorBrowserFilter relies on
111 // this behavior.
112 base::AutoReset<bool> auto_reset(&in_on_vsync_, true);
113 std::unordered_set<cc::BeginFrameObserver*> notified_observers;
114 for (auto& obs : observers_) {
115 // An observer may remove and add itself during a single OnBeginFrame, in
116 // which case it'd appear twice during the iteration. To deal with this, we
117 // keep track of whether we already notified it.
118 if (!base::ContainsKey(notified_observers, &obs)) {
119 obs.OnBeginFrame(last_begin_frame_args_);
120 notified_observers.insert(&obs);
121 }
122 }
123 }
124
24 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, int display_id) 125 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, int display_id)
25 : display_id_(display_id), compositor_(NULL) { 126 : display_id_(display_id),
127 compositor_(NULL),
128 begin_frame_source_(new WindowBeginFrameSource(this)),
129 needs_begin_frames_(false) {
26 java_window_.Reset(env, obj); 130 java_window_.Reset(env, obj);
27 } 131 }
28 132
29 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { 133 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
30 delete this; 134 delete this;
31 } 135 }
32 136
33 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { 137 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
34 return base::android::ScopedJavaLocalRef<jobject>(java_window_); 138 return base::android::ScopedJavaLocalRef<jobject>(java_window_);
35 } 139 }
(...skipping 26 matching lines...) Expand all
62 166
63 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { 167 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) {
64 if (!observer_list_.HasObserver(observer)) 168 if (!observer_list_.HasObserver(observer))
65 observer_list_.AddObserver(observer); 169 observer_list_.AddObserver(observer);
66 } 170 }
67 171
68 void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) { 172 void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) {
69 observer_list_.RemoveObserver(observer); 173 observer_list_.RemoveObserver(observer);
70 } 174 }
71 175
176 cc::BeginFrameSource* WindowAndroid::GetBeginFrameSource() {
177 return begin_frame_source_.get();
178 }
179
72 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) { 180 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) {
73 if (compositor_ && compositor != compositor_) 181 if (compositor_ && compositor != compositor_)
74 DetachCompositor(); 182 DetachCompositor();
75 183
76 compositor_ = compositor; 184 compositor_ = compositor;
77 for (WindowAndroidObserver& observer : observer_list_) 185 for (WindowAndroidObserver& observer : observer_list_)
78 observer.OnAttachCompositor(); 186 observer.OnAttachCompositor();
79 } 187 }
80 188
81 void WindowAndroid::DetachCompositor() { 189 void WindowAndroid::DetachCompositor() {
82 compositor_ = NULL; 190 compositor_ = NULL;
83 for (WindowAndroidObserver& observer : observer_list_) 191 for (WindowAndroidObserver& observer : observer_list_)
84 observer.OnDetachCompositor(); 192 observer.OnDetachCompositor();
85 observer_list_.Clear(); 193 observer_list_.Clear();
86 } 194 }
87 195
88 void WindowAndroid::RequestVSyncUpdate() { 196 void WindowAndroid::RequestVSyncUpdate() {
89 JNIEnv* env = AttachCurrentThread(); 197 JNIEnv* env = AttachCurrentThread();
90 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject()); 198 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject());
91 } 199 }
92 200
201 void WindowAndroid::SetNeedsBeginFrames(bool needs_begin_frames) {
202 if (needs_begin_frames_ == needs_begin_frames)
203 return;
204
205 needs_begin_frames_ = needs_begin_frames;
206 if (needs_begin_frames_)
207 RequestVSyncUpdate();
208 }
209
93 void WindowAndroid::SetNeedsAnimate() { 210 void WindowAndroid::SetNeedsAnimate() {
94 if (compositor_) 211 if (compositor_)
95 compositor_->SetNeedsAnimate(); 212 compositor_->SetNeedsAnimate();
96 } 213 }
97 214
98 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { 215 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) {
99 for (WindowAndroidObserver& observer : observer_list_) 216 for (WindowAndroidObserver& observer : observer_list_)
100 observer.OnAnimate(begin_frame_time); 217 observer.OnAnimate(begin_frame_time);
101 } 218 }
102 219
103 void WindowAndroid::OnVSync(JNIEnv* env, 220 void WindowAndroid::OnVSync(JNIEnv* env,
104 const JavaParamRef<jobject>& obj, 221 const JavaParamRef<jobject>& obj,
105 jlong time_micros, 222 jlong time_micros,
106 jlong period_micros) { 223 jlong period_micros) {
107 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); 224 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros));
108 base::TimeDelta vsync_period( 225 base::TimeDelta vsync_period(
109 base::TimeDelta::FromMicroseconds(period_micros)); 226 base::TimeDelta::FromMicroseconds(period_micros));
110 for (WindowAndroidObserver& observer : observer_list_) 227 begin_frame_source_->OnVSync(frame_time, vsync_period);
111 observer.OnVSync(frame_time, vsync_period); 228 if (needs_begin_frames_)
112 if (compositor_) 229 RequestVSyncUpdate();
113 compositor_->OnVSync(frame_time, vsync_period);
114 } 230 }
115 231
116 void WindowAndroid::OnVisibilityChanged(JNIEnv* env, 232 void WindowAndroid::OnVisibilityChanged(JNIEnv* env,
117 const JavaParamRef<jobject>& obj, 233 const JavaParamRef<jobject>& obj,
118 bool visible) { 234 bool visible) {
119 for (WindowAndroidObserver& observer : observer_list_) 235 for (WindowAndroidObserver& observer : observer_list_)
120 observer.OnRootWindowVisibilityChanged(visible); 236 observer.OnRootWindowVisibilityChanged(visible);
121 } 237 }
122 238
123 void WindowAndroid::OnActivityStopped(JNIEnv* env, 239 void WindowAndroid::OnActivityStopped(JNIEnv* env,
(...skipping 30 matching lines...) Expand all
154 // ---------------------------------------------------------------------------- 270 // ----------------------------------------------------------------------------
155 // Native JNI methods 271 // Native JNI methods
156 // ---------------------------------------------------------------------------- 272 // ----------------------------------------------------------------------------
157 273
158 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { 274 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) {
159 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); 275 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id);
160 return reinterpret_cast<intptr_t>(window); 276 return reinterpret_cast<intptr_t>(window);
161 } 277 }
162 278
163 } // namespace ui 279 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698