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

Unified Diff: sky/shell/sky_view.cc

Issue 936883002: Connect Sky and Ganesh in SkyShell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: sort includes Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: sky/shell/sky_view.cc
diff --git a/sky/shell/sky_view.cc b/sky/shell/sky_view.cc
deleted file mode 100644
index d7b22112192344c5b5ccc79c5091b42069f49313..0000000000000000000000000000000000000000
--- a/sky/shell/sky_view.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "sky/shell/sky_view.h"
-
-#include <android/input.h>
-#include <android/native_window_jni.h>
-
-#include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "base/location.h"
-#include "jni/SkyView_jni.h"
-
-namespace sky {
-namespace shell {
-
-// static
-bool SkyView::Register(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-SkyView::SkyView(const Config& config) : config_(config), window_(nullptr) {
- JNIEnv* env = base::android::AttachCurrentThread();
- Java_SkyView_createForActivity(env, base::android::GetApplicationContext(),
- reinterpret_cast<jlong>(this));
-}
-
-SkyView::~SkyView() {
- if (window_)
- ReleaseWindow();
-}
-
-void SkyView::Destroy(JNIEnv* env, jobject obj) {
-}
-
-void SkyView::SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface) {
- base::android::ScopedJavaLocalRef<jobject> protector(env, jsurface);
- // Note: This ensures that any local references used by
- // ANativeWindow_fromSurface are released immediately. This is needed as a
- // workaround for https://code.google.com/p/android/issues/detail?id=68174
- {
- base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
- window_ = ANativeWindow_fromSurface(env, jsurface);
- }
- config_.gpu_task_runner->PostTask(
- FROM_HERE, base::Bind(&GPUDelegate::OnAcceleratedWidgetAvailable,
- config_.gpu_delegate, window_));
-}
-
-void SkyView::SurfaceDestroyed(JNIEnv* env, jobject obj) {
- DCHECK(window_);
- config_.gpu_task_runner->PostTask(
- FROM_HERE,
- base::Bind(&GPUDelegate::OnOutputSurfaceDestroyed, config_.gpu_delegate));
- ReleaseWindow();
-}
-
-void SkyView::SurfaceSetSize(JNIEnv* env,
- jobject obj,
- jint width,
- jint height,
- jfloat density) {
- config_.ui_task_runner->PostTask(
- FROM_HERE,
- base::Bind(&UIDelegate::OnViewportMetricsChanged, config_.ui_delegate,
- gfx::Size(width, height), density));
-}
-
-void SkyView::ReleaseWindow() {
- ANativeWindow_release(window_);
- window_ = nullptr;
-}
-
-} // namespace shell
-} // namespace sky

Powered by Google App Engine
This is Rietveld 408576698