Bug 1331515 - mozilla/webrender include path. r=gfx?

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -51,10 +51,10 @@
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/PLayerTransactionParent.h"
 #include "mozilla/layers/RemoteContentController.h"
-#include "mozilla/layers/WebRenderAPI.h"
 #include "mozilla/layers/WebRenderBridgeParent.h"
 #include "mozilla/layers/WebRenderCompositorOGL.h"
 #include "mozilla/layout/RenderFrameParent.h"
+#include "mozilla/webrender/WebRenderAPI.h"
 #include "mozilla/media/MediaSystemResourceService.h" // for MediaSystemResourceService
 #include "mozilla/mozalloc.h"           // for operator new, etc
 #include "mozilla/Telemetry.h"

gfx/layers/ipc/PWebRenderBridge.ipdl

@@ -17,7 +17,7 @@ include protocol PTexture;
 
 using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h";
 using WRImageFormat from "mozilla/gfx/webrender.h";
-using mozilla::gfx::ByteBuffer from "mozilla/layers/WebRenderTypes.h";
+using mozilla::gfx::ByteBuffer from "mozilla/webrender/WebRenderTypes.h";
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/WebRenderMessages.ipdlh

@@ -17,9 +17,9 @@ using WRTextureFilter from "mozilla/gfx/webrender.h";
 using WRLayoutSize from "mozilla/gfx/webrender.h";
 using WRRect from "mozilla/gfx/webrender.h";
 using WRGlyphArray from "mozilla/gfx/webrender.h";
-using MaybeImageMask from "mozilla/layers/WebRenderTypes.h";
+using MaybeImageMask from "mozilla/webrender/WebRenderTypes.h";
 using mozilla::gfx::Matrix4x4 from "mozilla/gfx/Matrix.h";
-using mozilla::gfx::ByteBuffer from "mozilla/layers/WebRenderTypes.h";
+using mozilla::gfx::ByteBuffer from "mozilla/webrender/WebRenderTypes.h";
 using mozilla::LayerIntRegion from "Units.h";
 
 namespace mozilla {

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -16,10 +16,9 @@
 #include "mozilla/layers/CompositorVsyncScheduler.h"
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/ImageDataSerializer.h"
-#include "mozilla/layers/RenderThread.h"
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/WebRenderCompositorOGL.h"
-#include "mozilla/layers/WebRenderAPI.h"
+#include "mozilla/webrender/RenderThread.h"
 #include "mozilla/widget/CompositorWidget.h"
 
 bool is_in_compositor_thread()

gfx/layers/wr/WebRenderBridgeParent.h

@@ -11,8 +11,8 @@
 #include "mozilla/layers/CompositableTransactionParent.h"
 #include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
 #include "mozilla/layers/PWebRenderBridgeParent.h"
-#include "mozilla/layers/WebRenderTypes.h"
-#include "mozilla/layers/WebRenderAPI.h"
+#include "mozilla/webrender/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderAPI.h"
 #include "nsTArrayForwardDeclare.h"
 #include "mozilla/Maybe.h"
 

gfx/layers/wr/WebRenderCanvasLayer.cpp

@@ -16,7 +16,7 @@
 #include "PersistentBufferProvider.h"
 #include "SharedSurface.h"
 #include "SharedSurfaceGL.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/wr/WebRenderImageLayer.cpp

@@ -10,7 +10,7 @@
 #include "mozilla/layers/TextureClientRecycleAllocator.h"
 #include "mozilla/layers/TextureWrapperImage.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/wr/WebRenderLayerManager.h

@@ -10,7 +10,7 @@
 #include "mozilla/gfx/webrender.h"
 #include "mozilla/layers/CompositorController.h"
 #include "mozilla/layers/TransactionIdAllocator.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 class nsIWidget;
 

gfx/layers/wr/WebRenderMessageUtils.h

@@ -9,7 +9,7 @@
 #include "chrome/common/ipc_message_utils.h"
 
 #include "mozilla/gfx/webrender.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 namespace IPC {
 

gfx/layers/wr/WebRenderPaintedLayer.cpp

@@ -8,7 +8,7 @@
 #include "LayersLogging.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 #include "gfxUtils.h"
 
 namespace mozilla {

gfx/layers/wr/WebRenderPaintedLayer.h

@@ -9,7 +9,7 @@
 #include "Layers.h"
 #include "mozilla/layers/ContentClient.h"
 #include "WebRenderLayerManager.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/wr/WebRenderTextLayer.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebRenderTextLayer.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
 
 #include "mozilla/gfx/2D.h"

gfx/thebes/gfxPlatform.cpp

@@ -7,7 +7,7 @@
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/ImageBridgeChild.h"
 #include "mozilla/layers/ISurfaceAllocator.h"     // for GfxMemoryImageReporter
-#include "mozilla/layers/RenderThread.h"
+#include "mozilla/webrender/RenderThread.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/GraphicsMessages.h"

gfx/webrender_bindings/RenderThread.cpp

@@ -5,7 +5,7 @@
 
 #include "RenderThread.h"
 #include "nsThreadUtils.h"
-#include "mozilla/layers/RendererOGL.h"
+#include "mozilla/webrender/RendererOGL.h"
 #include "mozilla/widget/CompositorWidget.h"
 #include "mozilla/StaticPtr.h"
 

gfx/webrender_bindings/RenderThread.h

@@ -15,7 +15,7 @@
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 #include "mozilla/gfx/webrender.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 
 namespace mozilla {
 namespace layers {

gfx/webrender_bindings/RendererOGL.h

@@ -7,8 +7,8 @@
 #ifndef MOZILLA_LAYERS_RENDEREROGL_H
 #define MOZILLA_LAYERS_RENDEREROGL_H
 
-#include "mozilla/layers/RenderThread.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/RenderThread.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/gfx/webrender.h"
 
 namespace mozilla {

gfx/webrender_bindings/WebRenderAPI.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebRenderAPI.h"
-#include "mozilla/layers/RendererOGL.h"
+#include "mozilla/webrender/RendererOGL.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/widget/CompositorWidget.h"
 #include "mozilla/widget/CompositorWidget.h"

gfx/webrender_bindings/WebRenderAPI.h

@@ -10,7 +10,7 @@
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Range.h"
 #include "mozilla/gfx/webrender.h"
-#include "mozilla/layers/WebRenderTypes.h"
+#include "mozilla/webrender/WebRenderTypes.h"
 #include "Units.h"
 
 namespace mozilla {

gfx/webrender_bindings/moz.build

@@ -7,8 +7,7 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Graphics: WebRender')
 
-# TODO: mozilla.webrender
-EXPORTS.mozilla.layers += [
+EXPORTS.mozilla.webrender += [
     'RendererOGL.h',
     'RenderThread.h',
     'WebRenderAPI.h',