Bug 1379252 - Remove unused argument. r?rbarker
MozReview-Commit-ID: 7G8i0G9LyvZ
--- a/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp
+++ b/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp
@@ -1012,20 +1012,20 @@ AndroidDynamicToolbarAnimator::UpdateFra
(mControllerToolbarHeight != mControllerMaxToolbarHeight) &&
!mPinnedFlags) {
// The end of the page has been reached, the page is twice the height of the visible height,
// and the toolbar is not completely visible so animate it into view.
StartCompositorAnimation(MOVE_TOOLBAR_DOWN, eAnimate, mControllerToolbarHeight, /* wait for page resize */ true);
}
RefPtr<UiCompositorControllerParent> uiController = UiCompositorControllerParent::GetFromRootLayerTreeId(mRootLayerTreeId);
MOZ_ASSERT(uiController);
- CompositorThreadHolder::Loop()->PostTask(NewRunnableMethod<ScreenPoint, CSSToScreenScale, CSSRect>(
+ CompositorThreadHolder::Loop()->PostTask(NewRunnableMethod<ScreenPoint, CSSToScreenScale>(
"UiCompositorControllerParent::SendRootFrameMetrics",
uiController, &UiCompositorControllerParent::SendRootFrameMetrics,
- aScrollOffset, aScale, aCssPageRect));
+ aScrollOffset, aScale));
}
}
bool
AndroidDynamicToolbarAnimator::PageTooSmallEnsureToolbarVisible()
{
MOZ_ASSERT(APZThreadUtils::IsControllerThread());
// if the page is too small then the toolbar can not be hidden
--- a/gfx/layers/ipc/PUiCompositorController.ipdl
+++ b/gfx/layers/ipc/PUiCompositorController.ipdl
@@ -35,14 +35,14 @@ parent:
async Pinned(bool aPinned, int32_t aReason);
async ToolbarAnimatorMessageFromUI(int32_t aMessage);
async DefaultClearColor(uint32_t aColor);
async RequestScreenPixels();
async EnableLayerUpdateNotifications(bool aEnable);
async ToolbarPixelsToCompositor(Shmem aMem, ScreenIntSize aSize);
child:
async ToolbarAnimatorMessageFromCompositor(int32_t aMessage);
- async RootFrameMetrics(ScreenPoint aScrollOffset, CSSToScreenScale aZoom, CSSRect aPage);
+ async RootFrameMetrics(ScreenPoint aScrollOffset, CSSToScreenScale aZoom);
async ScreenPixels(Shmem aMem, ScreenIntSize aSize);
};
} // layers
} // mozilla
--- a/gfx/layers/ipc/UiCompositorControllerChild.cpp
+++ b/gfx/layers/ipc/UiCompositorControllerChild.cpp
@@ -270,21 +270,21 @@ UiCompositorControllerChild::RecvToolbar
mWidget->RecvToolbarAnimatorMessageFromCompositor(aMessage);
}
#endif // defined(MOZ_WIDGET_ANDROID)
return IPC_OK();
}
mozilla::ipc::IPCResult
-UiCompositorControllerChild::RecvRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage)
+UiCompositorControllerChild::RecvRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom)
{
#if defined(MOZ_WIDGET_ANDROID)
if (mWidget) {
- mWidget->UpdateRootFrameMetrics(aScrollOffset, aZoom, aPage);
+ mWidget->UpdateRootFrameMetrics(aScrollOffset, aZoom);
}
#endif // defined(MOZ_WIDGET_ANDROID)
return IPC_OK();
}
mozilla::ipc::IPCResult
UiCompositorControllerChild::RecvScreenPixels(ipc::Shmem&& aMem, const ScreenIntSize& aSize)
--- a/gfx/layers/ipc/UiCompositorControllerChild.h
+++ b/gfx/layers/ipc/UiCompositorControllerChild.h
@@ -48,17 +48,17 @@ public:
bool DeallocPixelBuffer(Shmem& aMem);
protected:
void ActorDestroy(ActorDestroyReason aWhy) override;
void DeallocPUiCompositorControllerChild() override;
void ProcessingError(Result aCode, const char* aReason) override;
virtual void HandleFatalError(const char* aName, const char* aMsg) const override;
mozilla::ipc::IPCResult RecvToolbarAnimatorMessageFromCompositor(const int32_t& aMessage) override;
- mozilla::ipc::IPCResult RecvRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage) override;
+ mozilla::ipc::IPCResult RecvRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override;
mozilla::ipc::IPCResult RecvScreenPixels(ipc::Shmem&& aMem, const ScreenIntSize& aSize) override;
private:
explicit UiCompositorControllerChild(const uint64_t& aProcessToken);
~UiCompositorControllerChild();
void OpenForSameProcess();
void OpenForGPUProcess(Endpoint<PUiCompositorControllerChild>&& aEndpoint);
void SendCachedValues();
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -210,18 +210,17 @@ class GeckoLayerClient implements LayerV
}
/** The compositor invokes this function just before compositing a frame where the document
* is different from the document composited on the last frame. In these cases, the viewport
* information we have in Java is no longer valid and needs to be replaced with the new
* viewport information provided.
*/
@WrapForJNI(calledFrom = "ui")
- public void updateRootFrameMetrics(float scrollX, float scrollY, float zoom,
- float cssPageLeft, float cssPageTop, float cssPageRight, float cssPageBottom) {
+ public void updateRootFrameMetrics(float scrollX, float scrollY, float zoom) {
mViewportMetrics = mViewportMetrics.setViewportOrigin(scrollX, scrollY)
.setZoomFactor(zoom);
mToolbarAnimator.onMetricsChanged(mViewportMetrics);
mContentDocumentIsDisplayed = true;
}
class PointerInfo {
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1043,19 +1043,19 @@ constexpr char GeckoLayerClient::Synthes
auto GeckoLayerClient::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(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5);
}
constexpr char GeckoLayerClient::UpdateRootFrameMetrics_t::name[];
constexpr char GeckoLayerClient::UpdateRootFrameMetrics_t::signature[];
-auto GeckoLayerClient::UpdateRootFrameMetrics(float a0, float a1, float a2, float a3, float a4, float a5, float a6) const -> void
+auto GeckoLayerClient::UpdateRootFrameMetrics(float a0, float a1, float a2) const -> void
{
- return mozilla::jni::Method<UpdateRootFrameMetrics_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2, a3, a4, a5, a6);
+ return mozilla::jni::Method<UpdateRootFrameMetrics_t>::Call(GeckoLayerClient::mCtx, nullptr, a0, a1, a2);
}
const char GeckoSurface::name[] =
"org/mozilla/gecko/gfx/GeckoSurface";
constexpr char GeckoSurface::New_t::name[];
constexpr char GeckoSurface::New_t::signature[];
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -3283,34 +3283,30 @@ public:
struct UpdateRootFrameMetrics_t {
typedef GeckoLayerClient Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
float,
float,
- float,
- float,
- float,
- float,
float> Args;
static constexpr char name[] = "updateRootFrameMetrics";
static constexpr char signature[] =
- "(FFFFFFF)V";
+ "(FFF)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::CURRENT;
};
- auto UpdateRootFrameMetrics(float, float, float, float, float, float, float) const -> void;
+ auto UpdateRootFrameMetrics(float, float, float) const -> void;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class GeckoSurface : public mozilla::jni::ObjectBase<GeckoSurface>
{
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -2346,25 +2346,22 @@ nsWindow::RecvToolbarAnimatorMessageFrom
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
if (NativePtr<LayerViewSupport>::Locked lvs{mLayerViewSupport}) {
lvs->RecvToolbarAnimatorMessage(aMessage);
}
}
void
-nsWindow::UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage)
+nsWindow::UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom)
{
-
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
if (NativePtr<LayerViewSupport>::Locked lvs{mLayerViewSupport}) {
GeckoLayerClient::LocalRef client = lvs->GetLayerClient();
- client->UpdateRootFrameMetrics(aScrollOffset.x, aScrollOffset.y, aZoom.scale,
- aPage.x, aPage.y,
- aPage.XMost(), aPage.YMost());
+ client->UpdateRootFrameMetrics(aScrollOffset.x, aScrollOffset.y, aZoom.scale);
}
}
void
nsWindow::RecvScreenPixels(Shmem&& aMem, const ScreenIntSize& aSize)
{
MOZ_ASSERT(AndroidBridge::IsJavaUiThread());
if (NativePtr<LayerViewSupport>::Locked lvs{mLayerViewSupport}) {
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -314,17 +314,17 @@ public:
// Call this function when the users activity is the direct cause of an
// event (like a keypress or mouse click).
void UserActivity();
mozilla::java::GeckoEditable::Ref& GetEditableParent() { return mEditable; }
void RecvToolbarAnimatorMessageFromCompositor(int32_t aMessage) override;
- void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage) override;
+ void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override;
void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) override;
protected:
void BringToFront();
nsWindow *FindTopLevel();
bool IsTopLevel();
void ConfigureAPZControllerThread() override;
void DispatchHitTest(const mozilla::WidgetTouchEvent& aEvent);
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -401,17 +401,17 @@ public:
// resize (i.e. when the window contents are repainting during the resize,
// such as when the user drags a window border). It will suppress the
// displayport during the live resize to avoid unneccessary overpainting.
void NotifyLiveResizeStarted();
void NotifyLiveResizeStopped();
#if defined(MOZ_WIDGET_ANDROID)
void RecvToolbarAnimatorMessageFromCompositor(int32_t) override {};
- void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage) override {};
+ void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override {};
void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) override {};
#endif
protected:
// These are methods for CompositorWidgetWrapper, and should only be
// accessed from that class. Derived widgets can choose which methods to
// implement, or none if supporting out-of-process compositing.
virtual bool PreRender(mozilla::widget::WidgetRenderingContext* aContext) {
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -2067,19 +2067,18 @@ public:
*/
virtual void RecvToolbarAnimatorMessageFromCompositor(int32_t aMessage) = 0;
/**
* UpdateRootFrameMetrics steady state frame metrics send from compositor thread
*
* @param aScrollOffset page scroll offset value in screen pixels.
* @param aZoom current page zoom.
- * @param aPage bounds of the page in CSS coordinates.
*/
- virtual void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom, const CSSRect& aPage) = 0;
+ virtual void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) = 0;
/**
* RecvScreenPixels Buffer containing the pixel from the frame buffer. Used for android robocop tests.
*
* @param aMem shared memory containing the frame buffer pixels.
* @param aSize size of the buffer in screen pixels.
*/
virtual void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) = 0;