--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
@@ -4,18 +4,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.gfx;
import org.mozilla.gecko.annotation.WrapForJNI;
import org.mozilla.gecko.mozglue.JNIObject;
import org.mozilla.gecko.util.ThreadUtils;
-import android.content.Context;
-import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.NonNull;
import android.util.Log;
import android.view.Surface;
public class LayerSession {
@@ -74,17 +72,17 @@ public class LayerSession {
LayerSession.this.onCompositorDetached();
disposeNative();
}
@WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")
@Override protected native void disposeNative();
@WrapForJNI(calledFrom = "any", dispatchTo = "gecko")
- public native void attachNPZC(NativePanZoomController npzc);
+ public native void attachNPZC(PanZoomController npzc);
@WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")
public native void onBoundsChanged(int left, int top, int width, int height);
// Gecko thread creates compositor; blocks UI thread.
@WrapForJNI(calledFrom = "ui", dispatchTo = "proxy")
public native void createCompositor(int width, int height, Object surface);
@@ -154,17 +152,17 @@ public class LayerSession {
LayerSession.this.onSelectionCaretDrag(dragging);
}
}
protected final Compositor mCompositor = new Compositor();
// All fields are accessed on UI thread only.
private final GeckoDisplay mDisplay = new GeckoDisplay(this);
- private NativePanZoomController mNPZC;
+ private PanZoomController mNPZC;
private OverscrollEdgeEffect mOverscroll;
private DynamicToolbarAnimator mToolbar;
private CompositorController mController;
private boolean mAttachedCompositor;
private boolean mCalledCreateCompositor;
private boolean mCompositorReady;
private Surface mSurface;
@@ -183,25 +181,25 @@ public class LayerSession {
/* package */ GeckoDisplay getDisplay() {
if (DEBUG) {
ThreadUtils.assertOnUiThread();
}
return mDisplay;
}
/**
- * Get the NativePanZoomController instance for this session.
+ * Get the PanZoomController instance for this session.
*
- * @return NativePanZoomController instance.
+ * @return PanZoomController instance.
*/
- public NativePanZoomController getPanZoomController() {
+ public PanZoomController getPanZoomController() {
ThreadUtils.assertOnUiThread();
if (mNPZC == null) {
- mNPZC = new NativePanZoomController(this);
+ mNPZC = new PanZoomController(this);
if (mAttachedCompositor) {
mCompositor.attachNPZC(mNPZC);
}
}
return mNPZC;
}
/**
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanZoomController.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanZoomController.java
@@ -13,17 +13,17 @@ import android.graphics.Rect;
import android.os.SystemClock;
import android.util.Log;
import android.util.Pair;
import android.view.MotionEvent;
import android.view.InputDevice;
import java.util.ArrayList;
-public final class NativePanZoomController extends JNIObject {
+public final class PanZoomController extends JNIObject {
private static final String LOGTAG = "GeckoNPZC";
private static final int EVENT_SOURCE_SCROLL = 0;
private static final int EVENT_SOURCE_MOTION = 1;
private static final int EVENT_SOURCE_MOUSE = 2;
private final LayerSession mSession;
private final Rect mTempRect = new Rect();
private boolean mAttached;
@@ -144,17 +144,17 @@ public final class NativePanZoomControll
mSession.getSurfaceBounds(mTempRect);
final float x = coords.x - mTempRect.left;
final float y = coords.y - mTempRect.top;
return handleMouseEvent(event.getActionMasked(), event.getEventTime(),
event.getMetaState(), x, y, event.getButtonState());
}
- /* package */ NativePanZoomController(final LayerSession session) {
+ /* package */ PanZoomController(final LayerSession session) {
mSession = session;
enableEventQueue();
}
/**
* Set the current scroll factor. The scroll factor is the maximum scroll amount that
* one scroll event may generate, in device pixels.
*
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
@@ -4,17 +4,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.geckoview;
import org.mozilla.gecko.AndroidGamepadManager;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.gfx.DynamicToolbarAnimator;
-import org.mozilla.gecko.gfx.NativePanZoomController;
+import org.mozilla.gecko.gfx.PanZoomController;
import org.mozilla.gecko.gfx.GeckoDisplay;
import org.mozilla.gecko.InputMethods;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.Region;
@@ -254,17 +254,17 @@ public class GeckoView extends FrameLayo
public EventDispatcher getEventDispatcher() {
return mSession.getEventDispatcher();
}
public GeckoSessionSettings getSettings() {
return mSession.getSettings();
}
- public NativePanZoomController getPanZoomController() {
+ public PanZoomController getPanZoomController() {
return mSession.getPanZoomController();
}
public DynamicToolbarAnimator getDynamicToolbarAnimator() {
return mSession.getDynamicToolbarAnimator();
}
@Override
--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -439,43 +439,43 @@ const JNINativeMethod LayerSession::Comp
::template Wrap<&Impl::SyncPauseCompositor>),
mozilla::jni::MakeNativeMethod<LayerSession::Compositor::SyncResumeResizeCompositor_t>(
mozilla::jni::NativeStub<LayerSession::Compositor::SyncResumeResizeCompositor_t, Impl>
::template Wrap<&Impl::SyncResumeResizeCompositor>)
};
template<class Impl>
-class NativePanZoomController::Natives : public mozilla::jni::NativeImpl<NativePanZoomController, Impl>
+class PanZoomController::Natives : public mozilla::jni::NativeImpl<PanZoomController, Impl>
{
public:
static const JNINativeMethod methods[5];
};
template<class Impl>
-const JNINativeMethod NativePanZoomController::Natives<Impl>::methods[] = {
+const JNINativeMethod PanZoomController::Natives<Impl>::methods[] = {
- mozilla::jni::MakeNativeMethod<NativePanZoomController::DisposeNative_t>(
- mozilla::jni::NativeStub<NativePanZoomController::DisposeNative_t, Impl>
+ mozilla::jni::MakeNativeMethod<PanZoomController::DisposeNative_t>(
+ mozilla::jni::NativeStub<PanZoomController::DisposeNative_t, Impl>
::template Wrap<&Impl::DisposeNative>),
- mozilla::jni::MakeNativeMethod<NativePanZoomController::HandleMotionEvent_t>(
- mozilla::jni::NativeStub<NativePanZoomController::HandleMotionEvent_t, Impl>
+ mozilla::jni::MakeNativeMethod<PanZoomController::HandleMotionEvent_t>(
+ mozilla::jni::NativeStub<PanZoomController::HandleMotionEvent_t, Impl>
::template Wrap<&Impl::HandleMotionEvent>),
- mozilla::jni::MakeNativeMethod<NativePanZoomController::HandleMouseEvent_t>(
- mozilla::jni::NativeStub<NativePanZoomController::HandleMouseEvent_t, Impl>
+ mozilla::jni::MakeNativeMethod<PanZoomController::HandleMouseEvent_t>(
+ mozilla::jni::NativeStub<PanZoomController::HandleMouseEvent_t, Impl>
::template Wrap<&Impl::HandleMouseEvent>),
- mozilla::jni::MakeNativeMethod<NativePanZoomController::HandleScrollEvent_t>(
- mozilla::jni::NativeStub<NativePanZoomController::HandleScrollEvent_t, Impl>
+ mozilla::jni::MakeNativeMethod<PanZoomController::HandleScrollEvent_t>(
+ mozilla::jni::NativeStub<PanZoomController::HandleScrollEvent_t, Impl>
::template Wrap<&Impl::HandleScrollEvent>),
- mozilla::jni::MakeNativeMethod<NativePanZoomController::SetIsLongpressEnabled_t>(
- mozilla::jni::NativeStub<NativePanZoomController::SetIsLongpressEnabled_t, Impl>
+ mozilla::jni::MakeNativeMethod<PanZoomController::SetIsLongpressEnabled_t>(
+ mozilla::jni::NativeStub<PanZoomController::SetIsLongpressEnabled_t, Impl>
::template Wrap<&Impl::SetIsLongpressEnabled>)
};
template<class Impl>
class VsyncSource::Natives : public mozilla::jni::NativeImpl<VsyncSource, Impl>
{
public:
static const JNINativeMethod methods[1];
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1340,56 +1340,56 @@ auto LayerSession::Compositor::UpdateOve
constexpr char LayerSession::Compositor::UpdateRootFrameMetrics_t::name[];
constexpr char LayerSession::Compositor::UpdateRootFrameMetrics_t::signature[];
auto LayerSession::Compositor::UpdateRootFrameMetrics(float a0, float a1, float a2) const -> void
{
return mozilla::jni::Method<UpdateRootFrameMetrics_t>::Call(Compositor::mCtx, nullptr, a0, a1, a2);
}
-const char NativePanZoomController::name[] =
- "org/mozilla/gecko/gfx/NativePanZoomController";
-
-constexpr char NativePanZoomController::DisposeNative_t::name[];
-constexpr char NativePanZoomController::DisposeNative_t::signature[];
-
-constexpr char NativePanZoomController::HandleMotionEvent_t::name[];
-constexpr char NativePanZoomController::HandleMotionEvent_t::signature[];
-
-constexpr char NativePanZoomController::HandleMouseEvent_t::name[];
-constexpr char NativePanZoomController::HandleMouseEvent_t::signature[];
-
-constexpr char NativePanZoomController::HandleScrollEvent_t::name[];
-constexpr char NativePanZoomController::HandleScrollEvent_t::signature[];
-
-constexpr char NativePanZoomController::SetIsLongpressEnabled_t::name[];
-constexpr char NativePanZoomController::SetIsLongpressEnabled_t::signature[];
-
-constexpr char NativePanZoomController::SetAttached_t::name[];
-constexpr char NativePanZoomController::SetAttached_t::signature[];
-
-auto NativePanZoomController::SetAttached(bool a0) const -> void
+const char PanZoomController::name[] =
+ "org/mozilla/gecko/gfx/PanZoomController";
+
+constexpr char PanZoomController::DisposeNative_t::name[];
+constexpr char PanZoomController::DisposeNative_t::signature[];
+
+constexpr char PanZoomController::HandleMotionEvent_t::name[];
+constexpr char PanZoomController::HandleMotionEvent_t::signature[];
+
+constexpr char PanZoomController::HandleMouseEvent_t::name[];
+constexpr char PanZoomController::HandleMouseEvent_t::signature[];
+
+constexpr char PanZoomController::HandleScrollEvent_t::name[];
+constexpr char PanZoomController::HandleScrollEvent_t::signature[];
+
+constexpr char PanZoomController::SetIsLongpressEnabled_t::name[];
+constexpr char PanZoomController::SetIsLongpressEnabled_t::signature[];
+
+constexpr char PanZoomController::SetAttached_t::name[];
+constexpr char PanZoomController::SetAttached_t::signature[];
+
+auto PanZoomController::SetAttached(bool a0) const -> void
{
- return mozilla::jni::Method<SetAttached_t>::Call(NativePanZoomController::mCtx, nullptr, a0);
+ return mozilla::jni::Method<SetAttached_t>::Call(PanZoomController::mCtx, nullptr, a0);
}
-constexpr char NativePanZoomController::SynthesizeNativeMouseEvent_t::name[];
-constexpr char NativePanZoomController::SynthesizeNativeMouseEvent_t::signature[];
-
-auto NativePanZoomController::SynthesizeNativeMouseEvent(int32_t a0, int32_t a1, int32_t a2) const -> void
+constexpr char PanZoomController::SynthesizeNativeMouseEvent_t::name[];
+constexpr char PanZoomController::SynthesizeNativeMouseEvent_t::signature[];
+
+auto PanZoomController::SynthesizeNativeMouseEvent(int32_t a0, int32_t a1, int32_t a2) const -> void
{
- return mozilla::jni::Method<SynthesizeNativeMouseEvent_t>::Call(NativePanZoomController::mCtx, nullptr, a0, a1, a2);
+ return mozilla::jni::Method<SynthesizeNativeMouseEvent_t>::Call(PanZoomController::mCtx, nullptr, a0, a1, a2);
}
-constexpr char NativePanZoomController::SynthesizeNativeTouchPoint_t::name[];
-constexpr char NativePanZoomController::SynthesizeNativeTouchPoint_t::signature[];
-
-auto NativePanZoomController::SynthesizeNativeTouchPoint(int32_t a0, int32_t a1, int32_t a2, int32_t a3, double a4, int32_t a5) const -> void
+constexpr char PanZoomController::SynthesizeNativeTouchPoint_t::name[];
+constexpr char PanZoomController::SynthesizeNativeTouchPoint_t::signature[];
+
+auto PanZoomController::SynthesizeNativeTouchPoint(int32_t a0, int32_t a1, int32_t a2, int32_t a3, double a4, int32_t a5) const -> void
{
- return mozilla::jni::Method<SynthesizeNativeTouchPoint_t>::Call(NativePanZoomController::mCtx, nullptr, a0, a1, a2, a3, a4, a5);
+ return mozilla::jni::Method<SynthesizeNativeTouchPoint_t>::Call(PanZoomController::mCtx, nullptr, a0, a1, a2, a3, a4, a5);
}
const char StackScroller::name[] =
"org/mozilla/gecko/gfx/StackScroller";
constexpr char StackScroller::New_t::name[];
constexpr char StackScroller::New_t::signature[];
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -3746,17 +3746,17 @@ public:
struct AttachNPZC_t {
typedef Compositor Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "attachNPZC";
static constexpr char signature[] =
- "(Lorg/mozilla/gecko/gfx/NativePanZoomController;)V";
+ "(Lorg/mozilla/gecko/gfx/PanZoomController;)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::GECKO;
};
@@ -4149,42 +4149,42 @@ public:
auto UpdateRootFrameMetrics(float, float, float) const -> void;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
template<class Impl> class Natives;
};
-class NativePanZoomController : public mozilla::jni::ObjectBase<NativePanZoomController>
+class PanZoomController : public mozilla::jni::ObjectBase<PanZoomController>
{
public:
static const char name[];
- explicit NativePanZoomController(const Context& ctx) : ObjectBase<NativePanZoomController>(ctx) {}
+ explicit PanZoomController(const Context& ctx) : ObjectBase<PanZoomController>(ctx) {}
struct DisposeNative_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<> Args;
static constexpr char name[] = "disposeNative";
static constexpr char signature[] =
"()V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::GECKO;
};
struct HandleMotionEvent_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef bool ReturnType;
typedef bool SetterType;
typedef mozilla::jni::Args<
int32_t,
int32_t,
int64_t,
int32_t,
mozilla::jni::IntArray::Param,
@@ -4202,17 +4202,17 @@ public:
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
struct HandleMouseEvent_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef bool ReturnType;
typedef bool SetterType;
typedef mozilla::jni::Args<
int32_t,
int64_t,
int32_t,
float,
float,
@@ -4225,17 +4225,17 @@ public:
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
struct HandleScrollEvent_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef bool ReturnType;
typedef bool SetterType;
typedef mozilla::jni::Args<
int64_t,
int32_t,
float,
float,
float,
@@ -4248,17 +4248,17 @@ public:
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
struct SetIsLongpressEnabled_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
bool> Args;
static constexpr char name[] = "nativeSetIsLongpressEnabled";
static constexpr char signature[] =
"(Z)V";
static const bool isStatic = false;
@@ -4266,17 +4266,17 @@ public:
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
struct SetAttached_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
bool> Args;
static constexpr char name[] = "setAttached";
static constexpr char signature[] =
"(Z)V";
static const bool isStatic = false;
@@ -4286,17 +4286,17 @@ public:
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
auto SetAttached(bool) const -> void;
struct SynthesizeNativeMouseEvent_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
int32_t,
int32_t,
int32_t> Args;
static constexpr char name[] = "synthesizeNativeMouseEvent";
static constexpr char signature[] =
@@ -4308,17 +4308,17 @@ public:
mozilla::jni::CallingThread::UI;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
auto SynthesizeNativeMouseEvent(int32_t, int32_t, int32_t) const -> void;
struct SynthesizeNativeTouchPoint_t {
- typedef NativePanZoomController Owner;
+ typedef PanZoomController Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
int32_t,
int32_t,
int32_t,
int32_t,
double,
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -302,49 +302,49 @@ public:
void AttachEditable(const GeckoSession::Window::LocalRef& inst,
jni::Object::Param aEditableParent,
jni::Object::Param aEditableChild);
void OnReady(jni::Object::Param aQueue = nullptr);
};
/**
- * NativePanZoomController handles its native calls on the UI thread, so make
+ * PanZoomController handles its native calls on the UI thread, so make
* it separate from GeckoViewSupport.
*/
class nsWindow::NPZCSupport final
- : public NativePanZoomController::Natives<NPZCSupport>
+ : public PanZoomController::Natives<NPZCSupport>
{
using LockedWindowPtr = WindowPtr<NPZCSupport>::Locked;
static bool sNegateWheelScroll;
WindowPtr<NPZCSupport> mWindow;
- NativePanZoomController::GlobalRef mNPZC;
+ PanZoomController::GlobalRef mNPZC;
int mPreviousButtons;
template<typename Lambda>
class InputEvent final : public nsAppShell::Event
{
- NativePanZoomController::GlobalRef mNPZC;
+ PanZoomController::GlobalRef mNPZC;
Lambda mLambda;
public:
InputEvent(const NPZCSupport* aNPZCSupport, Lambda&& aLambda)
: mNPZC(aNPZCSupport->mNPZC)
, mLambda(mozilla::Move(aLambda))
{}
void Run() override
{
MOZ_ASSERT(NS_IsMainThread());
JNIEnv* const env = jni::GetGeckoThreadEnv();
NPZCSupport* npzcSupport = GetNative(
- NativePanZoomController::LocalRef(env, mNPZC));
+ PanZoomController::LocalRef(env, mNPZC));
if (!npzcSupport || !npzcSupport->mWindow) {
// We already shut down.
env->ExceptionClear();
return;
}
nsWindow* const window = npzcSupport->mWindow;
@@ -362,20 +362,20 @@ class nsWindow::NPZCSupport final
void PostInputEvent(Lambda&& aLambda)
{
// Use priority queue for input events.
nsAppShell::PostEvent(MakeUnique<InputEvent<Lambda>>(
this, mozilla::Move(aLambda)));
}
public:
- typedef NativePanZoomController::Natives<NPZCSupport> Base;
+ typedef PanZoomController::Natives<NPZCSupport> Base;
NPZCSupport(NativePtr<NPZCSupport>* aPtr, nsWindow* aWindow,
- const NativePanZoomController::LocalRef& aNPZC)
+ const PanZoomController::LocalRef& aNPZC)
: mWindow(aPtr, aWindow)
, mNPZC(aNPZC)
, mPreviousButtons(0)
{
MOZ_ASSERT(mWindow);
static bool sInited;
if (!sInited) {
@@ -420,33 +420,33 @@ public:
// 6) is solved by keeping a destroyed flag in the Java NPZC instance,
// and only make a pending call if the destroyed flag is not set.
//
// 7) is solved by taking a lock whenever mWindow is modified on the
// Gecko thread or accessed on the UI thread. That way, we don't
// release mWindow until the UI thread is done using it, thus avoiding
// the race condition.
- typedef NativePanZoomController::GlobalRef NPZCRef;
+ typedef PanZoomController::GlobalRef NPZCRef;
auto callDestroy = [] (const NPZCRef& npzc) {
npzc->SetAttached(false);
};
- NativePanZoomController::GlobalRef npzc = mNPZC;
+ PanZoomController::GlobalRef npzc = mNPZC;
RefPtr<nsThread> uiThread = GetAndroidUiThread();
if (!uiThread) {
return;
}
uiThread->Dispatch(NewRunnableFunction(
"OnDetachRunnable",
static_cast<void(*)(const NPZCRef&)>(callDestroy),
mozilla::Move(npzc)), nsIThread::DISPATCH_NORMAL);
}
- const NativePanZoomController::Ref& GetJavaNPZC() const
+ const PanZoomController::Ref& GetJavaNPZC() const
{
return mNPZC;
}
public:
void SetIsLongpressEnabled(bool aIsLongpressEnabled)
{
RefPtr<IAPZCTreeManager> controller;
@@ -616,17 +616,17 @@ public:
WidgetMouseEvent mouseEvent = input.ToWidgetMouseEvent(window);
window->ProcessUntransformedAPZEvent(&mouseEvent, guid,
blockId, status);
});
return true;
}
- bool HandleMotionEvent(const NativePanZoomController::LocalRef& aInstance,
+ bool HandleMotionEvent(const PanZoomController::LocalRef& aInstance,
int32_t aAction, int32_t aActionIndex,
int64_t aTime, int32_t aMetaState,
jni::IntArray::Param aPointerId,
jni::FloatArray::Param aX,
jni::FloatArray::Param aY,
jni::FloatArray::Param aOrientation,
jni::FloatArray::Param aPressure,
jni::FloatArray::Param aToolMajor,
@@ -898,23 +898,23 @@ public:
MOZ_ASSERT(NS_IsMainThread());
if (!mWindow) {
return; // Already shut down.
}
MOZ_ASSERT(aNPZC);
MOZ_ASSERT(!mWindow->mNPZCSupport);
- auto npzc = NativePanZoomController::LocalRef(
+ auto npzc = PanZoomController::LocalRef(
jni::GetGeckoThreadEnv(),
- NativePanZoomController::Ref::From(aNPZC));
+ PanZoomController::Ref::From(aNPZC));
mWindow->mNPZCSupport.Attach(npzc, mWindow, npzc);
DispatchToUiThread("LayerViewSupport::AttachNPZC",
- [npzc = NativePanZoomController::GlobalRef(npzc)] {
+ [npzc = PanZoomController::GlobalRef(npzc)] {
npzc->SetAttached(true);
});
}
void OnBoundsChanged(int32_t aLeft, int32_t aTop,
int32_t aWidth, int32_t aHeight)
{
MOZ_ASSERT(NS_IsMainThread());
@@ -2159,17 +2159,17 @@ nsWindow::SynthesizeNativeTouchPoint(uin
MOZ_ASSERT(mNPZCSupport);
const auto& npzc = mNPZCSupport->GetJavaNPZC();
const auto& bounds = FindTopLevel()->mBounds;
aPoint.x -= bounds.x;
aPoint.y -= bounds.y;
DispatchToUiThread(
"nsWindow::SynthesizeNativeTouchPoint",
- [npzc = NativePanZoomController::GlobalRef(npzc),
+ [npzc = PanZoomController::GlobalRef(npzc),
aPointerId, eventType, aPoint,
aPointerPressure, aPointerOrientation] {
npzc->SynthesizeNativeTouchPoint(aPointerId, eventType,
aPoint.x, aPoint.y,
aPointerPressure,
aPointerOrientation);
});
return NS_OK;
@@ -2186,17 +2186,17 @@ nsWindow::SynthesizeNativeMouseEvent(Lay
MOZ_ASSERT(mNPZCSupport);
const auto& npzc = mNPZCSupport->GetJavaNPZC();
const auto& bounds = FindTopLevel()->mBounds;
aPoint.x -= bounds.x;
aPoint.y -= bounds.y;
DispatchToUiThread(
"nsWindow::SynthesizeNativeMouseEvent",
- [npzc = NativePanZoomController::GlobalRef(npzc),
+ [npzc = PanZoomController::GlobalRef(npzc),
aNativeMessage, aPoint] {
npzc->SynthesizeNativeMouseEvent(aNativeMessage,
aPoint.x, aPoint.y);
});
return NS_OK;
}
nsresult
@@ -2208,17 +2208,17 @@ nsWindow::SynthesizeNativeMouseMove(Layo
MOZ_ASSERT(mNPZCSupport);
const auto& npzc = mNPZCSupport->GetJavaNPZC();
const auto& bounds = FindTopLevel()->mBounds;
aPoint.x -= bounds.x;
aPoint.y -= bounds.y;
DispatchToUiThread(
"nsWindow::SynthesizeNativeMouseMove",
- [npzc = NativePanZoomController::GlobalRef(npzc), aPoint] {
+ [npzc = PanZoomController::GlobalRef(npzc), aPoint] {
npzc->SynthesizeNativeMouseEvent(sdk::MotionEvent::ACTION_HOVER_MOVE,
aPoint.x, aPoint.y);
});
return NS_OK;
}
bool
nsWindow::WidgetPaintsBackground()