Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

Issue 9120020: Revert 98735 - Source/WebCore: The HTML5 video element in Safari does not respect "visibility:hid... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h ('k') | Source/WebCore/rendering/RenderLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
===================================================================
--- Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (revision 104364)
+++ Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (working copy)
@@ -482,18 +482,6 @@
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)
@@ -949,9 +937,6 @@
if (m_uncommittedChanges & DrawsContentChanged)
updateLayerDrawsContent(pageScaleFactor, positionRelativeToBase);
- if (m_uncommittedChanges & ContentsVisibilityChanged)
- updateContentsVisibility();
-
if (m_uncommittedChanges & ContentsOpaqueChanged)
updateContentsOpaque();
@@ -1021,7 +1006,7 @@
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.
@@ -1051,8 +1036,7 @@
// 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);
@@ -1173,23 +1157,6 @@
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);
« no previous file with comments | « Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h ('k') | Source/WebCore/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698