corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1291373 - [geckoview] part 1, Remove JavaPanZoomController (JPZ) from mobile/android r=snorp

Browse Source
This commit is contained in:
Randall Barker
2016-08-04 15:46:12 -07:00
parent d05d0c6565
commit 91a74382de
21 changed files with 65 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@@ -1545,11 +1545,10 @@ bool nsPluginInstanceOwner::AddPluginView(const LayoutDeviceRect& aRect /* = Lay
mJavaView = (void*)jni::GetGeckoThreadEnv()->NewGlobalRef((jobject)mJavaView);
}
if (AndroidBridge::Bridge())
AndroidBridge::Bridge()->AddPluginView((jobject)mJavaView, aRect, mFullScreen);
if (mFullScreen)
if (mFullScreen) {
java::GeckoAppShell::AddFullScreenPluginView(jni::Object::Ref::From(jobject(mJavaView)));
sFullScreenInstance = this;
}
return true;
}
@@ -1559,8 +1558,9 @@ void nsPluginInstanceOwner::RemovePluginView()
if (!mInstance || !mJavaView)
return;
java::GeckoAppShell::RemovePluginView(
jni::Object::Ref::From(jobject(mJavaView)), mFullScreen);
if (mFullScreen) {
java::GeckoAppShell::RemoveFullScreenPluginView(jni::Object::Ref::From(jobject(mJavaView)));
}
jni::GetGeckoThreadEnv()->DeleteGlobalRef((jobject)mJavaView);
mJavaView = nullptr;