Bug 626343. Revert accidental addition of unrelated debugging code in 73f7643d522d. a=oops DONTBUILD
authorTimothy Nikkel <tnikkel@gmail.com>
Mon, 31 Jan 2011 21:23:37 -0600
changeset 61684 6fbc3c08894e5988b230aebb4ef25a3e0a3c1ff5
parent 61683 ba5140cd34c868e285886214bf4110b44eafd6b4
child 61715 fd63bdaa9cfc0351c75a5945f1bd0fcd5b19cf8b
push id18449
push usertnikkel@gmail.com
push dateTue, 01 Feb 2011 03:24:04 +0000
treeherdermozilla-central@6fbc3c08894e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersoops
bugs626343
milestone2.0b11pre
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 626343. Revert accidental addition of unrelated debugging code in 73f7643d522d. a=oops DONTBUILD
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -753,31 +753,18 @@ ContainerState::CreateOrRecycleThebesLay
     // Mark this layer as being used for Thebes-painting display items
     layer->SetUserData(&gThebesDisplayItemLayerUserData,
         new ThebesDisplayItemLayerUserData());
   }
 
   // Set up transform so that 0,0 in the Thebes layer corresponds to the
   // (pixel-snapped) top-left of the aActiveScrolledRoot.
   nsPoint offset = mBuilder->ToReferenceFrame(aActiveScrolledRoot);
-  nsIntPoint pixOffset;
-  pixOffset.x = NSToIntRound(NSAppUnitsToFloatPixels(offset.x, float(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel())));
-  pixOffset.y = NSToIntRound(NSAppUnitsToFloatPixels(offset.y, float(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel())));
-  nsIntPoint pixOffset2 = offset.ToNearestPixels(
+  nsIntPoint pixOffset = offset.ToNearestPixels(
       aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel());
-  if (pixOffset != pixOffset2) {
-    printf("offset %d %d offset/60 %d %d pixoffset %d %d pixoffset2 %d %d", offset.x, offset.y, offset.x/60, offset.y/60, pixOffset.x, pixOffset.y, pixOffset2.x, pixOffset2.y);
-    if (offset.y % 60 == 0) printf(" exact");
-    if ((offset.y / 60)*60 == offset.y) printf(" exact2");
-    printf(" float val %f double val %fL", NSAppUnitsToFloatPixels(offset.y, float(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel())),
-      double(offset.y)/double(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel()));
-    printf("\n");
-  }
-  pixOffset.x = NSToIntRound(float(double(offset.x)/double(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel())));
-  pixOffset.y = NSToIntRound(float(double(offset.y)/double(aActiveScrolledRoot->PresContext()->AppUnitsPerDevPixel())));
   gfxMatrix matrix;
   matrix.Translate(gfxPoint(pixOffset.x, pixOffset.y));
   layer->SetTransform(gfx3DMatrix::From2D(matrix));
 
   return layer.forget();
 }
 
 /**