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

Unified Diff: ui/android/window_android.h

Issue 2585993002: Revert of [android] Make RWHVAndroid a BeginFrameObserver. (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/android/delegated_frame_host_android.cc ('k') | ui/android/window_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/window_android.h
diff --git a/ui/android/window_android.h b/ui/android/window_android.h
index 4bbc897dbf36bf541f8a40e5556fba888f7857f2..05279ced4c92a2a9e8827b15c67e0c94187a9e11 100644
--- a/ui/android/window_android.h
+++ b/ui/android/window_android.h
@@ -6,7 +6,6 @@
#define UI_ANDROID_WINDOW_ANDROID_H_
#include <jni.h>
-#include <memory>
#include <string>
#include <vector>
@@ -19,13 +18,9 @@
#include "ui/android/view_android.h"
#include "ui/gfx/geometry/vector2d_f.h"
-namespace cc {
-class BeginFrameSource;
-} // namespace cc
-
namespace display {
class DisplayAndroidManager;
-} // namespace display
+}
namespace ui {
@@ -64,8 +59,8 @@
void RemoveObserver(WindowAndroidObserver* observer);
WindowAndroidCompositor* GetCompositor() { return compositor_; }
- cc::BeginFrameSource* GetBeginFrameSource();
+ void RequestVSyncUpdate();
void SetNeedsAnimate();
void Animate(base::TimeTicks begin_frame_time);
void OnVSync(JNIEnv* env,
@@ -89,14 +84,9 @@
void DestroyForTesting();
private:
- class WindowBeginFrameSource;
friend class DisplayAndroidManager;
- friend class WindowBeginFrameSource;
~WindowAndroid() override;
-
- void SetNeedsBeginFrames(bool needs_begin_frames);
- void RequestVSyncUpdate();
// ViewAndroid overrides.
WindowAndroid* GetWindowAndroid() const override;
@@ -111,9 +101,6 @@
base::ObserverList<WindowAndroidObserver> observer_list_;
- std::unique_ptr<WindowBeginFrameSource> begin_frame_source_;
- bool needs_begin_frames_;
-
DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
};
« no previous file with comments | « ui/android/delegated_frame_host_android.cc ('k') | ui/android/window_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698