From 593c9b3ffe45ea2b4c313758f8698b7ea1d30031 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 9 Jul 2019 15:34:16 -0700 Subject: [PATCH 1/2] Make platform_view_android_jni delegate to platform_view_android --- shell/platform/android/platform_view_android_jni.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc index eaeb349d5ef8a..f25ddefb9becc 100644 --- a/shell/platform/android/platform_view_android_jni.cc +++ b/shell/platform/android/platform_view_android_jni.cc @@ -276,7 +276,7 @@ static void SetViewportMetrics(JNIEnv* env, static_cast(physicalViewInsetLeft), }; - ANDROID_SHELL_HOLDER->SetViewportMetrics(metrics); + ANDROID_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(metrics); } static jobject GetBitmap(JNIEnv* env, jobject jcaller, jlong shell_holder) { @@ -387,7 +387,8 @@ static void DispatchPointerDataPacket(JNIEnv* env, jint position) { uint8_t* data = static_cast(env->GetDirectBufferAddress(buffer)); auto packet = std::make_unique(data, position); - ANDROID_SHELL_HOLDER->DispatchPointerDataPacket(std::move(packet)); + ANDROID_SHELL_HOLDER->GetPlatformView()->DispatchPointerDataPacket( + std::move(packet)); } static void DispatchSemanticsAction(JNIEnv* env, From d3b153803b6c2625131dcecfe4ef56b193871ba1 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 9 Jul 2019 15:40:41 -0700 Subject: [PATCH 2/2] just SetViewportMetrics --- shell/platform/android/android_shell_holder.cc | 6 +++--- shell/platform/android/platform_view_android_jni.cc | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc index e9b114fc42252..a86f014de7c7b 100644 --- a/shell/platform/android/android_shell_holder.cc +++ b/shell/platform/android/android_shell_holder.cc @@ -179,9 +179,9 @@ void AndroidShellHolder::SetViewportMetrics( } shell_->GetTaskRunners().GetUITaskRunner()->PostTask( - [engine = shell_->GetEngine(), metrics]() { - if (engine) { - engine->SetViewportMetrics(metrics); + [platform_view = platform_view_, metrics]() { + if (platform_view) { + platform_view->SetViewportMetrics(metrics); } }); } diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc index f25ddefb9becc..eaeb349d5ef8a 100644 --- a/shell/platform/android/platform_view_android_jni.cc +++ b/shell/platform/android/platform_view_android_jni.cc @@ -276,7 +276,7 @@ static void SetViewportMetrics(JNIEnv* env, static_cast(physicalViewInsetLeft), }; - ANDROID_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(metrics); + ANDROID_SHELL_HOLDER->SetViewportMetrics(metrics); } static jobject GetBitmap(JNIEnv* env, jobject jcaller, jlong shell_holder) { @@ -387,8 +387,7 @@ static void DispatchPointerDataPacket(JNIEnv* env, jint position) { uint8_t* data = static_cast(env->GetDirectBufferAddress(buffer)); auto packet = std::make_unique(data, position); - ANDROID_SHELL_HOLDER->GetPlatformView()->DispatchPointerDataPacket( - std::move(packet)); + ANDROID_SHELL_HOLDER->DispatchPointerDataPacket(std::move(packet)); } static void DispatchSemanticsAction(JNIEnv* env,