Merge mozilla-central to mozilla-inbound. r=merge a=merge on a CLOSED TREE
commit463d2cbb862862cd8eaf7ec87940ce8567412ec9
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 27 Nov 2017 22:10:33 +0000 (28 00:10 +0200)
committerMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 27 Nov 2017 22:10:33 +0000 (28 00:10 +0200)
tree4614c0b0aa9b1a587df47bb46c69ac1f17e15b70
parent120d3eedd79168d7a5b0114ed227bbfdeb64d839
parentf0400e7e4c5d56a65838be469d0911c715bf930a
Merge mozilla-central to mozilla-inbound. r=merge a=merge on a CLOSED TREE
layout/painting/nsDisplayList.cpp
layout/painting/nsDisplayList.h