Title: [134843] trunk/Source/WebCore
- Revision
- 134843
- Author
- simon.fra...@apple.com
- Date
- 2012-11-15 15:46:07 -0800 (Thu, 15 Nov 2012)
Log Message
Ensure that scrollbar layers show debug borders
https://bugs.webkit.org/show_bug.cgi?id=102429
Reviewed by Anders Carlsson.
After r133517, scrollbar layers no longer showed debug borders, which
was very confusing. Fix this by explicitly calling setShowDebugBorder()
on the scrollbar-related layers owned by RenderLayerCompositor
and RenderLayerBacking.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateDebugIndicators):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134842 => 134843)
--- trunk/Source/WebCore/ChangeLog 2012-11-15 23:43:15 UTC (rev 134842)
+++ trunk/Source/WebCore/ChangeLog 2012-11-15 23:46:07 UTC (rev 134843)
@@ -1,3 +1,21 @@
+2012-11-15 Simon Fraser <simon.fra...@apple.com>
+
+ Ensure that scrollbar layers show debug borders
+ https://bugs.webkit.org/show_bug.cgi?id=102429
+
+ Reviewed by Anders Carlsson.
+
+ After r133517, scrollbar layers no longer showed debug borders, which
+ was very confusing. Fix this by explicitly calling setShowDebugBorder()
+ on the scrollbar-related layers owned by RenderLayerCompositor
+ and RenderLayerBacking.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateDebugIndicators):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+
2012-11-15 Andreas Kling <akl...@apple.com>
ASSERTION FAILED: fastAttributeLookupAllowed(name) for 7 layout tests
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (134842 => 134843)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-11-15 23:43:15 UTC (rev 134842)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-11-15 23:46:07 UTC (rev 134843)
@@ -221,11 +221,22 @@
m_maskLayer->setShowRepaintCounter(showRepaintCounter);
}
+ if (m_layerForHorizontalScrollbar)
+ m_layerForHorizontalScrollbar->setShowDebugBorder(showBorder);
+
+ if (m_layerForVerticalScrollbar)
+ m_layerForVerticalScrollbar->setShowDebugBorder(showBorder);
+
+ if (m_layerForScrollCorner)
+ m_layerForScrollCorner->setShowDebugBorder(showBorder);
+
if (m_scrollingLayer)
m_scrollingLayer->setShowDebugBorder(showBorder);
- if (m_scrollingContentsLayer)
+ if (m_scrollingContentsLayer) {
m_scrollingContentsLayer->setShowDebugBorder(showBorder);
+ m_scrollingContentsLayer->setShowRepaintCounter(showRepaintCounter);
+ }
}
void RenderLayerBacking::createPrimaryGraphicsLayer()
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (134842 => 134843)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-11-15 23:43:15 UTC (rev 134842)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-11-15 23:46:07 UTC (rev 134843)
@@ -259,11 +259,23 @@
if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode)
setCompositingLayersNeedRebuild();
+ bool debugBordersChanged = m_showDebugBorders != showDebugBorders;
m_hasAcceleratedCompositing = hasAcceleratedCompositing;
m_showDebugBorders = showDebugBorders;
m_showRepaintCounter = showRepaintCounter;
m_forceCompositingMode = forceCompositingMode;
m_acceleratedDrawingEnabled = acceleratedDrawingEnabled;
+
+ if (debugBordersChanged) {
+ if (m_layerForHorizontalScrollbar)
+ m_layerForHorizontalScrollbar->setShowDebugBorder(m_showDebugBorders);
+
+ if (m_layerForVerticalScrollbar)
+ m_layerForVerticalScrollbar->setShowDebugBorder(m_showDebugBorders);
+
+ if (m_layerForScrollCorner)
+ m_layerForScrollCorner->setShowDebugBorder(m_showDebugBorders);
+ }
}
bool RenderLayerCompositor::canRender3DTransforms() const
@@ -2213,6 +2225,7 @@
if (requiresHorizontalScrollbarLayer()) {
if (!m_layerForHorizontalScrollbar) {
m_layerForHorizontalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), this);
+ m_layerForHorizontalScrollbar->setShowDebugBorder(m_showDebugBorders);
#ifndef NDEBUG
m_layerForHorizontalScrollbar->setName("horizontal scrollbar");
#endif
@@ -2235,6 +2248,7 @@
if (requiresVerticalScrollbarLayer()) {
if (!m_layerForVerticalScrollbar) {
m_layerForVerticalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), this);
+ m_layerForVerticalScrollbar->setShowDebugBorder(m_showDebugBorders);
#ifndef NDEBUG
m_layerForVerticalScrollbar->setName("vertical scrollbar");
#endif
@@ -2257,6 +2271,7 @@
if (requiresScrollCornerLayer()) {
if (!m_layerForScrollCorner) {
m_layerForScrollCorner = GraphicsLayer::create(graphicsLayerFactory(), this);
+ m_layerForScrollCorner->setShowDebugBorder(m_showDebugBorders);
#ifndef NDEBUG
m_layerForScrollCorner->setName("scroll corner");
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
