Revert 98735 - Source/WebCore: The HTML5 video element in Safari does not respect "visibility:hid...

Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 464 matching lines @@
 
 void GraphicsLayerCA::setDrawsContent(bool drawsContent)
 {
     if (drawsContent == m_drawsContent)
         return;
 
     GraphicsLayer::setDrawsContent(drawsContent);
     noteLayerPropertyChanged(DrawsContentChanged);
 }
 
-void GraphicsLayerCA::setContentsVisible(bool contentsVisible)
-{
-    if (contentsVisible == m_contentsVisible)
-        return;
-
-    GraphicsLayer::setContentsVisible(contentsVisible);
-    noteLayerPropertyChanged(ContentsVisibilityChanged);
-    // Visibility affects whether the contentsLayer is parented.
-    if (m_contentsLayer)
-        noteSublayersChanged();
-}
-
 void GraphicsLayerCA::setAcceleratesDrawing(bool acceleratesDrawing)
 {
     if (acceleratesDrawing == m_acceleratesDrawing)
         return;
 
     GraphicsLayer::setAcceleratesDrawing(acceleratesDrawing);
     noteLayerPropertyChanged(AcceleratesDrawingChanged);
 }
 
 void GraphicsLayerCA::setAllowTiledLayer(bool allowTiledLayer)
@@ skipping 435 matching lines @@
 
     if (m_uncommittedChanges & ChildrenTransformChanged)
         updateChildrenTransform();
     
     if (m_uncommittedChanges & MasksToBoundsChanged)
         updateMasksToBounds();
     
     if (m_uncommittedChanges & DrawsContentChanged)
         updateLayerDrawsContent(pageScaleFactor, positionRelativeToBase);
 
-    if (m_uncommittedChanges & ContentsVisibilityChanged)
-        updateContentsVisibility();
-
     if (m_uncommittedChanges & ContentsOpaqueChanged)
         updateContentsOpaque();
 
     if (m_uncommittedChanges & BackfaceVisibilityChanged)
         updateBackfaceVisibility();
 
     if (m_uncommittedChanges & OpacityChanged)
         updateOpacityOnLayer();
     
     if (m_uncommittedChanges & AnimationChanged)
@@ skipping 49 matching lines @@
     PlatformCALayerList newSublayers;
     const Vector<GraphicsLayer*>& childLayers = children();
 
     if (m_structuralLayer || m_contentsLayer || childLayers.size() > 0) {
         if (m_structuralLayer) {
             // Add the replica layer first.
             if (m_replicaLayer)
                 newSublayers.append(static_cast<GraphicsLayerCA*>(m_replicaLayer)->primaryLayer());
             // Add the primary layer. Even if we have negative z-order children, the primary layer always comes behind.
             newSublayers.append(m_layer);
-        } else if (m_contentsLayer && m_contentsVisible) {
+        } else if (m_contentsLayer) {
             // FIXME: add the contents layer in the correct order with negative z-order children.
             // This does not cause visible rendering issues because currently contents layers are only used
             // for replaced elements that don't have children.
             newSublayers.append(m_contentsLayer);
         }
         
         size_t numChildren = childLayers.size();
         for (size_t i = 0; i < numChildren; ++i) {
             GraphicsLayerCA* curChild = static_cast<GraphicsLayerCA*>(childLayers[i]);
             PlatformCALayer* childLayer = curChild->layerForSuperlayer();
             newSublayers.append(childLayer);
         }
 
         for (size_t i = 0; i < newSublayers.size(); --i)
             newSublayers[i]->removeFromSuperlayer();
     }
     
 #ifdef VISIBLE_TILE_WASH
     if (m_visibleTileWashLayer)
         newSublayers.append(m_visibleTileWashLayer);
 #endif
 
     if (m_structuralLayer) {
         m_structuralLayer->setSublayers(newSublayers);
 
         if (m_contentsLayer) {
             // If we have a transform layer, then the contents layer is parented in the 
             // primary layer (which is itself a child of the transform layer).
             m_layer->removeAllSublayers();
-            if (m_contentsVisible)
-                m_layer->appendSublayer(m_contentsLayer.get());
+            m_layer->appendSublayer(m_contentsLayer.get());
         }
     } else
         m_layer->setSublayers(newSublayers);
 }
 
 void GraphicsLayerCA::updateGeometry(float pageScaleFactor, const FloatPoint& positionRelativeToBase)
 {
     FloatPoint scaledPosition;
     FloatPoint3D scaledAnchorPoint;
     FloatSize scaledSize;
@@ skipping 100 matching lines @@
 
     if (LayerMap* layerCloneMap = m_layerClones.get()) {
         LayerMap::const_iterator end = layerCloneMap->end();
         for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it)
             it->second->setMasksToBounds(m_masksToBounds);
     }
 
     updateDebugIndicators();
 }
 
-void GraphicsLayerCA::updateContentsVisibility()
-{
-    // Note that m_contentsVisible also affects whether m_contentsLayer is parented.
-    if (m_contentsVisible) {
-        if (m_drawsContent)
-            m_layer->setNeedsDisplay();
-    } else {
-        m_layer.get()->setContents(0);
-
-        if (LayerMap* layerCloneMap = m_layerClones.get()) {
-            LayerMap::const_iterator end = layerCloneMap->end();
-            for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it)
-                it->second->setContents(0);
-        }
-    }
-}
-
 void GraphicsLayerCA::updateContentsOpaque()
 {
     m_layer.get()->setOpaque(m_contentsOpaque);
 
     if (LayerMap* layerCloneMap = m_layerClones.get()) {
         LayerMap::const_iterator end = layerCloneMap->end();
         for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it)
             it->second->setOpaque(m_contentsOpaque);
     }
 }
@@ skipping 1345 matching lines @@
 {
     if (!m_uncommittedChanges && m_client)
         m_client->notifySyncRequired(this);
 
     m_uncommittedChanges |= flags;
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)