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

Unified Diff: blimp/client/compositor/blimp_compositor_android.cc

Issue 1450423002: Add glue between the client and engine for Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_ipc2
Patch Set: Made the BlackHoleBlimpMessageProcessor official! Created 5 years, 1 month 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
Index: blimp/client/compositor/blimp_compositor_android.cc
diff --git a/blimp/client/compositor/blimp_compositor_android.cc b/blimp/client/compositor/blimp_compositor_android.cc
index 269fe0abdf5de3ed09704bbd352a964d5a68349b..9cc252413e474574c85ad0a0f48fcebe5da51e99 100644
--- a/blimp/client/compositor/blimp_compositor_android.cc
+++ b/blimp/client/compositor/blimp_compositor_android.cc
@@ -4,8 +4,6 @@
#include "blimp/client/compositor/blimp_compositor_android.h"
-#include <android/native_window_jni.h>
-
#include "base/command_line.h"
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/geometry/size.h"
@@ -39,31 +37,9 @@ BlimpCompositorAndroid::BlimpCompositorAndroid(const gfx::Size& size,
: BlimpCompositor(dp_to_px),
portrait_width_(std::min(size.width(), size.height())),
landscape_width_(std::max(size.width(), size.height())),
- real_size_supported_(real_size_supported),
- window_(nullptr) {}
-
-BlimpCompositorAndroid::~BlimpCompositorAndroid() {
- SetSurface(nullptr, 0 /* null surface */);
-}
-
-void BlimpCompositorAndroid::SetSurface(JNIEnv* env, jobject jsurface) {
- if (window_) {
- SetVisible(false);
- ANativeWindow_release(window_);
- window_ = nullptr;
- }
+ real_size_supported_(real_size_supported) {}
- if (!jsurface)
- return;
-
- base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
- window_ = ANativeWindow_fromSurface(env, jsurface);
- SetVisible(true);
-}
-
-gfx::AcceleratedWidget BlimpCompositorAndroid::GetWindow() {
- return window_;
-}
+BlimpCompositorAndroid::~BlimpCompositorAndroid() {}
void BlimpCompositorAndroid::GenerateLayerTreeSettings(
cc::LayerTreeSettings* settings) {

Powered by Google App Engine
This is Rietveld 408576698