Bug 1331515 - Move webrender wrappers to the webrender_bindings directory. r=gfx?
authorNicolas Silva <nsilva@mozilla.com>
Mon, 16 Jan 2017 19:21:43 -0500
changeset 342109 161d2bc7eff8575094743fb39041b5a7e1a5aabf
parent 342108 926be7ce8c2ff3c91b1e0187be385ea5881a5840
child 342110 42c004f7476a8fa4105bd58ccb4c40b053776f21
push id31345
push userkwierso@gmail.com
push dateFri, 10 Feb 2017 20:35:09 +0000
treeherdermozilla-central@a288fe35e494 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfx
bugs1331515
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1331515 - Move webrender wrappers to the webrender_bindings directory. r=gfx?
gfx/layers/moz.build
gfx/layers/wr/RenderThread.cpp
gfx/layers/wr/RenderThread.h
gfx/layers/wr/RendererOGL.cpp
gfx/layers/wr/RendererOGL.h
gfx/layers/wr/WebRenderAPI.cpp
gfx/layers/wr/WebRenderAPI.h
gfx/layers/wr/WebRenderTypes.h
gfx/moz.build
gfx/webrender_bindings/RenderThread.cpp
gfx/webrender_bindings/RenderThread.h
gfx/webrender_bindings/RendererOGL.cpp
gfx/webrender_bindings/RendererOGL.h
gfx/webrender_bindings/WebRenderAPI.cpp
gfx/webrender_bindings/WebRenderAPI.h
gfx/webrender_bindings/WebRenderTypes.h
gfx/webrender_bindings/moz.build
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -193,25 +193,21 @@ EXPORTS.mozilla.layers += [
     'opengl/MacIOSurfaceTextureClientOGL.h',
     'opengl/MacIOSurfaceTextureHostOGL.h',
     'opengl/TextureClientOGL.h',
     'opengl/TextureHostOGL.h',
     'PersistentBufferProvider.h',
     'RenderTrace.h',
     'TextureWrapperImage.h',
     'TransactionIdAllocator.h',
-    'wr/RendererOGL.h',
-    'wr/RenderThread.h',
-    'wr/WebRenderAPI.h',
     'wr/WebRenderBridgeChild.h',
     'wr/WebRenderBridgeParent.h',
     'wr/WebRenderCompositorOGL.h',
     'wr/WebRenderLayerManager.h',
     'wr/WebRenderMessageUtils.h',
-    'wr/WebRenderTypes.h',
 ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS.mozilla.layers += [
         'basic/TextureClientX11.h',
         'basic/X11TextureSourceBasic.h',
         'composite/X11TextureHost.h',
         'ipc/ShadowLayerUtilsX11.h',
@@ -373,19 +369,16 @@ UNIFIED_SOURCES += [
     'opengl/TextureHostOGL.cpp',
     'opengl/TexturePoolOGL.cpp',
     'protobuf/LayerScopePacket.pb.cc',
     'ReadbackProcessor.cpp',
     'RenderTrace.cpp',
     'RotatedBuffer.cpp',
     'ShareableCanvasLayer.cpp',
     'TextureWrapperImage.cpp',
-    'wr/RendererOGL.cpp',
-    'wr/RenderThread.cpp',
-    'wr/WebRenderAPI.cpp',
     'wr/WebRenderBorderLayer.cpp',
     'wr/WebRenderBridgeChild.cpp',
     'wr/WebRenderBridgeParent.cpp',
     'wr/WebRenderCanvasLayer.cpp',
     'wr/WebRenderColorLayer.cpp',
     'wr/WebRenderCompositorOGL.cpp',
     'wr/WebRenderContainerLayer.cpp',
     'wr/WebRenderImageLayer.cpp',
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -17,16 +17,17 @@ DIRS += [
     'layers',
     'graphite2/src',
     'harfbuzz/src',
     'ots/src',
     'thebes',
     'ipc',
     'vr',
     'config',
+    'webrender_bindings',
 ]
 
 EXPORTS.mozilla.gfx += ['webrender_bindings/src/webrender.h']
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     DIRS += ['skia']
 
 if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY'] and CONFIG['ENABLE_INTL_API']:
rename from gfx/layers/wr/RenderThread.cpp
rename to gfx/webrender_bindings/RenderThread.cpp
rename from gfx/layers/wr/RenderThread.h
rename to gfx/webrender_bindings/RenderThread.h
rename from gfx/layers/wr/RendererOGL.cpp
rename to gfx/webrender_bindings/RendererOGL.cpp
rename from gfx/layers/wr/RendererOGL.h
rename to gfx/webrender_bindings/RendererOGL.h
rename from gfx/layers/wr/WebRenderAPI.cpp
rename to gfx/webrender_bindings/WebRenderAPI.cpp
rename from gfx/layers/wr/WebRenderAPI.h
rename to gfx/webrender_bindings/WebRenderAPI.h
rename from gfx/layers/wr/WebRenderTypes.h
rename to gfx/webrender_bindings/WebRenderTypes.h
new file mode 100644
--- /dev/null
+++ b/gfx/webrender_bindings/moz.build
@@ -0,0 +1,26 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Graphics: WebRender')
+
+# TODO: mozilla.webrender
+EXPORTS.mozilla.layers += [
+    'RendererOGL.h',
+    'RenderThread.h',
+    'WebRenderAPI.h',
+    'WebRenderTypes.h',
+]
+
+UNIFIED_SOURCES += [
+    'RendererOGL.cpp',
+    'RenderThread.cpp',
+    'WebRenderAPI.cpp',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'