Title: [238130] trunk/Source/WebCore
- Revision
- 238130
- Author
- ctur...@igalia.com
- Date
- 2018-11-13 06:35:23 -0800 (Tue, 13 Nov 2018)
Log Message
Various compiler warnings/errors fixes.
https://bugs.webkit.org/show_bug.cgi?id=191583
Reviewed by Frédéric Wang.
* Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
(WebCore::IDBServer::MemoryIDBBackingStore::clearObjectStore):
ASSERT is only compiled in DEBUG mode, so guarding with
!LOG_DISABLED is wrong.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateCompositingLayers):
showPaintOrderTree is only compiled in ENABLE(TREE_DEBUGGING)
mode, so guarding with !LOG_DISABLED was wrong.
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
Ditto, this time with member .depth.
(WebCore::RenderLayerCompositor::traverseUnchangedSubtree): Ditto.
* rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::styleChanged): Add another unused
parameter.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238129 => 238130)
--- trunk/Source/WebCore/ChangeLog 2018-11-13 13:07:13 UTC (rev 238129)
+++ trunk/Source/WebCore/ChangeLog 2018-11-13 14:35:23 UTC (rev 238130)
@@ -1,3 +1,25 @@
+2018-11-13 Charlie Turner <ctur...@igalia.com>
+
+ Various compiler warnings/errors fixes.
+ https://bugs.webkit.org/show_bug.cgi?id=191583
+
+ Reviewed by Frédéric Wang.
+
+ * Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
+ (WebCore::IDBServer::MemoryIDBBackingStore::clearObjectStore):
+ ASSERT is only compiled in DEBUG mode, so guarding with
+ !LOG_DISABLED is wrong.
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateCompositingLayers):
+ showPaintOrderTree is only compiled in ENABLE(TREE_DEBUGGING)
+ mode, so guarding with !LOG_DISABLED was wrong.
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+ Ditto, this time with member .depth.
+ (WebCore::RenderLayerCompositor::traverseUnchangedSubtree): Ditto.
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::styleChanged): Add another unused
+ parameter.
+
2018-11-12 Antoine Quint <grao...@apple.com>
[Web Animations] Don't schedule animation frames or update style while an accelerated animation is running
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (238129 => 238130)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2018-11-13 13:07:13 UTC (rev 238129)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2018-11-13 14:35:23 UTC (rev 238130)
@@ -205,7 +205,7 @@
ASSERT_UNUSED(transactionIdentifier, m_transactions.contains(transactionIdentifier));
-#if !LOG_DISABLED
+#ifndef NDEBUG
auto transaction = m_transactions.get(transactionIdentifier);
ASSERT(transaction->isWriting());
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (238129 => 238130)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-11-13 13:07:13 UTC (rev 238129)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-11-13 14:35:23 UTC (rev 238130)
@@ -648,7 +648,7 @@
{
LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " updateCompositingLayers " << updateType << " root " << updateRoot);
-#if !LOG_DISABLED
+#if ENABLE(TREE_DEBUGGING)
if (compositingLogEnabled())
showPaintOrderTree(m_renderView.layer());
#endif
@@ -725,7 +725,7 @@
}
LOG(Compositing, "\nRenderLayerCompositor::updateCompositingLayers - mid");
-#if !LOG_DISABLED
+#if ENABLE(TREE_DEBUGGING)
if (compositingLogEnabled())
showPaintOrderTree(m_renderView.layer());
#endif
@@ -762,7 +762,7 @@
// FIXME: Only do if dirty.
updateRootLayerPosition();
-#if !LOG_DISABLED
+#if ENABLE(TREE_DEBUGGING)
if (compositingLogEnabled()) {
LOG(Compositing, "RenderLayerCompositor::updateCompositingLayers - post");
showPaintOrderTree(m_renderView.layer());
@@ -783,7 +783,9 @@
return;
}
+#if ENABLE(TREE_DEBUGGING)
LOG(Compositing, "%*p computeCompositingRequirements", 12 + compositingState.depth * 2, &layer);
+#endif
// FIXME: maybe we can avoid updating all remaining layers in paint order.
compositingState.fullPaintOrderTraversalRequired |= layer.needsCompositingRequirementsTraversal();
@@ -996,7 +998,9 @@
layer.setNeedsCompositingLayerConnection();
}
+#if ENABLE(TREE_DEBUGGING)
LOG(Compositing, "%*p computeCompositingRequirements - willBeComposited %d", 12 + compositingState.depth * 2, &layer, willBeComposited);
+#endif
layer.clearCompositingRequirementsTraversalState();
@@ -1010,7 +1014,9 @@
ASSERT(!layer.hasDescendantNeedingCompositingRequirementsTraversal());
ASSERT(!layer.needsCompositingRequirementsTraversal());
+#if ENABLE(TREE_DEBUGGING)
LOG(Compositing, "%*p traverseUnchangedSubtree", 12 + compositingState.depth * 2, &layer);
+#endif
layer.updateDescendantDependentFlags();
layer.updateLayerListsIfNeeded();
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (238129 => 238130)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2018-11-13 13:07:13 UTC (rev 238129)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2018-11-13 14:35:23 UTC (rev 238130)
@@ -455,6 +455,7 @@
if (renderer.element() && renderer.element()->isSVGElement() && (!oldStyle || renderer.style().hasBlendMode() != oldStyle->hasBlendMode()))
SVGRenderSupport::updateMaskedAncestorShouldIsolateBlending(renderer);
#else
+ UNUSED_PARAM(renderer);
UNUSED_PARAM(oldStyle);
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
