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 1297836 - Don't use WindowEvent for LayerViewSupport; r=snorp

Browse Source 
Now that nsWindow doesn't own LayerViewSupport, we shouldn't be using
WindowEvent for LayerViewSupport calls. This patch converts the calls
that dispatch to proxy to dispatch directly to Gecko. For
SyncResumeResizeCompositor, it used a proxy to call OnResumedCompositor
on the Gecko thread; this patch makes SyncResumeResizeCompositor post an
event to call OnResumedCompositor directly, without going through the
proxy.
This commit is contained in:
Jim Chen 2016-08-26 12:25:57 -04:00
parent 5a0ee6a6ba
commit 4c8cec0df5
3 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,15 +79,15 @@ public class LayerView extends ScrollView implements Tabs.OnTabsChangedListener
public Compositor() {
}
@WrapForJNI(calledFrom = "ui", dispatchTo = "proxy")
@WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")
@Override protected native void disposeNative();
// Gecko thread sets its Java instances; does not block UI thread.
@WrapForJNI(calledFrom = "any", dispatchTo = "proxy")
@WrapForJNI(calledFrom = "any", dispatchTo = "gecko")
/* package */ native void attachToJava(GeckoLayerClient layerClient,
NativePanZoomController npzc);
@WrapForJNI(calledFrom = "any", dispatchTo = "proxy")
@WrapForJNI(calledFrom = "any", dispatchTo = "gecko")
/* package */ native void onSizeChanged(int windowWidth, int windowHeight,
int screenWidth, int screenHeight);
@ -100,7 +100,7 @@ public class LayerView extends ScrollView implements Tabs.OnTabsChangedListener
/* package */ native void syncPauseCompositor();
// UI thread resumes compositor and notifies Gecko thread; does not block UI thread.
@WrapForJNI(calledFrom = "ui", dispatchTo = "proxy")
@WrapForJNI(calledFrom = "ui", dispatchTo = "current")
/* package */ native void syncResumeResizeCompositor(int width, int height);
@WrapForJNI(calledFrom = "any", dispatchTo = "current")

8
widget/android/GeneratedJNIWrappers.h
View File

@ -4624,7 +4624,7 @@ public:
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::PROXY;
mozilla::jni::DispatchTarget::GECKO;
};
struct CreateCompositor_t {
@ -4679,7 +4679,7 @@ public:
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::PROXY;
mozilla::jni::DispatchTarget::GECKO;
};
struct GetSurface_t {
@ -4719,7 +4719,7 @@ public:
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::PROXY;
mozilla::jni::DispatchTarget::GECKO;
};
struct Reattach_t {
@ -4791,7 +4791,7 @@ public:
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::PROXY;
mozilla::jni::DispatchTarget::CURRENT;
};
static const mozilla::jni::CallingThread callingThread =

71
widget/android/nsWindow.cpp
View File

@ -987,32 +987,10 @@ public:
{
if (aCall.IsTarget(&LayerViewSupport::CreateCompositor)) {
// This call is blocking.
nsAppShell::SyncRunEvent(WindowEvent<Functor>(
nsAppShell::SyncRunEvent(nsAppShell::LambdaEvent<Functor>(
mozilla::Move(aCall)), &LayerViewEvent::MakeEvent);
return;
} else if (aCall.IsTarget(
&LayerViewSupport::SyncResumeResizeCompositor)) {
// This call is synchronous. Perform the original call using a copy
// of the lambda. Then redirect the original lambda to
// OnResumedCompositor, to be run on the Gecko thread. We use
// Functor instead of our own lambda so that Functor can handle
// object lifetimes for us.
(Functor(aCall))();
aCall.SetTarget(&LayerViewSupport::OnResumedCompositor);
nsAppShell::PostEvent(
mozilla::MakeUnique<LayerViewEvent>(
mozilla::MakeUnique<WindowEvent<Functor>>(
mozilla::Move(aCall))));
return;
}
// LayerViewEvent (i.e. prioritized event) applies to
// CreateCompositor, PauseCompositor, and OnResumedCompositor. For all
// other events, use regular WindowEvent.
nsAppShell::PostEvent(
mozilla::MakeUnique<WindowEvent<Functor>>(
mozilla::Move(aCall)));
}
static LayerViewSupport*
@ -1056,7 +1034,7 @@ public:
}
private:
void OnResumedCompositor(int32_t aWidth, int32_t aHeight)
void OnResumedCompositor()
{
MOZ_ASSERT(NS_IsMainThread());
@ -1079,6 +1057,9 @@ public:
void AttachToJava(jni::Object::Param aClient, jni::Object::Param aNPZC)
{
MOZ_ASSERT(NS_IsMainThread());
if (!mWindow) {
return; // Already shut down.
}
const auto& layerClient = GeckoLayerClient::Ref::From(aClient);
@ -1113,6 +1094,9 @@ public:
int32_t aScreenWidth, int32_t aScreenHeight)
{
MOZ_ASSERT(NS_IsMainThread());
if (!mWindow) {
return; // Already shut down.
}
if (aWindowWidth != mWindow->mBounds.width ||
aWindowHeight != mWindow->mBounds.height) {
@ -1124,10 +1108,11 @@ public:
void CreateCompositor(int32_t aWidth, int32_t aHeight)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mWindow);
mWindow->CreateLayerManager(aWidth, aHeight);
mCompositorPaused = false;
OnResumedCompositor(aWidth, aHeight);
OnResumedCompositor();
}
void SyncPauseCompositor()
@ -1161,7 +1146,8 @@ public:
}
}
void SyncResumeResizeCompositor(int32_t aWidth, int32_t aHeight)
void SyncResumeResizeCompositor(const LayerView::Compositor::LocalRef& aObj,
int32_t aWidth, int32_t aHeight)
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
@ -1171,10 +1157,37 @@ public:
bridge = window->GetCompositorBridgeParent();
}
if (bridge && bridge->ScheduleResumeOnCompositorThread(aWidth,
aHeight)) {
mCompositorPaused = false;
if (!bridge || !bridge->ScheduleResumeOnCompositorThread(aWidth,
aHeight)) {
return;
}
mCompositorPaused = false;
class OnResumedEvent : public nsAppShell::Event
{
LayerView::Compositor::GlobalRef mCompositor;
public:
OnResumedEvent(LayerView::Compositor::GlobalRef&& aCompositor)
: mCompositor(mozilla::Move(aCompositor))
{}
void Run() override
{
MOZ_ASSERT(NS_IsMainThread());
JNIEnv* const env = jni::GetGeckoThreadEnv();
LayerViewSupport* const lvs = GetNative(
LayerView::Compositor::LocalRef(env, mCompositor));
MOZ_CATCH_JNI_EXCEPTION(env);
lvs->OnResumedCompositor();
}
};
nsAppShell::PostEvent(MakeUnique<LayerViewEvent>(
MakeUnique<OnResumedEvent>(aObj)));
}
void SyncInvalidateAndScheduleComposite()