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

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

Issue 1028953002: Check null java object when request vsync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: semicolon Created 5 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 | « no previous file | 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/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_weak_ref.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void WindowAndroid::DetachCompositor() { 65 void WindowAndroid::DetachCompositor() {
66 compositor_ = NULL; 66 compositor_ = NULL;
67 FOR_EACH_OBSERVER(WindowAndroidObserver, 67 FOR_EACH_OBSERVER(WindowAndroidObserver,
68 observer_list_, 68 observer_list_,
69 OnDetachCompositor()); 69 OnDetachCompositor());
70 observer_list_.Clear(); 70 observer_list_.Clear();
71 } 71 }
72 72
73 void WindowAndroid::RequestVSyncUpdate() { 73 void WindowAndroid::RequestVSyncUpdate() {
74 JNIEnv* env = AttachCurrentThread(); 74 JNIEnv* env = AttachCurrentThread();
75 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj()); 75 ScopedJavaLocalRef<jobject> obj = GetJavaObject();
76 if (obj.is_null())
77 return;
78 Java_WindowAndroid_requestVSyncUpdate(env, obj.obj());
76 } 79 }
77 80
78 void WindowAndroid::SetNeedsAnimate() { 81 void WindowAndroid::SetNeedsAnimate() {
79 if (compositor_) 82 if (compositor_)
80 compositor_->SetNeedsAnimate(); 83 compositor_->SetNeedsAnimate();
81 } 84 }
82 85
83 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { 86 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) {
84 FOR_EACH_OBSERVER( 87 FOR_EACH_OBSERVER(
85 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); 88 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time));
(...skipping 17 matching lines...) Expand all
103 // ---------------------------------------------------------------------------- 106 // ----------------------------------------------------------------------------
104 // Native JNI methods 107 // Native JNI methods
105 // ---------------------------------------------------------------------------- 108 // ----------------------------------------------------------------------------
106 109
107 jlong Init(JNIEnv* env, jobject obj) { 110 jlong Init(JNIEnv* env, jobject obj) {
108 WindowAndroid* window = new WindowAndroid(env, obj); 111 WindowAndroid* window = new WindowAndroid(env, obj);
109 return reinterpret_cast<intptr_t>(window); 112 return reinterpret_cast<intptr_t>(window);
110 } 113 }
111 114
112 } // namespace ui 115 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698