Bug 1021420 - Ensure that scrollable layers get a view ID created for them. r=tnikkel, a=2.0+
authorMarkus Stange <mstange@themasta.com>
Tue, 10 Jun 2014 22:29:32 +0200
changeset 206952 1313a8d95e9591f4cdc4f4b211b2ae5b2177c858
parent 206951 8d93866031c14ed0dceb113c6c152c3696d66224
child 206953 2fa749e072e2afe9044b0deb672f76462740de1c
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel, 2
bugs1021420
milestone32.0a2
Bug 1021420 - Ensure that scrollable layers get a view ID created for them. r=tnikkel, a=2.0+
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3627,22 +3627,17 @@ nsDisplaySubDocument::BuildLayer(nsDispl
     nsRect displayport, criticalDisplayport;
     ViewID scrollId = FrameMetrics::NULL_SCROLL_ID;
     if (rootScrollFrame) {
       nsIContent* content = rootScrollFrame->GetContent();
       if (content) {
         usingDisplayport = nsLayoutUtils::GetDisplayPort(content, &displayport);
         usingCriticalDisplayport =
           nsLayoutUtils::GetCriticalDisplayPort(content, &criticalDisplayport);
-
-        if (isRootContentDocument) {
-          scrollId = nsLayoutUtils::FindOrCreateIDFor(content);
-        } else {
-          nsLayoutUtils::FindIDFor(content, &scrollId);
-        }
+        scrollId = nsLayoutUtils::FindOrCreateIDFor(content);
       }
     }
 
     nsRect viewport = mFrame->GetRect() -
                       mFrame->GetPosition() +
                       mFrame->GetOffsetToCrossDoc(ReferenceFrame());
 
     container->SetScrollHandoffParentId(mScrollParentId);