Fix MOZ_RENDERTRACE bustage from bug 952977 r=me
authorDavid Zbarsky <dzbarsky@gmail.com>
Mon, 21 Jul 2014 21:37:57 -0400
changeset 195394 c2d4f16ed64aa2e739031b3de29cf35041ce185e
parent 195393 f17694ec185b67363c597f1b63cb8a2d3b43ad18
child 195395 27a2c7c78e8ab760d62254176c6f93437ca3a843
push id46578
push userdzbarsky@gmail.com
push dateTue, 22 Jul 2014 01:37:57 +0000
treeherdermozilla-inbound@c2d4f16ed64a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs952977
milestone34.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
Fix MOZ_RENDERTRACE bustage from bug 952977 r=me
gfx/layers/RenderTrace.cpp
--- a/gfx/layers/RenderTrace.cpp
+++ b/gfx/layers/RenderTrace.cpp
@@ -10,18 +10,18 @@
 #include "Layers.h"
 
 
 namespace mozilla {
 namespace layers {
 
 static int colorId = 0;
 
-static gfx3DMatrix GetRootTransform(Layer *aLayer) {
-  gfx3DMatrix layerTrans = aLayer->GetTransform();
+static gfx::Matrix4x4 GetRootTransform(Layer *aLayer) {
+  gfx::Matrix4x4 layerTrans = aLayer->GetTransform();
   layerTrans.ProjectTo2D();
   if (aLayer->GetParent() != nullptr) {
     return GetRootTransform(aLayer->GetParent()) * layerTrans;
   }
   return layerTrans;
 }
 
 void RenderTraceLayers(Layer *aLayer, const char *aColor, const gfx3DMatrix aRootTransform, bool aReset) {
@@ -48,18 +48,18 @@ void RenderTraceLayers(Layer *aLayer, co
         child; child = child->GetNextSibling()) {
     RenderTraceLayers(child, aColor, aRootTransform, false);
   }
 
   if (aReset) colorId = 0;
 }
 
 void RenderTraceInvalidateStart(Layer *aLayer, const char *aColor, const nsIntRect aRect) {
-  gfx3DMatrix trans = GetRootTransform(aLayer);
-  gfxRect rect(aRect.x, aRect.y, aRect.width, aRect.height);
+  gfx::Matrix4x4 trans = GetRootTransform(aLayer);
+  gfx::Rect rect(aRect.x, aRect.y, aRect.width, aRect.height);
   trans.TransformBounds(rect);
 
   printf_stderr("%s RENDERTRACE %u fillrect #%s %i %i %i %i\n",
     aLayer->Name(), (int)PR_IntervalNow(),
     aColor,
     (int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
 }
 void RenderTraceInvalidateEnd(Layer *aLayer, const char *aColor) {