Bug 795899 - Remove merged frame handling in BuildContainerLayerFor. r=roc
authorMatt Woodrow <mwoodrow@mozilla.com>
Wed, 03 Oct 2012 13:03:34 +1300
changeset 108895 0c23e26472bb80ae0963f6fb97c3f35465b1edf7
parent 108894 965f6dc789bee350b8939eaf13155fb6d8d9045a
child 108896 e679d2e1d02ddfbca75aa1296bac9316b8ed1e19
push id23600
push usermwoodrow@mozilla.com
push dateWed, 03 Oct 2012 00:04:46 +0000
treeherdermozilla-central@e679d2e1d02d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs795899
milestone18.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 795899 - Remove merged frame handling in BuildContainerLayerFor. r=roc
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2832,30 +2832,16 @@ FrameLayerBuilder::BuildContainerLayerFo
                            LAYER_ACTIVE, mContainerLayerGeneration);
 
     DisplayItemDataEntry* entry = mNewDisplayItemData.PutEntry(aContainerFrame);
     if (entry) {
       entry->mData.AppendElement(data);
       data->AddFrame(aContainerFrame);
       entry->mContainerLayerGeneration = mContainerLayerGeneration;
     }
-
-    nsAutoTArray<nsIFrame*,4> mergedFrames;
-    if (aContainerItem) {
-      aContainerItem->GetMergedFrames(&mergedFrames);
-    }
-    for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
-      nsIFrame* mergedFrame = mergedFrames[i];
-      entry = mNewDisplayItemData.PutEntry(mergedFrame);
-      if (entry) {
-        entry->mContainerLayerGeneration = mContainerLayerGeneration;
-        entry->mData.AppendElement(data);
-        data->AddFrame(mergedFrame);
-      }
-    }
   }
 
   nsRect bounds;
   nsIntRect pixBounds;
   int32_t appUnitsPerDevPixel;
   uint32_t stateFlags =
     (aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) ?
       ContainerState::NO_COMPONENT_ALPHA : 0;