--- a/gfx/layers/apz/src/APZCTreeManager.cpp+++ b/gfx/layers/apz/src/APZCTreeManager.cpp@@ -442,33 +442,33 @@ APZCTreeManager::UpdateHitTestingTree(ui WebRenderScrollDataWrapper wrapper(&aScrollData); UpdateHitTestingTreeImpl(aRootLayerTreeId, wrapper, aIsFirstPaint, aOriginatingLayersId, aPaintSequenceNumber); } bool APZCTreeManager::PushStateToWR(wr::WebRenderAPI* aWrApi, const TimeStamp& aSampleTime,- nsTArray<WrTransformProperty>& aTransformArray)+ nsTArray<wr::WrTransformProperty>& aTransformArray) { APZThreadUtils::AssertOnCompositorThread(); MOZ_ASSERT(aWrApi); MutexAutoLock lock(mTreeLock); // During the first pass through the tree, we build a cache of guid->HTTN so // that we can find the relevant APZC instances quickly in subsequent passes, // such as the one below to generate scrollbar transforms. Without this, perf // could end up being O(n^2) instead of O(n log n) because we'd have to search // the tree to find the corresponding APZC every time we hit a thumb node. std::unordered_map<ScrollableLayerGuid, HitTestingTreeNode*, ScrollableLayerGuidHash> httnMap; bool activeAnimations = false; uint64_t lastLayersId = -1;- WrPipelineId lastPipelineId;+ wr::WrPipelineId lastPipelineId; // We iterate backwards here because the HitTestingTreeNode is optimized // for backwards iteration. The equivalent code in AsyncCompositionManager // iterates forwards, but the direction shouldn't really matter in practice // so we do what's faster. In the future, if we need to start doing the // equivalent of AlignFixedAndStickyLayers here, then the order will become // important and we'll need to take that into consideration. ForEachNode<ReverseIterator>(mRootNode.get(),

--- a/gfx/layers/ipc/PWebRenderBridge.ipdl+++ b/gfx/layers/ipc/PWebRenderBridge.ipdl@@ -18,17 +18,17 @@ using mozilla::layers::APZTestData from using struct mozilla::layers::ScrollableLayerGuid from "FrameMetrics.h"; using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h"; using mozilla::layers::CompositableHandle from "mozilla/layers/LayersTypes.h"; using mozilla::wr::ByteBuffer from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::ExternalImageId from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::ImageKey from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::FontKey from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::PipelineId from "mozilla/webrender/WebRenderTypes.h";-using WrBuiltDisplayListDescriptor from "mozilla/webrender/webrender_ffi.h";+using mozilla::wr::WrBuiltDisplayListDescriptor from "mozilla/webrender/webrender_ffi.h"; using mozilla::layers::WebRenderScrollData from "mozilla/layers/WebRenderScrollData.h"; namespace mozilla { namespace layers { sync protocol PWebRenderBridge { manager PCompositorBridge;

--- a/gfx/layers/ipc/WebRenderMessages.ipdlh+++ b/gfx/layers/ipc/WebRenderMessages.ipdlh@@ -4,20 +4,20 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * 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/. */ include LayersSurfaces; include LayersMessages; include protocol PTexture;-using WrSize from "mozilla/webrender/webrender_ffi.h";-using WrImageRendering from "mozilla/webrender/webrender_ffi.h";-using WrMixBlendMode from "mozilla/webrender/webrender_ffi.h";-using MaybeImageMask from "mozilla/webrender/WebRenderTypes.h";+using mozilla::wr::WrSize from "mozilla/webrender/webrender_ffi.h";+using mozilla::wr::WrImageRendering from "mozilla/webrender/webrender_ffi.h";+using mozilla::wr::WrMixBlendMode from "mozilla/webrender/webrender_ffi.h";+using mozilla::wr::MaybeImageMask from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::ExternalImageId from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::ImageKey from "mozilla/webrender/WebRenderTypes.h"; using mozilla::wr::PipelineId from "mozilla/webrender/WebRenderTypes.h"; using mozilla::gfx::MaybeIntSize from "mozilla/gfx/Point.h"; using mozilla::LayerPoint from "Units.h"; using mozilla::layers::MaybeLayerRect from "mozilla/layers/LayersTypes.h"; using class mozilla::gfx::Matrix4x4 from "mozilla/gfx/Matrix.h"; using struct mozilla::void_t from "ipc/IPCMessageUtils.h";