Bug 1335895 - part 22: update AndroidCompositorWidget to remove frame metrics sync r=jchen,kats
--- a/widget/android/AndroidCompositorWidget.cpp
+++ b/widget/android/AndroidCompositorWidget.cpp
@@ -5,65 +5,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "AndroidCompositorWidget.h"
#include "nsWindow.h"
namespace mozilla {
namespace widget {
-void
-AndroidCompositorWidget::SetFirstPaintViewport(const LayerIntPoint& aOffset,
- const CSSToLayerScale& aZoom,
- const CSSRect& aCssPageRect)
-{
- auto layerClient = static_cast<nsWindow*>(RealWidget())->GetLayerClient();
- if (!layerClient) {
- return;
- }
-
- layerClient->SetFirstPaintViewport(
- float(aOffset.x), float(aOffset.y), aZoom.scale, aCssPageRect.x,
- aCssPageRect.y, aCssPageRect.XMost(), aCssPageRect.YMost());
-}
-
-void
-AndroidCompositorWidget::SyncFrameMetrics(const ParentLayerPoint& aScrollOffset,
- const CSSToParentLayerScale& aZoom,
- const CSSRect& aCssPageRect,
- const CSSRect& aDisplayPort,
- const CSSToLayerScale& aPaintedResolution,
- bool aLayersUpdated,
- int32_t aPaintSyncId,
- ScreenMargin& aFixedLayerMargins)
-{
- auto layerClient = static_cast<nsWindow*>(RealWidget())->GetLayerClient();
- if (!layerClient) {
- return;
- }
-
- // convert the displayport rect from document-relative CSS pixels to
- // document-relative device pixels
- LayerIntRect dp = gfx::RoundedToInt(aDisplayPort * aPaintedResolution);
-
- java::ViewTransform::LocalRef viewTransform = layerClient->SyncFrameMetrics(
- aScrollOffset.x, aScrollOffset.y, aZoom.scale,
- aCssPageRect.x, aCssPageRect.y,
- aCssPageRect.XMost(), aCssPageRect.YMost(),
- dp.x, dp.y, dp.width, dp.height,
- aPaintedResolution.scale, aLayersUpdated, aPaintSyncId);
-
- MOZ_ASSERT(viewTransform, "No view transform object!");
-
- aFixedLayerMargins.top = viewTransform->FixedLayerMarginTop();
- aFixedLayerMargins.right = viewTransform->FixedLayerMarginRight();
- aFixedLayerMargins.bottom = viewTransform->FixedLayerMarginBottom();
- aFixedLayerMargins.left = viewTransform->FixedLayerMarginLeft();
-}
-
EGLNativeWindowType
AndroidCompositorWidget::GetEGLNativeWindow()
{
return (EGLNativeWindowType)mWidget->GetNativeData(NS_JAVA_SURFACE);
}
EGLNativeWindowType
AndroidCompositorWidget::GetPresentationEGLSurface()
--- a/widget/android/AndroidCompositorWidget.h
+++ b/widget/android/AndroidCompositorWidget.h
@@ -24,29 +24,16 @@ namespace widget {
*/
class AndroidCompositorWidget final : public InProcessCompositorWidget
{
public:
using InProcessCompositorWidget::InProcessCompositorWidget;
AndroidCompositorWidget* AsAndroid() override { return this; }
- void SetFirstPaintViewport(const LayerIntPoint& aOffset,
- const CSSToLayerScale& aZoom,
- const CSSRect& aCssPageRect);
-
- void SyncFrameMetrics(const ParentLayerPoint& aScrollOffset,
- const CSSToParentLayerScale& aZoom,
- const CSSRect& aCssPageRect,
- const CSSRect& aDisplayPort,
- const CSSToLayerScale& aPaintedResolution,
- bool aLayersUpdated,
- int32_t aPaintSyncId,
- ScreenMargin& aFixedLayerMargins);
-
EGLNativeWindowType GetEGLNativeWindow();
EGLSurface GetPresentationEGLSurface();
void SetPresentationEGLSurface(EGLSurface aVal);
ANativeWindow* GetPresentationANativeWindow();
};