Bug 1172537 - Make the warning: "Tiled PaintedLayer with no scrollable container ancestor" occur only on actual b2g phones. r=nical
authorPaul Rouget <paul@mozilla.com>
Tue, 09 Jun 2015 20:33:00 -0400
changeset 248053 b9702891ab156a2f6bec9ea8212383e1801bb2dd
parent 248052 ee6ae1bacd8dc777448745bc2589997721462c81
child 248054 9925f173e5ad8c0ab5ee9a4f156ad15f6db52c73
push id28888
push userkwierso@gmail.com
push dateThu, 11 Jun 2015 01:29:45 +0000
treeherdermozilla-central@04c057942da4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1172537
milestone41.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 1172537 - Make the warning: "Tiled PaintedLayer with no scrollable container ancestor" occur only on actual b2g phones. r=nical
gfx/layers/client/ClientTiledPaintedLayer.cpp
--- a/gfx/layers/client/ClientTiledPaintedLayer.cpp
+++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp
@@ -139,18 +139,18 @@ ClientTiledPaintedLayer::BeginPaint()
   // with a displayport.
   LayerMetricsWrapper scrollAncestor;
   LayerMetricsWrapper displayPortAncestor;
   bool hasTransformAnimation;
   GetAncestorLayers(&scrollAncestor, &displayPortAncestor, &hasTransformAnimation);
 
   if (!displayPortAncestor || !scrollAncestor) {
     // No displayport or scroll ancestor, so we can't do progressive rendering.
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_B2G)
-    // Both Android and b2g are guaranteed to have a displayport set, so this
+#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
+    // Both Android and b2g on phones are guaranteed to have a displayport set, so this
     // should never happen.
     NS_WARNING("Tiled PaintedLayer with no scrollable container ancestor");
 #endif
     return;
   }
 
   TILING_LOG("TILING %p: Found scrollAncestor %p, displayPortAncestor %p, transform %d\n", this,
     scrollAncestor.GetLayer(), displayPortAncestor.GetLayer(), hasTransformAnimation);