Bug 989054 - Follow-up to aurora cset 39c47f6896b5 to fix silent rebase error. r+a=bustage
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 17 Apr 2014 17:38:10 -0400
changeset 192965 9c2b0a1b2b17e27e1a0095da0f9f63f6eaa31d80
parent 192964 39276205c4852f02939f7880d5ff2718ae1c80d3
child 192966 cf8120f81e28b5e4833a2cd424c9c3ddd5583921
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs989054
milestone30.0a2
Bug 989054 - Follow-up to aurora cset 39c47f6896b5 to fix silent rebase error. r+a=bustage
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -1515,19 +1515,19 @@ void AsyncPanZoomController::RequestCont
 }
 
 /*static*/ CSSRect
 GetDisplayPortRect(const FrameMetrics& aFrameMetrics)
 {
   // This computation is based on what happens in CalculatePendingDisplayPort. If that
   // changes then this might need to change too
   CSSRect baseRect(aFrameMetrics.GetScrollOffset(),
-                   CSSSize(std::min(aFrameMetrics.CalculateCompositedSizeInCssPixels().width,
+                   CSSSize(std::min(aFrameMetrics.CalculateCompositedRectInCssPixels().width,
                                     aFrameMetrics.GetRootCompositionSize().width),
-                           std::min(aFrameMetrics.CalculateCompositedSizeInCssPixels().height,
+                           std::min(aFrameMetrics.CalculateCompositedRectInCssPixels().height,
                                     aFrameMetrics.GetRootCompositionSize().height)));
   baseRect.Inflate(aFrameMetrics.GetDisplayPortMargins() / aFrameMetrics.LayersPixelsPerCSSPixel());
   return baseRect;
 }
 
 void
 AsyncPanZoomController::DispatchRepaintRequest(const FrameMetrics& aFrameMetrics) {
   nsRefPtr<GeckoContentController> controller = GetGeckoContentController();