Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1293709; r=snorp

Browse Source
This commit is contained in:
Jim Chen 2016-08-18 18:03:04 -04:00
parent d89e98bdee
commit f13d6e6a90
6 changed files with 329 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
View File

@ -111,13 +111,12 @@ public class GeckoView extends LayerView
@WrapForJNI(skip = true)
/* package */ Window() {}
static native void open(Window instance, GeckoView view, Compositor compositor,
String chromeURI,
int width, int height);
static native void open(Window instance, GeckoView view, Object compositor,
String chromeURI, int width, int height);
@Override protected native void disposeNative();
native void close();
native void reattach(GeckoView view, Compositor compositor);
native void reattach(GeckoView view, Object compositor);
native void loadUri(String uri, int flags);
}
@ -230,20 +229,18 @@ public class GeckoView extends LayerView
if (GeckoThread.isStateAtLeast(GeckoThread.State.PROFILE_READY)) {
Window.open(window, this, getCompositor(),
chromeURI,
metrics.widthPixels, metrics.heightPixels);
chromeURI, metrics.widthPixels, metrics.heightPixels);
} else {
GeckoThread.queueNativeCallUntil(GeckoThread.State.PROFILE_READY, Window.class,
"open", window, GeckoView.class, this, getCompositor(),
String.class, chromeURI,
metrics.widthPixels, metrics.heightPixels);
"open", window, GeckoView.class, this, Object.class, getCompositor(),
String.class, chromeURI, metrics.widthPixels, metrics.heightPixels);
}
} else {
if (GeckoThread.isStateAtLeast(GeckoThread.State.PROFILE_READY)) {
window.reattach(this, getCompositor());
} else {
GeckoThread.queueNativeCallUntil(GeckoThread.State.PROFILE_READY,
window, "reattach", GeckoView.class, this, getCompositor());
window, "reattach", GeckoView.class, this, Object.class, getCompositor());
}
}

4
mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java
View File

@ -78,7 +78,7 @@ public class LayerView extends ScrollView implements Tabs.OnTabsChangedListener
private volatile boolean mCompositorCreated;
protected class Compositor extends JNIObject {
private class Compositor extends JNIObject {
public Compositor() {
}
@ -488,7 +488,7 @@ public class LayerView extends ScrollView implements Tabs.OnTabsChangedListener
}
}
protected Compositor getCompositor() {
protected Object getCompositor() {
return mCompositor;
}

2
mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/NativePanZoomController.java
View File

@ -251,7 +251,7 @@ class NativePanZoomController extends JNIObject implements PanZoomController {
disposeNative();
}
@Override @WrapForJNI(calledFrom = "ui") // JNIObject
@WrapForJNI(calledFrom = "ui", dispatchTo = "gecko") @Override // JNIObject
protected native void disposeNative();
@Override

6
widget/android/GeneratedJNIWrappers.h
View File

@ -3486,7 +3486,7 @@ public:
int32_t> Args;
static constexpr char name[] = "open";
static constexpr char signature[] =
"(Lorg/mozilla/gecko/GeckoView$Window;Lorg/mozilla/gecko/GeckoView;Lorg/mozilla/gecko/gfx/LayerView$Compositor;Ljava/lang/String;II)V";
"(Lorg/mozilla/gecko/GeckoView$Window;Lorg/mozilla/gecko/GeckoView;Ljava/lang/Object;Ljava/lang/String;II)V";
static const bool isStatic = true;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
@ -3505,7 +3505,7 @@ public:
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "reattach";
static constexpr char signature[] =
"(Lorg/mozilla/gecko/GeckoView;Lorg/mozilla/gecko/gfx/LayerView$Compositor;)V";
"(Lorg/mozilla/gecko/GeckoView;Ljava/lang/Object;)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
@ -4634,7 +4634,7 @@ public:
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
mozilla::jni::DispatchTarget::GECKO;
};
struct HandleMotionEvent_t {

394
widget/android/nsWindow.cpp
View File

@ -95,7 +95,6 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
#include "mozilla/layers/CompositorBridgeParent.h"
#include "mozilla/layers/CompositorSession.h"
#include "mozilla/layers/LayerTransactionParent.h"
#include "mozilla/Mutex.h"
#include "mozilla/Services.h"
#include "nsThreadUtils.h"
@ -180,6 +179,107 @@ public:
}
};
template<class Impl>
template<class Instance, typename... Args> void
nsWindow::NativePtr<Impl>::Attach(Instance aInstance, nsWindow* aWindow,
Args&&... aArgs)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!mPtr && !mImpl);
auto impl = mozilla::MakeUnique<Impl>(
this, aWindow, mozilla::Forward<Args>(aArgs)...);
mImpl = impl.get();
Impl::AttachNative(aInstance, mozilla::Move(impl));
}
template<class Impl> void
nsWindow::NativePtr<Impl>::Detach()
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mPtr && mImpl);
mImpl->OnDetach();
{
Locked implLock(*this);
mImpl = nullptr;
}
typename WindowPtr<Impl>::Locked lock(*mPtr);
mPtr->mWindow = nullptr;
mPtr->mPtr = nullptr;
mPtr = nullptr;
}
template<class Impl>
class nsWindow::NativePtr<Impl>::Locked final : private MutexAutoLock
{
Impl* const mImpl;
public:
Locked(NativePtr<Impl>& aPtr)
: MutexAutoLock(aPtr.mImplLock)
, mImpl(aPtr.mImpl)
{}
operator Impl*() const { return mImpl; }
Impl* operator->() const { return mImpl; }
};
template<class Impl>
class nsWindow::WindowPtr final
{
friend NativePtr<Impl>;
NativePtr<Impl>* mPtr;
nsWindow* mWindow;
Mutex mWindowLock;
public:
class Locked final : private MutexAutoLock
{
nsWindow* const mWindow;
public:
Locked(WindowPtr<Impl>& aPtr)
: MutexAutoLock(aPtr.mWindowLock)
, mWindow(aPtr.mWindow)
{}
operator nsWindow*() const { return mWindow; }
nsWindow* operator->() const { return mWindow; }
};
WindowPtr(NativePtr<Impl>* aPtr, nsWindow* aWindow)
: mPtr(aPtr)
, mWindow(aWindow)
, mWindowLock(NativePtr<Impl>::sName)
{
MOZ_ASSERT(NS_IsMainThread());
mPtr->mPtr = this;
}
~WindowPtr()
{
MOZ_ASSERT(NS_IsMainThread());
if (!mPtr) {
return;
}
mPtr->mPtr = nullptr;
mPtr->mImpl = nullptr;
}
operator nsWindow*() const
{
MOZ_ASSERT(NS_IsMainThread());
return mWindow;
}
nsWindow* operator->() const { return operator nsWindow*(); }
};
class nsWindow::GeckoViewSupport final
: public GeckoView::Window::Natives<GeckoViewSupport>
, public GeckoEditable::Natives<GeckoViewSupport>
@ -253,7 +353,8 @@ public:
void Close();
// Reattach this nsWindow to a new GeckoView.
void Reattach(GeckoView::Param aView, jni::Object::Param aCompositor);
void Reattach(const GeckoView::Window::LocalRef& inst,
GeckoView::Param aView, jni::Object::Param aCompositor);
void LoadUri(jni::String::Param aUri, int32_t aFlags);
@ -370,34 +471,29 @@ public:
class nsWindow::NPZCSupport final
: public NativePanZoomController::Natives<NPZCSupport>
{
nsWindow* mWindow;
// Lock for keeping mWindow alive when accessed off of the Gecko thread.
Mutex mWindowLock;
using LockedWindowPtr = WindowPtr<NPZCSupport>::Locked;
WindowPtr<NPZCSupport> mWindow;
NativePanZoomController::GlobalRef mNPZC;
int mPreviousButtons;
public:
typedef NativePanZoomController::Natives<NPZCSupport> Base;
NPZCSupport(nsWindow* aWindow,
NPZCSupport(NativePtr<NPZCSupport>* aPtr, nsWindow* aWindow,
const NativePanZoomController::LocalRef& aNPZC)
: mWindow(aWindow)
, mWindowLock("NPZCSupport")
: mWindow(aPtr, aWindow)
, mNPZC(aNPZC)
, mPreviousButtons(0)
{
if (mWindow->mNPZCSupport) {
mWindow->mNPZCSupport->DetachFromWindow();
}
mWindow->mNPZCSupport = this;
}
{}
~NPZCSupport()
{}
using Base::AttachNative;
using Base::DisposeNative;
void DetachFromWindow()
void OnDetach()
{
// There are several considerations when shutting down NPZC. 1) The
// Gecko thread may destroy NPZC at any time when nsWindow closes. 2)
@ -410,7 +506,7 @@ public:
// cleared on the Gecko thread when the pending call happens on the UI
// thread.
//
// 1) happens through DetachFromWindow, which first notifies the UI
// 1) happens through OnDetach, which first notifies the UI
// thread through Destroy; Destroy then calls DisposeNative, which
// finally disposes the native instance back on the Gecko thread. Using
// Destroy to indirectly call DisposeNative here also solves 5), by
@ -420,7 +516,7 @@ public:
// pending event that we had shut down. In that case the event bails
// and does not touch mWindow.
//
// 4) happens through DisposeNative directly. DetachFromWindow is not
// 4) happens through DisposeNative directly. OnDetach is not
// called.
//
// 6) is solved by keeping a destroyed flag in the Java NPZC instance,
@ -440,50 +536,21 @@ public:
AndroidBridge::Bridge()->PostTaskToUiThread(NewRunnableFunction(
static_cast<void(*)(const NPZCRef&)>(callDestroy),
mozilla::Move(npzc)), 0);
// Signal to any pending calls on either Gecko or UI thread that NPZC
// is being destroyed.
MutexAutoLock lock(mWindowLock);
mWindow->mNPZCSupport = nullptr;
mWindow = nullptr;
}
private:
void DisposeOnGeckoThread()
{
MOZ_ASSERT(NS_IsMainThread());
if (mWindow && mWindow->mNPZCSupport == this) {
mWindow->mNPZCSupport = nullptr;
}
// Base::DisposeNative implicitly deletes 'this'.
Base::DisposeNative(NativePanZoomController::LocalRef(
jni::GetGeckoThreadEnv(), mNPZC));
}
public:
void DisposeNative()
{
// Capturing 'this' is okay because 'this' is owned by the Java
// instance, it is alive until this lambda is run, and we make sure to
// only call DisposeNative once.
nsAppShell::PostEvent([this] {
DisposeOnGeckoThread();
});
}
void AbortAnimation()
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
MutexAutoLock lock(mWindowLock);
if (!mWindow) {
// We already shut down.
return;
RefPtr<IAPZCTreeManager> controller;
RefPtr<CompositorBridgeParent> compositor;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
compositor = window->GetCompositorBridgeParent();
}
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
RefPtr<CompositorBridgeParent> compositor = mWindow->GetCompositorBridgeParent();
if (controller && compositor) {
// TODO: Pass in correct values for presShellId and viewId.
controller->CancelAnimation(ScrollableLayerGuid(
@ -495,13 +562,12 @@ public:
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
MutexAutoLock lock(mWindowLock);
if (!mWindow) {
// We already shut down.
return;
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
if (controller) {
controller->AdjustScrollForSurfaceShift(
ScreenPoint(aX, aY));
@ -512,7 +578,12 @@ public:
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
if (controller) {
controller->SetLongTapEnabled(aIsLongpressEnabled);
}
@ -524,13 +595,12 @@ public:
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
MutexAutoLock lock(mWindowLock);
if (!mWindow) {
// We already shut down.
return false;
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
if (!controller) {
return false;
}
@ -576,6 +646,7 @@ public:
return true;
}
private:
static MouseInput::ButtonType GetButtonType(int button)
{
MouseInput::ButtonType result = MouseInput::NONE;
@ -619,18 +690,18 @@ public:
return result;
}
public:
bool HandleMouseEvent(int32_t aAction, int64_t aTime, int32_t aMetaState,
float aX, float aY, int buttons)
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
MutexAutoLock lock(mWindowLock);
if (!mWindow) {
// We already shut down.
return false;
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
if (!controller) {
return false;
}
@ -717,13 +788,12 @@ public:
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
MutexAutoLock lock(mWindowLock);
if (!mWindow) {
// We already shut down.
return false;
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
if (!controller) {
return false;
}
@ -845,7 +915,14 @@ public:
void HandleMotionEventVelocity(int64_t aTime, float aSpeedY)
{
RefPtr<IAPZCTreeManager> controller = mWindow->mAPZC;
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
RefPtr<IAPZCTreeManager> controller;
if (LockedWindowPtr window{mWindow}) {
controller = window->mAPZC;
}
if (controller) {
controller->ProcessTouchVelocity((uint32_t)aTime, aSpeedY);
}
@ -872,19 +949,23 @@ public:
}
};
template<> const char
nsWindow::NativePtr<nsWindow::NPZCSupport>::sName[] = "NPZCSupport";
/**
* Compositor has some unique requirements for its native calls, so make it
* separate from GeckoViewSupport.
*/
class nsWindow::LayerViewSupport final
: public LayerView::Compositor::Natives<LayerViewSupport>
, public SupportsWeakPtr<LayerViewSupport>
{
nsWindow& window;
using LockedWindowPtr = WindowPtr<LayerViewSupport>::Locked;
WindowPtr<LayerViewSupport> mWindow;
LayerView::Compositor::GlobalRef mCompositor;
GeckoLayerClient::GlobalRef mLayerClient;
Atomic<bool, ReleaseAcquire> mCompositorPaused;
mozilla::jni::GlobalRef<mozilla::jni::Object> mSurface;
jni::Object::GlobalRef mSurface;
// In order to use Event::HasSameTypeAs in PostTo(), we cannot make
// LayerViewEvent a template because each template instantiation is
@ -922,8 +1003,6 @@ class nsWindow::LayerViewSupport final
public:
typedef LayerView::Compositor::Natives<LayerViewSupport> Base;
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(LayerViewSupport);
template<class Functor>
static void OnNativeCall(Functor&& aCall)
{
@ -957,20 +1036,21 @@ public:
mozilla::Move(aCall)));
}
LayerViewSupport(nsWindow* aWindow,
LayerViewSupport(NativePtr<LayerViewSupport>* aPtr, nsWindow* aWindow,
const LayerView::Compositor::LocalRef& aInstance)
: window(*aWindow)
: mWindow(aPtr, aWindow)
, mCompositor(aInstance)
, mCompositorPaused(true)
{
Base::AttachNative(aInstance, this);
}
{}
~LayerViewSupport()
{}
using Base::AttachNative;
using Base::DisposeNative;
void OnDetach()
{
if (window.mNPZCSupport) {
window.mNPZCSupport->DetachFromWindow();
}
mCompositor->Destroy();
}
@ -984,15 +1064,17 @@ public:
return mCompositorPaused;
}
void* GetSurface()
jni::Object::Param GetSurface()
{
mSurface = mCompositor->GetSurface();
return mSurface.Get();
return mSurface;
}
private:
void OnResumedCompositor(int32_t aWidth, int32_t aHeight)
{
MOZ_ASSERT(NS_IsMainThread());
// When we receive this, the compositor has already been told to
// resume. (It turns out that waiting till we reach here to tell
// the compositor to resume takes too long, resulting in a black
@ -1001,7 +1083,7 @@ private:
// occurring while the compositor was paused, we need to schedule
// a draw event now.
if (!mCompositorPaused) {
window.RedrawAll();
mWindow->RedrawAll();
}
}
@ -1009,10 +1091,10 @@ private:
* Compositor methods
*/
public:
using Base::DisposeNative;
void AttachToJava(jni::Object::Param aClient, jni::Object::Param aNPZC)
{
MOZ_ASSERT(NS_IsMainThread());
const auto& layerClient = GeckoLayerClient::Ref::From(aClient);
AndroidBridge::Bridge()->SetLayerClient(layerClient);
@ -1028,7 +1110,7 @@ public:
// Since we are re-linking the new java objects to Gecko, we need
// to get the viewport from the compositor (since the Java copy was
// thrown away) and we do that by setting the first-paint flag.
if (RefPtr<CompositorBridgeParent> bridge = window.GetCompositorBridgeParent()) {
if (RefPtr<CompositorBridgeParent> bridge = mWindow->GetCompositorBridgeParent()) {
bridge->ForceIsFirstPaint();
}
}
@ -1037,8 +1119,7 @@ public:
auto npzc = NativePanZoomController::LocalRef(
jni::GetGeckoThreadEnv(),
NativePanZoomController::Ref::From(aNPZC));
NPZCSupport::AttachNative(
npzc, mozilla::MakeUnique<NPZCSupport>(&window, npzc));
mWindow->mNPZCSupport.Attach(npzc, mWindow, npzc);
layerClient->OnGeckoReady();
}
@ -1046,55 +1127,88 @@ public:
void OnSizeChanged(int32_t aWindowWidth, int32_t aWindowHeight,
int32_t aScreenWidth, int32_t aScreenHeight)
{
if (aWindowWidth != window.mBounds.width ||
aWindowHeight != window.mBounds.height) {
MOZ_ASSERT(NS_IsMainThread());
window.Resize(aWindowWidth, aWindowHeight, /* repaint */ false);
if (aWindowWidth != mWindow->mBounds.width ||
aWindowHeight != mWindow->mBounds.height) {
mWindow->Resize(aWindowWidth, aWindowHeight, /* repaint */ false);
}
}
void CreateCompositor(int32_t aWidth, int32_t aHeight)
{
window.CreateLayerManager(aWidth, aHeight);
MOZ_ASSERT(NS_IsMainThread());
mWindow->CreateLayerManager(aWidth, aHeight);
mCompositorPaused = false;
OnResumedCompositor(aWidth, aHeight);
}
void SyncPauseCompositor()
{
if (RefPtr<CompositorBridgeParent> bridge = window.GetCompositorBridgeParent()) {
bridge->SchedulePauseOnCompositorThread();
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
RefPtr<CompositorBridgeParent> bridge;
if (LockedWindowPtr window{mWindow}) {
bridge = window->GetCompositorBridgeParent();
}
if (bridge) {
mCompositorPaused = true;
bridge->SchedulePauseOnCompositorThread();
}
}
void SyncResumeCompositor()
{
if (RefPtr<CompositorBridgeParent> bridge = window.GetCompositorBridgeParent()) {
if (bridge->ScheduleResumeOnCompositorThread()) {
mCompositorPaused = false;
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
RefPtr<CompositorBridgeParent> bridge;
if (LockedWindowPtr window{mWindow}) {
bridge = window->GetCompositorBridgeParent();
}
if (bridge && bridge->ScheduleResumeOnCompositorThread()) {
mCompositorPaused = false;
}
}
void SyncResumeResizeCompositor(int32_t aWidth, int32_t aHeight)
{
if (RefPtr<CompositorBridgeParent> bridge = window.GetCompositorBridgeParent()) {
if (bridge->ScheduleResumeOnCompositorThread(aWidth, aHeight)) {
mCompositorPaused = false;
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
RefPtr<CompositorBridgeParent> bridge;
if (LockedWindowPtr window{mWindow}) {
bridge = window->GetCompositorBridgeParent();
}
if (bridge && bridge->ScheduleResumeOnCompositorThread(aWidth,
aHeight)) {
mCompositorPaused = false;
}
}
void SyncInvalidateAndScheduleComposite()
{
if (RefPtr<CompositorBridgeParent> bridge = window.GetCompositorBridgeParent()) {
RefPtr<CompositorBridgeParent> bridge;
if (LockedWindowPtr window{mWindow}) {
bridge = window->GetCompositorBridgeParent();
}
if (bridge) {
bridge->InvalidateOnCompositorThread();
bridge->ScheduleRenderOnCompositorThread();
}
}
};
template<> const char
nsWindow::NativePtr<nsWindow::LayerViewSupport>::sName[] = "LayerViewSupport";
nsWindow::GeckoViewSupport::~GeckoViewSupport()
{
@ -1103,6 +1217,14 @@ nsWindow::GeckoViewSupport::~GeckoViewSupport()
// been made.
MOZ_ASSERT(mEditable);
mEditable->OnViewChange(nullptr);
if (window.mNPZCSupport) {
window.mNPZCSupport.Detach();
}
if (window.mLayerViewSupport) {
window.mLayerViewSupport.Detach();
}
}
/* static */ void
@ -1166,9 +1288,9 @@ nsWindow::GeckoViewSupport::Open(const jni::Class::LocalRef& aCls,
window->mGeckoViewSupport->mDOMWindow = pdomWindow;
// Attach the Compositor to the new window.
window->mLayerViewSupport = mozilla::MakeUnique<LayerViewSupport>(
window, LayerView::Compositor::LocalRef(
aCls.Env(), LayerView::Compositor::Ref::From(aCompositor)));
auto compositor = LayerView::Compositor::LocalRef(
aCls.Env(), LayerView::Compositor::Ref::From(aCompositor));
window->mLayerViewSupport.Attach(compositor, window, compositor);
gGeckoViewWindow = window;
@ -1195,14 +1317,25 @@ nsWindow::GeckoViewSupport::Close()
}
void
nsWindow::GeckoViewSupport::Reattach(GeckoView::Param aView, jni::Object::Param aCompositor)
nsWindow::GeckoViewSupport::Reattach(const GeckoView::Window::LocalRef& inst,
GeckoView::Param aView,
jni::Object::Param aCompositor)
{
// Associate our previous GeckoEditable with the new GeckoView.
mEditable->OnViewChange(aView);
window.mLayerViewSupport = mozilla::MakeUnique<LayerViewSupport>(
&window, LayerView::Compositor::LocalRef(jni::GetGeckoThreadEnv(),
LayerView::Compositor::Ref::From(aCompositor)));
// mNPZCSupport might have already been detached through the Java side calling
// NativePanZoomController.destroy().
if (window.mNPZCSupport) {
window.mNPZCSupport.Detach();
}
MOZ_ASSERT(window.mLayerViewSupport);
window.mLayerViewSupport.Detach();
auto compositor = LayerView::Compositor::LocalRef(
inst.Env(), LayerView::Compositor::Ref::From(aCompositor));
window.mLayerViewSupport.Attach(compositor, &window, compositor);
}
void
@ -1287,7 +1420,6 @@ nsWindow::DumpWindows(const nsTArray<nsWindow*>& wins, int indent)
}
nsWindow::nsWindow() :
mNPZCSupport(nullptr),
mIsVisible(false),
mParent(nullptr),
mAwaitingFullScreen(false),
@ -1868,16 +2000,16 @@ nsWindow::InitEvent(WidgetGUIEvent& event, LayoutDeviceIntPoint* aPoint)
void
nsWindow::UpdateOverscrollVelocity(const float aX, const float aY)
{
if (mNPZCSupport) {
mNPZCSupport->UpdateOverscrollVelocity(aX, aY);
if (NativePtr<NPZCSupport>::Locked npzcs{mNPZCSupport}) {
npzcs->UpdateOverscrollVelocity(aX, aY);
}
}
void
nsWindow::UpdateOverscrollOffset(const float aX, const float aY)
{
if (mNPZCSupport) {
mNPZCSupport->UpdateOverscrollOffset(aX, aY);
if (NativePtr<NPZCSupport>::Locked npzcs{mNPZCSupport}) {
npzcs->UpdateOverscrollOffset(aX, aY);
}
}
@ -1887,16 +2019,16 @@ nsWindow::SetScrollingRootContent(const bool isRootContent)
// On Android, the Controller thread and UI thread are the same.
MOZ_ASSERT(APZThreadUtils::IsControllerThread(), "nsWindow::SetScrollingRootContent must be called from the controller thread");
if (mNPZCSupport) {
mNPZCSupport->SetScrollingRootContent(isRootContent);
if (NativePtr<NPZCSupport>::Locked npzcs{mNPZCSupport}) {
npzcs->SetScrollingRootContent(isRootContent);
}
}
void
nsWindow::SetSelectionDragState(bool aState)
{
if (mNPZCSupport) {
mNPZCSupport->SetSelectionDragState(aState);
if (NativePtr<NPZCSupport>::Locked npzcs{mNPZCSupport}) {
npzcs->SetSelectionDragState(aState);
}
}
@ -1921,10 +2053,10 @@ nsWindow::GetNativeData(uint32_t aDataType)
}
case NS_JAVA_SURFACE:
if (!mLayerViewSupport) {
return nullptr;
if (NativePtr<LayerViewSupport>::Locked lvs{mLayerViewSupport}) {
return lvs->GetSurface().Get();
}
return mLayerViewSupport->GetSurface();
return nullptr;
}
return nullptr;
@ -3304,8 +3436,12 @@ nsWindow::DrawWindowUnderlay(LayerManagerComposite* aManager,
if (Destroyed()) {
return;
}
MOZ_ASSERT(mLayerViewSupport);
GeckoLayerClient::LocalRef client = mLayerViewSupport->GetLayerClient();
GeckoLayerClient::LocalRef client;
if (NativePtr<LayerViewSupport>::Locked lvs{mLayerViewSupport}) {
client = lvs->GetLayerClient();
}
LayerRenderer::Frame::LocalRef frame = client->CreateFrame();
mLayerRendererFrame = frame;

55
widget/android/nsWindow.h
View File

@ -13,6 +13,7 @@
#include "AndroidJavaWrappers.h"
#include "GeneratedJNIWrappers.h"
#include "mozilla/EventForwards.h"
#include "mozilla/Mutex.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/TextRange.h"
#include "mozilla/UniquePtr.h"
@ -53,18 +54,60 @@ private:
class Impl = typename Lambda::TargetClass>
class WindowEvent;
class GeckoViewSupport;
// Object that implements native GeckoView calls and associated states.
// nullptr for nsWindows that were not opened from GeckoView.
mozilla::UniquePtr<GeckoViewSupport> mGeckoViewSupport;
// Smart pointer for holding a pointer back to the nsWindow inside a native
// object class. The nsWindow pointer is automatically cleared when the
// nsWindow is destroyed, and a WindowPtr<Impl>::Locked class is provided
// for thread-safe access to the nsWindow pointer off of the Gecko thread.
template<class Impl> class WindowPtr;
// Smart pointer for holding a pointer to a native object class. The
// pointer is automatically cleared when the object is destroyed.
template<class Impl>
class NativePtr final
{
friend WindowPtr<Impl>;
static const char sName[];
WindowPtr<Impl>* mPtr;
Impl* mImpl;
mozilla::Mutex mImplLock;
public:
class Locked;
NativePtr() : mPtr(nullptr), mImpl(nullptr), mImplLock(sName) {}
~NativePtr() { MOZ_ASSERT(!mPtr); }
operator Impl*() const
{
MOZ_ASSERT(NS_IsMainThread());
return mImpl;
}
Impl* operator->() const { return operator Impl*(); }
template<class Instance, typename... Args>
void Attach(Instance aInstance, nsWindow* aWindow, Args&&... aArgs);
void Detach();
};
class LayerViewSupport;
mozilla::UniquePtr<LayerViewSupport> mLayerViewSupport;
// Object that implements native LayerView calls.
// Owned by the Java LayerView instance.
NativePtr<LayerViewSupport> mLayerViewSupport;
class NPZCSupport;
// Object that implements native NativePanZoomController calls.
// Owned by the Java NativePanZoomController instance.
NPZCSupport* mNPZCSupport;
NativePtr<NPZCSupport> mNPZCSupport;
class GeckoViewSupport;
// Object that implements native GeckoView calls and associated states.
// nullptr for nsWindows that were not opened from GeckoView.
// Because other objects get destroyed in the mGeckOViewSupport destructor,
// keep it last in the list, so its destructor is called first.
mozilla::UniquePtr<GeckoViewSupport> mGeckoViewSupport;
public:
static nsWindow* TopWindow();