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

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

Issue 2754493002: Expose VSync pausing through WindowAndroid and pause VSync during webVR presentation (Closed)
Patch Set: Fix 'unused' member Created 3 years, 9 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
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 14 matching lines...) Expand all
25 using base::android::JavaRef; 25 using base::android::JavaRef;
26 using base::android::ScopedJavaLocalRef; 26 using base::android::ScopedJavaLocalRef;
27 27
28 class WindowAndroid::WindowBeginFrameSource : public cc::BeginFrameSource { 28 class WindowAndroid::WindowBeginFrameSource : public cc::BeginFrameSource {
29 public: 29 public:
30 explicit WindowBeginFrameSource(WindowAndroid* window) 30 explicit WindowBeginFrameSource(WindowAndroid* window)
31 : window_(window), 31 : window_(window),
32 observers_( 32 observers_(
33 base::ObserverList<cc::BeginFrameObserver>::NOTIFY_EXISTING_ONLY), 33 base::ObserverList<cc::BeginFrameObserver>::NOTIFY_EXISTING_ONLY),
34 observer_count_(0), 34 observer_count_(0),
35 next_sequence_number_(cc::BeginFrameArgs::kStartingFrameNumber) {} 35 next_sequence_number_(cc::BeginFrameArgs::kStartingFrameNumber),
36 paused_(false) {}
36 ~WindowBeginFrameSource() override {} 37 ~WindowBeginFrameSource() override {}
37 38
38 // cc::BeginFrameSource implementation. 39 // cc::BeginFrameSource implementation.
39 void AddObserver(cc::BeginFrameObserver* obs) override; 40 void AddObserver(cc::BeginFrameObserver* obs) override;
40 void RemoveObserver(cc::BeginFrameObserver* obs) override; 41 void RemoveObserver(cc::BeginFrameObserver* obs) override;
41 void DidFinishFrame(cc::BeginFrameObserver* obs, 42 void DidFinishFrame(cc::BeginFrameObserver* obs,
42 const cc::BeginFrameAck& ack) override {} 43 const cc::BeginFrameAck& ack) override {}
43 bool IsThrottled() const override { return true; } 44 bool IsThrottled() const override { return true; }
44 45
45 void OnVSync(base::TimeTicks frame_time, base::TimeDelta vsync_period); 46 void OnVSync(base::TimeTicks frame_time, base::TimeDelta vsync_period);
47 void OnPauseChanged(bool paused);
46 48
47 private: 49 private:
48 WindowAndroid* const window_; 50 WindowAndroid* const window_;
49 base::ObserverList<cc::BeginFrameObserver> observers_; 51 base::ObserverList<cc::BeginFrameObserver> observers_;
50 int observer_count_; 52 int observer_count_;
51 cc::BeginFrameArgs last_begin_frame_args_; 53 cc::BeginFrameArgs last_begin_frame_args_;
52 uint64_t next_sequence_number_; 54 uint64_t next_sequence_number_;
55 bool paused_;
53 }; 56 };
54 57
55 void WindowAndroid::WindowBeginFrameSource::AddObserver( 58 void WindowAndroid::WindowBeginFrameSource::AddObserver(
56 cc::BeginFrameObserver* obs) { 59 cc::BeginFrameObserver* obs) {
57 DCHECK(obs); 60 DCHECK(obs);
58 DCHECK(!observers_.HasObserver(obs)); 61 DCHECK(!observers_.HasObserver(obs));
59 62
60 observers_.AddObserver(obs); 63 observers_.AddObserver(obs);
61 observer_count_++; 64 observer_count_++;
62 obs->OnBeginFrameSourcePausedChanged(false); 65 obs->OnBeginFrameSourcePausedChanged(paused_);
63 window_->SetNeedsBeginFrames(true); 66 window_->SetNeedsBeginFrames(true);
64 67
65 // Send a MISSED BeginFrame if possible and necessary. 68 // Send a MISSED BeginFrame if possible and necessary.
66 if (last_begin_frame_args_.IsValid()) { 69 if (last_begin_frame_args_.IsValid()) {
67 cc::BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs(); 70 cc::BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
68 if (!last_args.IsValid() || 71 if (!last_args.IsValid() ||
69 last_args.frame_time < last_begin_frame_args_.frame_time) { 72 last_args.frame_time < last_begin_frame_args_.frame_time) {
70 DCHECK(last_args.sequence_number < 73 DCHECK(last_args.sequence_number <
71 last_begin_frame_args_.sequence_number || 74 last_begin_frame_args_.sequence_number ||
72 last_args.source_id != last_begin_frame_args_.source_id); 75 last_args.source_id != last_begin_frame_args_.source_id);
(...skipping 28 matching lines...) Expand all
101 last_begin_frame_args_ = cc::BeginFrameArgs::Create( 104 last_begin_frame_args_ = cc::BeginFrameArgs::Create(
102 BEGINFRAME_FROM_HERE, source_id(), next_sequence_number_, frame_time, 105 BEGINFRAME_FROM_HERE, source_id(), next_sequence_number_, frame_time,
103 deadline, vsync_period, cc::BeginFrameArgs::NORMAL); 106 deadline, vsync_period, cc::BeginFrameArgs::NORMAL);
104 DCHECK(last_begin_frame_args_.IsValid()); 107 DCHECK(last_begin_frame_args_.IsValid());
105 next_sequence_number_++; 108 next_sequence_number_++;
106 109
107 for (auto& obs : observers_) 110 for (auto& obs : observers_)
108 obs.OnBeginFrame(last_begin_frame_args_); 111 obs.OnBeginFrame(last_begin_frame_args_);
109 } 112 }
110 113
114 void WindowAndroid::WindowBeginFrameSource::OnPauseChanged(bool paused) {
115 paused_ = paused;
116 for (auto& obs : observers_)
117 obs.OnBeginFrameSourcePausedChanged(paused_);
118 }
119
111 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, int display_id) 120 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, int display_id)
112 : display_id_(display_id), 121 : display_id_(display_id),
113 compositor_(NULL), 122 compositor_(NULL),
114 begin_frame_source_(new WindowBeginFrameSource(this)), 123 begin_frame_source_(new WindowBeginFrameSource(this)),
115 needs_begin_frames_(false) { 124 needs_begin_frames_(false) {
116 java_window_.Reset(env, obj); 125 java_window_.Reset(env, obj);
117 } 126 }
118 127
119 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { 128 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
120 delete this; 129 delete this;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 for (WindowAndroidObserver& observer : observer_list_) 246 for (WindowAndroidObserver& observer : observer_list_)
238 observer.OnActivityStopped(); 247 observer.OnActivityStopped();
239 } 248 }
240 249
241 void WindowAndroid::OnActivityStarted(JNIEnv* env, 250 void WindowAndroid::OnActivityStarted(JNIEnv* env,
242 const JavaParamRef<jobject>& obj) { 251 const JavaParamRef<jobject>& obj) {
243 for (WindowAndroidObserver& observer : observer_list_) 252 for (WindowAndroidObserver& observer : observer_list_)
244 observer.OnActivityStarted(); 253 observer.OnActivityStarted();
245 } 254 }
246 255
256 void WindowAndroid::SetVSyncPaused(JNIEnv* env,
257 const JavaParamRef<jobject>& obj,
258 bool paused) {
259 begin_frame_source_->OnPauseChanged(paused);
260 }
261
247 bool WindowAndroid::HasPermission(const std::string& permission) { 262 bool WindowAndroid::HasPermission(const std::string& permission) {
248 JNIEnv* env = AttachCurrentThread(); 263 JNIEnv* env = AttachCurrentThread();
249 return Java_WindowAndroid_hasPermission( 264 return Java_WindowAndroid_hasPermission(
250 env, GetJavaObject(), 265 env, GetJavaObject(),
251 base::android::ConvertUTF8ToJavaString(env, permission)); 266 base::android::ConvertUTF8ToJavaString(env, permission));
252 } 267 }
253 268
254 bool WindowAndroid::CanRequestPermission(const std::string& permission) { 269 bool WindowAndroid::CanRequestPermission(const std::string& permission) {
255 JNIEnv* env = AttachCurrentThread(); 270 JNIEnv* env = AttachCurrentThread();
256 return Java_WindowAndroid_canRequestPermission( 271 return Java_WindowAndroid_canRequestPermission(
257 env, GetJavaObject(), 272 env, GetJavaObject(),
258 base::android::ConvertUTF8ToJavaString(env, permission)); 273 base::android::ConvertUTF8ToJavaString(env, permission));
259 } 274 }
260 275
261 WindowAndroid* WindowAndroid::GetWindowAndroid() const { 276 WindowAndroid* WindowAndroid::GetWindowAndroid() const {
262 DCHECK(parent_ == nullptr); 277 DCHECK(parent_ == nullptr);
263 return const_cast<WindowAndroid*>(this); 278 return const_cast<WindowAndroid*>(this);
264 } 279 }
265 280
266 // ---------------------------------------------------------------------------- 281 // ----------------------------------------------------------------------------
267 // Native JNI methods 282 // Native JNI methods
268 // ---------------------------------------------------------------------------- 283 // ----------------------------------------------------------------------------
269 284
270 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { 285 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) {
271 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); 286 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id);
272 return reinterpret_cast<intptr_t>(window); 287 return reinterpret_cast<intptr_t>(window);
273 } 288 }
274 289
275 } // namespace ui 290 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698