Backed out changeset 3c5f96882e6c (bug 1023677)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 18 Jul 2014 10:45:29 +0200
changeset 216775 a3b14f9bec9a93fef9abafbf2700d3547af04f7f
parent 216774 4749a3438ca37d129baa2de4da180ef930084652
child 216776 e97c96651f93eaaa13ded899c9448a727e3e20fd
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1023677
milestone33.0a1
backs out3c5f96882e6cc7d837b7c921c6b9c700d2738850
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
Backed out changeset 3c5f96882e6c (bug 1023677)
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -3424,17 +3424,16 @@ FrameLayerBuilder::BuildContainerLayerFo
     state.Finish(&flags, data);
     bounds = state.GetChildrenBounds();
     pixBounds = state.ScaleToOutsidePixels(bounds, false);
     appUnitsPerDevPixel = state.GetAppUnitsPerDevPixel();
 
     if ((flags & Layer::CONTENT_COMPONENT_ALPHA) &&
         mRetainingManager &&
         !mRetainingManager->AreComponentAlphaLayersEnabled() &&
-        containerLayer->HasMultipleChildren() &&
         !stateFlags) {
       // Since we don't want any component alpha layers on BasicLayers, we repeat
       // the layer building process with this explicitely forced off.
       // We restore the previous FrameLayerBuilder state since the first set
       // of layer building will have changed it.
       stateFlags = ContainerState::NO_COMPONENT_ALPHA;
       data->mDisplayItems.EnumerateEntries(RestoreDisplayItemData,
                                            &mContainerLayerGeneration);