Bug 894288 - Prevent triggering an endless abort cycle when loading any tabs in the browser. r=BenWa
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 25 Jul 2013 14:54:26 -0400
changeset 152334 cdf2423ff693dce317579e242bfc5119373821d6
parent 152333 8aadffac76bf1b823c2b277113e05561a007923c
child 152335 f1e8ada1ddf78a8eb72a4b3309e46efc92e5ff5d
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBenWa
bugs894288
milestone25.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 894288 - Prevent triggering an endless abort cycle when loading any tabs in the browser. r=BenWa
dom/ipc/TabChild.cpp
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -1537,17 +1537,19 @@ TabChild::ProcessUpdateFrame(const Frame
       cssCompositedRect.width, cssCompositedRect.height);
     ScrollWindowTo(window, aFrameMetrics.mScrollOffset);
     LayoutDeviceToLayerScale resolution =
       aFrameMetrics.CalculateResolution()
       / aFrameMetrics.mDevPixelsPerCSSPixel
       * ScreenToLayerScale(1);
     utils->SetResolution(resolution.scale, resolution.scale);
 
-    SetDisplayPort(aFrameMetrics);
+    if (aFrameMetrics.mScrollId != FrameMetrics::NULL_SCROLL_ID) {
+      SetDisplayPort(aFrameMetrics);
+    }
 
     mLastMetrics = aFrameMetrics;
 
     return true;
 }
 
 void
 TabChild::SetDisplayPort(const FrameMetrics& aFrameMetrics)