diff --git a/layout/base/RestyleManagerBase.cpp b/layout/base/RestyleManagerBase.cpp
index c7b558f383e9..deba7b66e57a 100644
--- a/layout/base/RestyleManagerBase.cpp
+++ b/layout/base/RestyleManagerBase.cpp
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/RestyleManagerBase.h"
-#include "mozilla/StyleSetHandle.h"
+#include "mozilla/StyleSetHandleInlines.h"
 #include "nsIFrame.h"
 
 namespace mozilla {
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 90fbf828c7c3..12b27ae059b1 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -4,30 +4,6 @@
 # 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('ActiveLayerTracker.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('Display*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('FrameLayerBuilder.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('LayerState.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('MaskLayerImageCache.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('PaintTracker.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('nsCSSRendering.*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
-with Files('nsDisplay*'):
-    BUG_COMPONENT = ('Core', 'Layout: View Rendering')
-
 with Files('Restyle*'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 
@@ -55,14 +31,8 @@ if CONFIG['MOZ_DEBUG']:
 XPIDL_MODULE = 'layout_base'
 
 EXPORTS += [
-    'ActiveLayerTracker.h',
     'CaretAssociationHint.h',
-    'DisplayItemClip.h',
-    'DisplayItemScrollClip.h',
-    'DisplayListClipState.h',
-    'FrameLayerBuilder.h',
     'FramePropertyTable.h',
-    'LayerState.h',
     'LayoutLogging.h',
     'nsArenaMemoryStats.h',
     'nsBidi.h',
@@ -71,10 +41,6 @@ EXPORTS += [
     'nsChangeHint.h',
     'nsCompatibility.h',
     'nsCSSFrameConstructor.h',
-    'nsDisplayItemTypes.h',
-    'nsDisplayItemTypesList.h',
-    'nsDisplayList.h',
-    'nsDisplayListInvalidation.h',
     'nsFrameManager.h',
     'nsFrameManagerBase.h',
     'nsFrameTraversal.h',
@@ -105,7 +71,6 @@ EXPORTS.mozilla += [
     'ArenaRefPtrInlines.h',
     'GeometryUtils.h',
     'OverflowChangedTracker.h',
-    'PaintTracker.h',
     'RestyleLogging.h',
     'RestyleManager.h',
     'RestyleManagerBase.h',
@@ -119,27 +84,15 @@ UNIFIED_SOURCES += [
     'AccessibleCaret.cpp',
     'AccessibleCaretEventHub.cpp',
     'AccessibleCaretManager.cpp',
-    'ActiveLayerTracker.cpp',
-    'DashedCornerFinder.cpp',
-    'DisplayItemClip.cpp',
-    'DisplayItemScrollClip.cpp',
-    'DisplayListClipState.cpp',
-    'DottedCornerFinder.cpp',
-    'FrameLayerBuilder.cpp',
     'FramePropertyTable.cpp',
     'GeometryUtils.cpp',
     'LayoutLogging.cpp',
-    'MaskLayerImageCache.cpp',
     'MobileViewportManager.cpp',
     'nsBidiPresUtils.cpp',
     'nsCaret.cpp',
     'nsCounterManager.cpp',
     'nsCSSColorUtils.cpp',
     'nsCSSFrameConstructor.cpp',
-    'nsCSSRendering.cpp',
-    'nsCSSRenderingBorders.cpp',
-    'nsDisplayList.cpp',
-    'nsDisplayListInvalidation.cpp',
     'nsDocumentViewer.cpp',
     'nsFrameManager.cpp',
     'nsFrameTraversal.cpp',
@@ -152,7 +105,6 @@ UNIFIED_SOURCES += [
     'nsQuoteList.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
-    'PaintTracker.cpp',
     'PositionedEventTargeting.cpp',
     'RestyleManager.cpp',
     'RestyleManagerBase.cpp',
@@ -196,6 +148,7 @@ LOCAL_INCLUDES += [
     '../forms',
     '../generic',
     '../mathml',
+    '../painting',
     '../printing',
     '../style',
     '../svg',
@@ -222,8 +175,6 @@ MARIONETTE_LAYOUT_MANIFESTS += ['tests/marionette/manifest.ini']
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
 
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-
 if CONFIG['_MSC_VER']:
     # This is intended as a temporary hack to support building with VS2015.
     # 'type cast': conversion from 'unsigned int' to 'void *' of greater size
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 28adda4dbe7e..76711485ece9 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -163,6 +163,7 @@
 #endif
 
 #include "mozilla/layers/CompositorBridgeChild.h"
+#include "ClientLayerManager.h"
 #include "GeckoProfiler.h"
 #include "gfxPlatform.h"
 #include "Layers.h"
@@ -225,6 +226,7 @@ using namespace mozilla::layers;
 using namespace mozilla::gfx;
 using namespace mozilla::layout;
 using PaintFrameFlags = nsLayoutUtils::PaintFrameFlags;
+typedef FrameMetrics::ViewID ViewID;
 
 CapturingContentInfo nsIPresShell::gCaptureInfo =
   { false /* mAllowed */, false /* mPointerLock */, false /* mRetargetToElement */,
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 98df10c2dae9..400eb610a9df 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -24,6 +24,7 @@ LOCAL_INCLUDES += [
     '../generic',
     '../inspector',
     '../mathml',
+    '../painting',
     '../style',
     '../tables',
     '../xul',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 4fecbad3880a..2d2bc57b803e 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -47,6 +47,7 @@ LOCAL_INCLUDES += [
     '../../editor/txmgr',
     '../base',
     '../generic',
+    '../painting',
     '../style',
     '../xul',
     '/dom/base',
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 0fe98afec2cd..fba48eb003a5 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -200,6 +200,7 @@ LOCAL_INCLUDES += [
     '../../dom/plugins/base',
     '../base',
     '../forms',
+    '../painting',
     '../style',
     '../svg',
     '../tables',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index f40b2c2c6589..99a9a6847f5b 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -48,6 +48,7 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
+    '../painting',
     '../style',
     '../tables',
     '../xul',
diff --git a/layout/moz.build b/layout/moz.build
index 450c75862530..8fc6a6dd6b26 100644
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -20,6 +20,7 @@ DIRS += [
     'inspector',
     'tools/recording',
     'reftests',
+    'painting',
 ]
 
 
diff --git a/layout/base/ActiveLayerTracker.cpp b/layout/painting/ActiveLayerTracker.cpp
similarity index 100%
rename from layout/base/ActiveLayerTracker.cpp
rename to layout/painting/ActiveLayerTracker.cpp
diff --git a/layout/base/ActiveLayerTracker.h b/layout/painting/ActiveLayerTracker.h
similarity index 100%
rename from layout/base/ActiveLayerTracker.h
rename to layout/painting/ActiveLayerTracker.h
diff --git a/layout/base/BorderCache.h b/layout/painting/BorderCache.h
similarity index 100%
rename from layout/base/BorderCache.h
rename to layout/painting/BorderCache.h
diff --git a/layout/base/BorderConsts.h b/layout/painting/BorderConsts.h
similarity index 100%
rename from layout/base/BorderConsts.h
rename to layout/painting/BorderConsts.h
diff --git a/layout/base/DashedCornerFinder.cpp b/layout/painting/DashedCornerFinder.cpp
similarity index 100%
rename from layout/base/DashedCornerFinder.cpp
rename to layout/painting/DashedCornerFinder.cpp
diff --git a/layout/base/DashedCornerFinder.h b/layout/painting/DashedCornerFinder.h
similarity index 100%
rename from layout/base/DashedCornerFinder.h
rename to layout/painting/DashedCornerFinder.h
diff --git a/layout/base/DisplayItemClip.cpp b/layout/painting/DisplayItemClip.cpp
similarity index 100%
rename from layout/base/DisplayItemClip.cpp
rename to layout/painting/DisplayItemClip.cpp
diff --git a/layout/base/DisplayItemClip.h b/layout/painting/DisplayItemClip.h
similarity index 100%
rename from layout/base/DisplayItemClip.h
rename to layout/painting/DisplayItemClip.h
diff --git a/layout/base/DisplayItemScrollClip.cpp b/layout/painting/DisplayItemScrollClip.cpp
similarity index 100%
rename from layout/base/DisplayItemScrollClip.cpp
rename to layout/painting/DisplayItemScrollClip.cpp
diff --git a/layout/base/DisplayItemScrollClip.h b/layout/painting/DisplayItemScrollClip.h
similarity index 100%
rename from layout/base/DisplayItemScrollClip.h
rename to layout/painting/DisplayItemScrollClip.h
diff --git a/layout/base/DisplayListClipState.cpp b/layout/painting/DisplayListClipState.cpp
similarity index 100%
rename from layout/base/DisplayListClipState.cpp
rename to layout/painting/DisplayListClipState.cpp
diff --git a/layout/base/DisplayListClipState.h b/layout/painting/DisplayListClipState.h
similarity index 100%
rename from layout/base/DisplayListClipState.h
rename to layout/painting/DisplayListClipState.h
diff --git a/layout/base/DottedCornerFinder.cpp b/layout/painting/DottedCornerFinder.cpp
similarity index 100%
rename from layout/base/DottedCornerFinder.cpp
rename to layout/painting/DottedCornerFinder.cpp
diff --git a/layout/base/DottedCornerFinder.h b/layout/painting/DottedCornerFinder.h
similarity index 100%
rename from layout/base/DottedCornerFinder.h
rename to layout/painting/DottedCornerFinder.h
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp
similarity index 100%
rename from layout/base/FrameLayerBuilder.cpp
rename to layout/painting/FrameLayerBuilder.cpp
diff --git a/layout/base/FrameLayerBuilder.h b/layout/painting/FrameLayerBuilder.h
similarity index 100%
rename from layout/base/FrameLayerBuilder.h
rename to layout/painting/FrameLayerBuilder.h
diff --git a/layout/base/LayerState.h b/layout/painting/LayerState.h
similarity index 100%
rename from layout/base/LayerState.h
rename to layout/painting/LayerState.h
diff --git a/layout/base/MaskLayerImageCache.cpp b/layout/painting/MaskLayerImageCache.cpp
similarity index 100%
rename from layout/base/MaskLayerImageCache.cpp
rename to layout/painting/MaskLayerImageCache.cpp
diff --git a/layout/base/MaskLayerImageCache.h b/layout/painting/MaskLayerImageCache.h
similarity index 100%
rename from layout/base/MaskLayerImageCache.h
rename to layout/painting/MaskLayerImageCache.h
diff --git a/layout/base/PaintTracker.cpp b/layout/painting/PaintTracker.cpp
similarity index 100%
rename from layout/base/PaintTracker.cpp
rename to layout/painting/PaintTracker.cpp
diff --git a/layout/base/PaintTracker.h b/layout/painting/PaintTracker.h
similarity index 100%
rename from layout/base/PaintTracker.h
rename to layout/painting/PaintTracker.h
diff --git a/layout/painting/moz.build b/layout/painting/moz.build
new file mode 100644
index 000000000000..14d1b8245f80
--- /dev/null
+++ b/layout/painting/moz.build
@@ -0,0 +1,66 @@
+# -*- 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', 'Layout: View Rendering')
+
+EXPORTS += [
+    'ActiveLayerTracker.h',
+    'DisplayItemClip.h',
+    'DisplayItemScrollClip.h',
+    'DisplayListClipState.h',
+    'FrameLayerBuilder.h',
+    'LayerState.h',
+    'nsDisplayItemTypes.h',
+    'nsDisplayItemTypesList.h',
+    'nsDisplayList.h',
+    'nsDisplayListInvalidation.h',
+]
+
+EXPORTS.mozilla += [
+    'PaintTracker.h',
+]
+
+UNIFIED_SOURCES += [
+    'ActiveLayerTracker.cpp',
+    'DashedCornerFinder.cpp',
+    'DisplayItemClip.cpp',
+    'DisplayItemScrollClip.cpp',
+    'DisplayListClipState.cpp',
+    'DottedCornerFinder.cpp',
+    'FrameLayerBuilder.cpp',
+    'MaskLayerImageCache.cpp',
+    'nsCSSRendering.cpp',
+    'nsCSSRenderingBorders.cpp',
+    'nsDisplayList.cpp',
+    'nsDisplayListInvalidation.cpp',
+    'PaintTracker.cpp',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/docshell/base',
+    '/dom/base',
+    '/layout/base',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/svg',
+    '/layout/tables',
+    '/layout/xul',
+]
+
+FINAL_LIBRARY = 'xul'
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    # 'type cast': conversion from 'unsigned int' to 'void *' of greater size
+    CXXFLAGS += ['-wd4312']
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += ['-Wno-error=shadow']
diff --git a/layout/base/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp
similarity index 100%
rename from layout/base/nsCSSRendering.cpp
rename to layout/painting/nsCSSRendering.cpp
diff --git a/layout/base/nsCSSRendering.h b/layout/painting/nsCSSRendering.h
similarity index 100%
rename from layout/base/nsCSSRendering.h
rename to layout/painting/nsCSSRendering.h
diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/painting/nsCSSRenderingBorders.cpp
similarity index 100%
rename from layout/base/nsCSSRenderingBorders.cpp
rename to layout/painting/nsCSSRenderingBorders.cpp
diff --git a/layout/base/nsCSSRenderingBorders.h b/layout/painting/nsCSSRenderingBorders.h
similarity index 100%
rename from layout/base/nsCSSRenderingBorders.h
rename to layout/painting/nsCSSRenderingBorders.h
diff --git a/layout/base/nsDisplayItemTypes.h b/layout/painting/nsDisplayItemTypes.h
similarity index 100%
rename from layout/base/nsDisplayItemTypes.h
rename to layout/painting/nsDisplayItemTypes.h
diff --git a/layout/base/nsDisplayItemTypesList.h b/layout/painting/nsDisplayItemTypesList.h
similarity index 100%
rename from layout/base/nsDisplayItemTypesList.h
rename to layout/painting/nsDisplayItemTypesList.h
diff --git a/layout/base/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
similarity index 100%
rename from layout/base/nsDisplayList.cpp
rename to layout/painting/nsDisplayList.cpp
diff --git a/layout/base/nsDisplayList.h b/layout/painting/nsDisplayList.h
similarity index 100%
rename from layout/base/nsDisplayList.h
rename to layout/painting/nsDisplayList.h
diff --git a/layout/base/nsDisplayListInvalidation.cpp b/layout/painting/nsDisplayListInvalidation.cpp
similarity index 100%
rename from layout/base/nsDisplayListInvalidation.cpp
rename to layout/painting/nsDisplayListInvalidation.cpp
diff --git a/layout/base/nsDisplayListInvalidation.h b/layout/painting/nsDisplayListInvalidation.h
similarity index 100%
rename from layout/base/nsDisplayListInvalidation.h
rename to layout/painting/nsDisplayListInvalidation.h
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index b1481f4ef216..3ba5ec2197c2 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -65,6 +65,7 @@ LOCAL_INCLUDES += [
     '../../widget',
     '../base',
     '../generic',
+    '../painting',
     '../style',
     '../xul',
     '/dom/base',
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index b77776320223..1a23480a0120 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -34,6 +34,7 @@ LOCAL_INCLUDES += [
     '../../intl/unicharutil/util',
     '../base',
     '../generic',
+    '../painting',
     '../style',
     '../xul',
     '/dom/base',
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index 8ed304c9ffb1..d65b77152ef9 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -99,6 +99,7 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
+    '../painting',
     '../style',
     '/dom/base',
 ]
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index ccac5bde973b..49528aeaadc4 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -45,6 +45,7 @@ LOCAL_INCLUDES += [
     '../../base',
     '../../forms',
     '../../generic',
+    '../../painting',
     '../../style',
     '/dom/base',
 ]
diff --git a/widget/moz.build b/widget/moz.build
index 09192179ff76..275d851a76dc 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -249,6 +249,7 @@ LOCAL_INCLUDES += [
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
+    '/layout/painting',
     '/layout/xul',
     '/view',
     '/widget',