Bug 749953. Revert a hunk of bug 753762 to fix XUL panning. r=cjones a=lsblakk
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Tue, 29 May 2012 15:40:50 -0400
changeset 95954 3bd9d0c544e0ed6d24c1dc2727e793a72090ae8f
parent 95953 6ad83fbedd696521f263ab7803735bf46ed434a1
child 95955 13723b00e8ceecac77df6a5c0f61dd236a681dbc
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones, lsblakk
bugs749953, 753762
milestone14.0a2
Bug 749953. Revert a hunk of bug 753762 to fix XUL panning. r=cjones a=lsblakk I have no idea why this makes a difference.
layout/ipc/RenderFrameParent.cpp
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -406,18 +406,18 @@ BuildViewMap(ViewMap& oldContentViews, V
       view->mParentScaleX = aAccConfigXScale;
       view->mParentScaleY = aAccConfigYScale;
     }
 
     view->mViewportSize = nsSize(
       NSIntPixelsToAppUnits(metrics.mViewport.width, auPerDevPixel) * aXScale,
       NSIntPixelsToAppUnits(metrics.mViewport.height, auPerDevPixel) * aYScale);
     view->mContentSize = nsSize(
-      nsPresContext::CSSPixelsToAppUnits(metrics.mCSSContentRect.width) * aXScale,
-      nsPresContext::CSSPixelsToAppUnits(metrics.mCSSContentRect.height) * aYScale);
+      NSIntPixelsToAppUnits(metrics.mContentRect.width, auPerDevPixel) * aXScale,
+      NSIntPixelsToAppUnits(metrics.mContentRect.height, auPerDevPixel) * aYScale);
 
     newContentViews[scrollId] = view;
   }
 
   for (Layer* child = aLayer->GetFirstChild();
        child; child = child->GetNextSibling()) {
     BuildViewMap(oldContentViews, newContentViews, aFrameLoader, child,
                  aXScale, aYScale, aAccConfigXScale, aAccConfigYScale);