| OLD | NEW |
| 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 #ifndef UI_ANDROID_WINDOW_ANDROID_H_ | 5 #ifndef UI_ANDROID_WINDOW_ANDROID_H_ |
| 6 #define UI_ANDROID_WINDOW_ANDROID_H_ | 6 #define UI_ANDROID_WINDOW_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 void set_content_offset(const gfx::Vector2dF& content_offset) { | 36 void set_content_offset(const gfx::Vector2dF& content_offset) { |
| 37 content_offset_ = content_offset; | 37 content_offset_ = content_offset; |
| 38 } | 38 } |
| 39 | 39 |
| 40 gfx::Vector2dF content_offset() const { | 40 gfx::Vector2dF content_offset() const { |
| 41 return content_offset_; | 41 return content_offset_; |
| 42 } | 42 } |
| 43 | 43 |
| 44 // Compositor callback relay. | 44 // Compositor callback relay. |
| 45 void OnCompositingDidCommit(); | 45 void OnCompositingDidCommit(); |
| 46 void OnVisibilityChanged(bool visible); | |
| 47 | 46 |
| 48 void AttachCompositor(WindowAndroidCompositor* compositor); | 47 void AttachCompositor(WindowAndroidCompositor* compositor); |
| 49 void DetachCompositor(); | 48 void DetachCompositor(); |
| 50 | 49 |
| 51 void AddObserver(WindowAndroidObserver* observer); | 50 void AddObserver(WindowAndroidObserver* observer); |
| 52 void RemoveObserver(WindowAndroidObserver* observer); | 51 void RemoveObserver(WindowAndroidObserver* observer); |
| 53 | 52 |
| 54 WindowAndroidCompositor* GetCompositor() { return compositor_; } | 53 WindowAndroidCompositor* GetCompositor() { return compositor_; } |
| 55 | 54 |
| 56 void RequestVSyncUpdate(); | 55 void RequestVSyncUpdate(); |
| 57 void SetNeedsAnimate(); | 56 void SetNeedsAnimate(); |
| 58 void OnVSync(JNIEnv* env, | 57 void OnVSync(JNIEnv* env, |
| 59 jobject obj, | 58 jobject obj, |
| 60 jlong time_micros, | 59 jlong time_micros, |
| 61 jlong period_micros); | 60 jlong period_micros); |
| 62 void Animate(base::TimeTicks begin_frame_time); | 61 void Animate(base::TimeTicks begin_frame_time); |
| 63 void OnActivityPaused(JNIEnv* env, jobject obj); | |
| 64 void OnActivityResumed(JNIEnv* env, jobject obj); | |
| 65 | 62 |
| 66 private: | 63 private: |
| 67 ~WindowAndroid(); | 64 ~WindowAndroid(); |
| 68 | 65 |
| 69 JavaObjectWeakGlobalRef weak_java_window_; | 66 JavaObjectWeakGlobalRef weak_java_window_; |
| 70 gfx::Vector2dF content_offset_; | 67 gfx::Vector2dF content_offset_; |
| 71 WindowAndroidCompositor* compositor_; | 68 WindowAndroidCompositor* compositor_; |
| 72 | 69 |
| 73 ObserverList<WindowAndroidObserver> observer_list_; | 70 ObserverList<WindowAndroidObserver> observer_list_; |
| 74 | 71 |
| 75 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); | 72 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
| 76 }; | 73 }; |
| 77 | 74 |
| 78 } // namespace ui | 75 } // namespace ui |
| 79 | 76 |
| 80 #endif // UI_ANDROID_WINDOW_ANDROID_H_ | 77 #endif // UI_ANDROID_WINDOW_ANDROID_H_ |
| OLD | NEW |