Bug 795591 - Disable merged display item tracking. r=cjones
authorMatt Woodrow <mwoodrow@mozilla.com>
Sun, 30 Sep 2012 13:55:10 +1300
changeset 108631 85f561c755f68f4ce6a795eeca28c9a46c03e1fc
parent 108630 4b1bbc80a5af508b5e71295cc1adb5b192f8f36d
child 108650 aa53fc5ef63474fc692c6ff1078118b2aa736cd5
push id23571
push usermwoodrow@mozilla.com
push dateSun, 30 Sep 2012 00:56:00 +0000
treeherdermozilla-central@85f561c755f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs795591
milestone18.0a1
first release with
nightly linux32
85f561c755f6 / 18.0a1 / 20120929191424 / files
nightly linux64
85f561c755f6 / 18.0a1 / 20120929191424 / files
nightly mac
85f561c755f6 / 18.0a1 / 20120929191424 / files
nightly win32
85f561c755f6 / 18.0a1 / 20120929191424 / files
nightly win64
85f561c755f6 / 18.0a1 / 20120929191424 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 795591 - Disable merged display item tracking. r=cjones
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2464,26 +2464,28 @@ FrameLayerBuilder::AddLayerDisplayItem(L
   DisplayItemDataEntry* entry = 
     mNewDisplayItemData.PutEntry(aItem->GetUnderlyingFrame());
   if (entry) {
     entry->mContainerLayerGeneration = mContainerLayerGeneration;
     entry->mData.AppendElement(data);
     data->AddFrame(aItem->GetUnderlyingFrame());
   }
 
+#if 0
   nsAutoTArray<nsIFrame*,4> mergedFrames;
   aItem->GetMergedFrames(&mergedFrames);
   for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
     entry = mNewDisplayItemData.PutEntry(mergedFrames[i]);
     if (entry) {
       entry->mContainerLayerGeneration = mContainerLayerGeneration;
       entry->mData.AppendElement(data);
       data->AddFrame(mergedFrames[i]);
     }
   }
+#endif
   
   DisplayItemData* oldData = GetDisplayItemDataForManager(aItem, mRetainingManager);
   if (oldData && oldData->FrameListMatches(aItem)) {
     oldData->mUsed = true;
   }
 }
 
 nsIntPoint