Bug 1337130. Fixup. Make sure nsDisplayCaret doesn't return LAYER_INACTIVE. r=me
authorMason Chang <mchang@mozilla.com>
Tue, 14 Feb 2017 14:00:25 -0800
changeset 372995 b242c7944db3f3f7527924b71a49ebffdbe26690
parent 372994 48b29a84e4e507b596e92e106a8ef03d644cff2a
child 372996 052e1a7bbc5b135e81ee55157daa0f80e1a91750
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1337130
milestone54.0a1
Bug 1337130. Fixup. Make sure nsDisplayCaret doesn't return LAYER_INACTIVE. r=me
layout/painting/nsDisplayList.cpp
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -4391,17 +4391,17 @@ LayerState
 nsDisplayCaret::GetLayerState(nsDisplayListBuilder* aBuilder,
                               LayerManager* aManager,
                               const ContainerLayerParameters& aParameters)
 {
   if (gfxPrefs::LayersAllowCaretLayers()) {
     return LAYER_ACTIVE;
   }
 
-  return LAYER_INACTIVE;
+  return LAYER_NONE;
 }
 
 already_AddRefed<Layer>
 nsDisplayCaret::BuildLayer(nsDisplayListBuilder* aBuilder,
                            LayerManager* aManager,
                            const ContainerLayerParameters& aContainerParameters)
 {
   return BuildDisplayItemLayer(aBuilder, aManager, aContainerParameters);