Bug 1382128 part 8 - Remove Wr prefix from some type aliases. r=kats

MozReview-Commit-ID: 5h7QobhcYc1

gfx/layers/ipc/PWebRenderBridge.ipdl

@@ -23,7 +23,7 @@ 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 mozilla::wr::WrBuiltDisplayListDescriptor from "mozilla/webrender/webrender_ffi.h";
+using mozilla::wr::BuiltDisplayListDescriptor from "mozilla/webrender/webrender_ffi.h";
 using mozilla::layers::WebRenderScrollData from "mozilla/layers/WebRenderScrollData.h";
 
 namespace mozilla {
@@ -55,10 +55,10 @@ parent:
   async DeleteFont(FontKey aFontKey);
   async DPBegin(IntSize aSize);
   async DPEnd(IntSize aSize, WebRenderParentCommand[] commands, OpDestroy[] toDestroy, uint64_t fwdTransactionId, uint64_t transactionId,
-              LayoutSize aContentSize, ByteBuffer aDL, WrBuiltDisplayListDescriptor aDLDesc,
+              LayoutSize aContentSize, ByteBuffer aDL, BuiltDisplayListDescriptor aDLDesc,
               WebRenderScrollData aScrollData, uint32_t idNameSpace);
   sync DPSyncEnd(IntSize aSize, WebRenderParentCommand[] commands, OpDestroy[] toDestroy, uint64_t fwdTransactionId, uint64_t transactionId,
-                 LayoutSize aContentSize, ByteBuffer aDL, WrBuiltDisplayListDescriptor aDLDesc,
+                 LayoutSize aContentSize, ByteBuffer aDL, BuiltDisplayListDescriptor aDLDesc,
                  WebRenderScrollData aScrollData, uint32_t idNameSpace);
   async ParentCommands(WebRenderParentCommand[] commands);
   sync DPGetSnapshot(PTexture texture);

gfx/layers/ipc/WebRenderMessages.ipdlh

@@ -10,8 +10,8 @@ include LayersMessages;
 include protocol PTexture;
 
 using mozilla::wr::LayoutSize 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::ImageRendering from "mozilla/webrender/webrender_ffi.h";
+using mozilla::wr::MixBlendMode 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";
@@ -51,8 +51,8 @@ struct OpUpdateAsyncImagePipeline {
   LayerRect scBounds;
   Matrix4x4 scTransform;
   MaybeIntSize scaleToSize;
-  WrImageRendering filter;
-  WrMixBlendMode mixBlendMode;
+  ImageRendering filter;
+  MixBlendMode mixBlendMode;
 };
 
 union WebRenderParentCommand {

gfx/layers/wr/StackingContextHelper.cpp

@@ -36,9 +36,9 @@ StackingContextHelper::StackingContextHelper(const StackingContextHelper& aParen
                                 aAnimationsId,
                                 aOpacityPtr,
                                 aTransformPtr,
-                                wr::WrTransformStyle::Flat,
+                                wr::TransformStyle::Flat,
                                 // TODO: set correct blend mode.
-                                wr::ToWrMixBlendMode(gfx::CompositionOp::OP_OVER),
+                                wr::ToMixBlendMode(gfx::CompositionOp::OP_OVER),
                                 aFilters);
 
   mOrigin = aOrigin;
@@ -58,8 +58,8 @@ StackingContextHelper::StackingContextHelper(const StackingContextHelper& aParen
   float opacity = 1.0f;
   mBuilder->PushStackingContext(scBounds, 0, &opacity,
                                 mTransform.IsIdentity() ? nullptr : &mTransform,
-                                wr::WrTransformStyle::Flat,
-                                wr::ToWrMixBlendMode(layer->GetMixBlendMode()),
+                                wr::TransformStyle::Flat,
+                                wr::ToMixBlendMode(layer->GetMixBlendMode()),
                                 aFilters);
   mOrigin = aLayer->Bounds().TopLeft();
 }
@@ -82,8 +82,8 @@ StackingContextHelper::StackingContextHelper(const StackingContextHelper& aParen
                                 aAnimationsId,
                                 aOpacityPtr,
                                 aTransformPtr,
-                                wr::WrTransformStyle::Flat,
-                                wr::ToWrMixBlendMode(aLayer->GetLayer()->GetMixBlendMode()),
+                                wr::TransformStyle::Flat,
+                                wr::ToMixBlendMode(aLayer->GetLayer()->GetMixBlendMode()),
                                 aFilters);
   mOrigin = aLayer->Bounds().TopLeft();
 }

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -402,7 +402,7 @@ WebRenderBridgeParent::HandleDPEnd(const gfx::IntSize& aSize,
                                  const uint64_t& aTransactionId,
                                  const wr::LayoutSize& aContentSize,
                                  const wr::ByteBuffer& dl,
-                                 const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                 const wr::BuiltDisplayListDescriptor& dlDesc,
                                  const WebRenderScrollData& aScrollData,
                                  const uint32_t& aIdNameSpace)
 {
@@ -515,7 +515,7 @@ WebRenderBridgeParent::RecvDPEnd(const gfx::IntSize& aSize,
                                  const uint64_t& aTransactionId,
                                  const wr::LayoutSize& aContentSize,
                                  const wr::ByteBuffer& dl,
-                                 const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                 const wr::BuiltDisplayListDescriptor& dlDesc,
                                  const WebRenderScrollData& aScrollData,
                                  const uint32_t& aIdNameSpace)
 {
@@ -535,7 +535,7 @@ WebRenderBridgeParent::RecvDPSyncEnd(const gfx::IntSize &aSize,
                                      const uint64_t& aTransactionId,
                                      const wr::LayoutSize& aContentSize,
                                      const wr::ByteBuffer& dl,
-                                     const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                     const wr::BuiltDisplayListDescriptor& dlDesc,
                                      const WebRenderScrollData& aScrollData,
                                      const uint32_t& aIdNameSpace)
 {
@@ -657,7 +657,7 @@ void
 WebRenderBridgeParent::ProcessWebRenderCommands(const gfx::IntSize &aSize,
                                                 InfallibleTArray<WebRenderParentCommand>& aCommands, const wr::Epoch& aEpoch,
                                                 const wr::LayoutSize& aContentSize, const wr::ByteBuffer& dl,
-                                                const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                                const wr::BuiltDisplayListDescriptor& dlDesc,
                                                 const uint32_t& aIdNameSpace)
 {
   mCompositableHolder->SetCompositionTime(TimeStamp::Now());

gfx/layers/wr/WebRenderBridgeParent.h

@@ -100,7 +100,7 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent
                                     const uint64_t& aTransactionId,
                                     const wr::LayoutSize& aContentSize,
                                     const wr::ByteBuffer& dl,
-                                    const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                    const wr::BuiltDisplayListDescriptor& dlDesc,
                                     const WebRenderScrollData& aScrollData,
                                     const uint32_t& aIdNameSpace) override;
   mozilla::ipc::IPCResult RecvDPSyncEnd(const gfx::IntSize& aSize,
@@ -110,7 +110,7 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent
                                         const uint64_t& aTransactionId,
                                         const wr::LayoutSize& aContentSize,
                                         const wr::ByteBuffer& dl,
-                                        const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                        const wr::BuiltDisplayListDescriptor& dlDesc,
                                         const WebRenderScrollData& aScrollData,
                                         const uint32_t& aIdNameSpace) override;
   mozilla::ipc::IPCResult RecvParentCommands(nsTArray<WebRenderParentCommand>&& commands) override;
@@ -219,7 +219,7 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent
                                 const wr::Epoch& aEpoch,
                                 const wr::LayoutSize& aContentSize,
                                 const wr::ByteBuffer& dl,
-                                const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                                const wr::BuiltDisplayListDescriptor& dlDesc,
                                 const uint32_t& aIdNameSpace);
   void ClearResources();
   uint64_t GetChildLayerObserverEpoch() const { return mChildLayerObserverEpoch; }
@@ -231,7 +231,7 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent
                    const uint64_t& aTransactionId,
                    const wr::LayoutSize& aContentSize,
                    const wr::ByteBuffer& dl,
-                   const wr::WrBuiltDisplayListDescriptor& dlDesc,
+                   const wr::BuiltDisplayListDescriptor& dlDesc,
                    const WebRenderScrollData& aScrollData,
                    const uint32_t& aIdNameSpace);
   mozilla::ipc::IPCResult HandleShutdown();

gfx/layers/wr/WebRenderCompositableHolder.cpp

@@ -19,8 +19,8 @@ WebRenderCompositableHolder::AsyncImagePipelineHolder::AsyncImagePipelineHolder(
  : mInitialised(false)
  , mIsChanged(false)
  , mUseExternalImage(false)
- , mFilter(wr::WrImageRendering::Auto)
- , mMixBlendMode(wr::WrMixBlendMode::Normal)
+ , mFilter(wr::ImageRendering::Auto)
+ , mMixBlendMode(wr::MixBlendMode::Normal)
 {}
 
 WebRenderCompositableHolder::WebRenderCompositableHolder(uint32_t aIdNamespace)
@@ -135,8 +135,8 @@ WebRenderCompositableHolder::UpdateAsyncImagePipeline(const wr::PipelineId& aPip
                                                       const LayerRect& aScBounds,
                                                       const gfx::Matrix4x4& aScTransform,
                                                       const gfx::MaybeIntSize& aScaleToSize,
-                                                      const wr::WrImageRendering& aFilter,
-                                                      const wr::WrMixBlendMode& aMixBlendMode)
+                                                      const wr::ImageRendering& aFilter,
+                                                      const wr::MixBlendMode& aMixBlendMode)
 {
   if (mDestroyed) {
     return;
@@ -275,7 +275,7 @@ WebRenderCompositableHolder::ApplyAsyncImages(wr::WebRenderAPI* aApi)
                                   0,
                                   &opacity,
                                   holder->mScTransform.IsIdentity() ? nullptr : &holder->mScTransform,
-                                  wr::WrTransformStyle::Flat,
+                                  wr::TransformStyle::Flat,
                                   holder->mMixBlendMode,
                                   nsTArray<wr::WrFilterOp>());
 

gfx/layers/wr/WebRenderCompositableHolder.h

@@ -75,8 +75,8 @@ class WebRenderCompositableHolder final
                                 const LayerRect& aScBounds,
                                 const gfx::Matrix4x4& aScTransform,
                                 const gfx::MaybeIntSize& aScaleToSize,
-                                const wr::WrImageRendering& aFilter,
-                                const wr::WrMixBlendMode& aMixBlendMode);
+                                const wr::ImageRendering& aFilter,
+                                const wr::MixBlendMode& aMixBlendMode);
   void ApplyAsyncImages(wr::WebRenderAPI* aApi);
 
 private:
@@ -117,8 +117,8 @@ class WebRenderCompositableHolder final
     LayerRect mScBounds;
     gfx::Matrix4x4 mScTransform;
     gfx::MaybeIntSize mScaleToSize;
-    wr::WrImageRendering mFilter;
-    wr::WrMixBlendMode mMixBlendMode;
+    wr::ImageRendering mFilter;
+    wr::MixBlendMode mMixBlendMode;
     RefPtr<WebRenderImageHost> mImageHost;
     CompositableTextureHostRef mCurrentTexture;
     nsTArray<wr::ImageKey> mKeys;

gfx/layers/wr/WebRenderImageLayer.cpp

@@ -185,7 +185,7 @@ WebRenderImageLayer::RenderLayer(wr::DisplayListBuilder& aBuilder,
     }
     LayerRect scBounds = BoundsForStackingContext();
     wr::ImageRendering filter = wr::ToImageRendering(mSamplingFilter);
-    wr::MixBlendMode mixBlendMode = wr::ToWrMixBlendMode(GetMixBlendMode());
+    wr::MixBlendMode mixBlendMode = wr::ToMixBlendMode(GetMixBlendMode());
 
     WrBridge()->AddWebRenderParentCommand(OpUpdateAsyncImagePipeline(mPipelineId.value(),
                                                                      scBounds,

gfx/layers/wr/WebRenderLayer.cpp

@@ -126,7 +126,7 @@ WebRenderLayer::DumpLayerInfo(const char* aLayerType, const LayerRect& aRect)
   Layer* layer = GetLayer();
   Matrix4x4 transform = layer->GetTransform();
   LayerRect bounds = Bounds();
-  wr::WrMixBlendMode mixBlendMode = wr::ToWrMixBlendMode(GetLayer()->GetMixBlendMode());
+  wr::MixBlendMode mixBlendMode = wr::ToMixBlendMode(GetLayer()->GetMixBlendMode());
 
   printf_stderr("%s %p using bounds=%s, transform=%s, rect=%s, clip=%s, mix-blend-mode=%s\n",
                 aLayerType,

gfx/layers/wr/WebRenderMessageUtils.h

@@ -106,11 +106,11 @@ struct ParamTraits<mozilla::wr::PipelineId>
 };
 
 template<>
-struct ParamTraits<mozilla::wr::WrImageFormat>
+struct ParamTraits<mozilla::wr::ImageFormat>
   : public ContiguousEnumSerializer<
-        mozilla::wr::WrImageFormat,
-        mozilla::wr::WrImageFormat::Invalid,
-        mozilla::wr::WrImageFormat::Sentinel>
+        mozilla::wr::ImageFormat,
+        mozilla::wr::ImageFormat::Invalid,
+        mozilla::wr::ImageFormat::Sentinel>
 {
 };
 
@@ -193,35 +193,35 @@ struct ParamTraits<mozilla::wr::WrImageMask>
 };
 
 template<>
-struct ParamTraits<mozilla::wr::WrImageRendering>
+struct ParamTraits<mozilla::wr::ImageRendering>
   : public ContiguousEnumSerializer<
-        mozilla::wr::WrImageRendering,
-        mozilla::wr::WrImageRendering::Auto,
-        mozilla::wr::WrImageRendering::Sentinel>
+        mozilla::wr::ImageRendering,
+        mozilla::wr::ImageRendering::Auto,
+        mozilla::wr::ImageRendering::Sentinel>
 {
 };
 
 template<>
-struct ParamTraits<mozilla::wr::WrMixBlendMode>
+struct ParamTraits<mozilla::wr::MixBlendMode>
   : public ContiguousEnumSerializer<
-        mozilla::wr::WrMixBlendMode,
-        mozilla::wr::WrMixBlendMode::Normal,
-        mozilla::wr::WrMixBlendMode::Sentinel>
+        mozilla::wr::MixBlendMode,
+        mozilla::wr::MixBlendMode::Normal,
+        mozilla::wr::MixBlendMode::Sentinel>
 {
 };
 
 template<>
-struct ParamTraits<mozilla::wr::WrBuiltDisplayListDescriptor>
+struct ParamTraits<mozilla::wr::BuiltDisplayListDescriptor>
 {
   static void
-  Write(Message* aMsg, const mozilla::wr::WrBuiltDisplayListDescriptor& aParam)
+  Write(Message* aMsg, const mozilla::wr::BuiltDisplayListDescriptor& aParam)
   {
     WriteParam(aMsg, aParam.builder_start_time);
     WriteParam(aMsg, aParam.builder_finish_time);
   }
 
   static bool
-  Read(const Message* aMsg, PickleIterator* aIter, mozilla::wr::WrBuiltDisplayListDescriptor* aResult)
+  Read(const Message* aMsg, PickleIterator* aIter, mozilla::wr::BuiltDisplayListDescriptor* aResult)
   {
     return ReadParam(aMsg, aIter, &aResult->builder_start_time)
         && ReadParam(aMsg, aIter, &aResult->builder_finish_time);

gfx/layers/wr/WebRenderUserData.cpp

@@ -93,8 +93,8 @@ WebRenderImageData::CreateAsyncImageWebRenderCommands(mozilla::wr::DisplayListBu
                                                       const LayerRect& aSCBounds,
                                                       const Matrix4x4& aSCTransform,
                                                       const MaybeIntSize& aScaleToSize,
-                                                      const wr::WrImageRendering& aFilter,
-                                                      const wr::WrMixBlendMode& aMixBlendMode)
+                                                      const wr::ImageRendering& aFilter,
+                                                      const wr::MixBlendMode& aMixBlendMode)
 {
   MOZ_ASSERT(aContainer->IsAsync());
   if (!mPipelineId) {

gfx/layers/wr/WebRenderUserData.h

@@ -67,8 +67,8 @@ class WebRenderImageData : public WebRenderUserData
                                          const LayerRect& aSCBounds,
                                          const gfx::Matrix4x4& aSCTransform,
                                          const gfx::MaybeIntSize& aScaleToSize,
-                                         const wr::WrImageRendering& aFilter,
-                                         const wr::WrMixBlendMode& aMixBlendMode);
+                                         const wr::ImageRendering& aFilter,
+                                         const wr::MixBlendMode& aMixBlendMode);
 
   void CreateImageClientIfNeeded();
 

gfx/webrender_bindings/Moz2DImageRenderer.cpp

@@ -97,7 +97,7 @@ bool wr_moz2d_render_cb(const mozilla::wr::ByteSlice blob,
 {
   return mozilla::wr::Moz2DRenderCallback(mozilla::wr::ByteSliceToRange(blob),
                                           mozilla::gfx::IntSize(width, height),
-                                          mozilla::wr::WrImageFormatToSurfaceFormat(aFormat),
+                                          mozilla::wr::ImageFormatToSurfaceFormat(aFormat),
                                           mozilla::wr::MutByteSliceToRange(output));
 }
 

gfx/webrender_bindings/RendererOGL.cpp

@@ -56,19 +56,19 @@ RendererOGL::RendererOGL(RefPtr<RenderThread>&& aThread,
                          RefPtr<gl::GLContext>&& aGL,
                          RefPtr<widget::CompositorWidget>&& aWidget,
                          wr::WindowId aWindowId,
-                         wr::WrRenderer* aWrRenderer,
+                         wr::Renderer* aRenderer,
                          layers::CompositorBridgeParentBase* aBridge)
   : mThread(aThread)
   , mGL(aGL)
   , mWidget(aWidget)
-  , mWrRenderer(aWrRenderer)
+  , mRenderer(aRenderer)
   , mBridge(aBridge)
   , mWindowId(aWindowId)
 {
   MOZ_ASSERT(mThread);
   MOZ_ASSERT(mGL);
   MOZ_ASSERT(mWidget);
-  MOZ_ASSERT(mWrRenderer);
+  MOZ_ASSERT(mRenderer);
   MOZ_ASSERT(mBridge);
   MOZ_COUNT_CTOR(RendererOGL);
 }
@@ -81,7 +81,7 @@ RendererOGL::~RendererOGL()
     // Leak resources!
     return;
   }
-  wr_renderer_delete(mWrRenderer);
+  wr_renderer_delete(mRenderer);
 }
 
 wr::WrExternalImageHandler
@@ -97,7 +97,7 @@ RendererOGL::GetExternalImageHandler()
 void
 RendererOGL::Update()
 {
-  wr_renderer_update(mWrRenderer);
+  wr_renderer_update(mRenderer);
 }
 
 bool
@@ -127,7 +127,7 @@ RendererOGL::Render()
   // XXX set clear color if MOZ_WIDGET_ANDROID is defined.
 
   auto size = mWidget->GetClientSize();
-  wr_renderer_render(mWrRenderer, size.width, size.height);
+  wr_renderer_render(mRenderer, size.width, size.height);
 
   mGL->SwapBuffers();
   mWidget->PostRender(&widgetContext);
@@ -167,13 +167,13 @@ RendererOGL::Resume()
 void
 RendererOGL::SetProfilerEnabled(bool aEnabled)
 {
-  wr_renderer_set_profiler_enabled(mWrRenderer, aEnabled);
+  wr_renderer_set_profiler_enabled(mRenderer, aEnabled);
 }
 
 wr::WrRenderedEpochs*
 RendererOGL::FlushRenderedEpochs()
 {
-  return wr_renderer_flush_rendered_epochs(mWrRenderer);
+  return wr_renderer_flush_rendered_epochs(mRenderer);
 }
 
 RenderTextureHost*