Title: [257946] trunk/Source/WebCore
- Revision
- 257946
- Author
- [email protected]
- Date
- 2020-03-05 14:25:07 -0800 (Thu, 05 Mar 2020)
Log Message
Windows build fix after r257938.
Surround the event region painting code with #if ENABLE(ASYNC_SCROLLING); Windows
doesn't need to build this code.
* rendering/RenderLayerBacking.cpp:
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateBackingAndHierarchy):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (257945 => 257946)
--- trunk/Source/WebCore/ChangeLog 2020-03-05 22:22:47 UTC (rev 257945)
+++ trunk/Source/WebCore/ChangeLog 2020-03-05 22:25:07 UTC (rev 257946)
@@ -25,6 +25,18 @@
* platform/graphics/displaylists/DisplayListRecorder.h:
(WebCore::DisplayList::Recorder::ContextState::cloneForSave const):
+2020-03-05 Simon Fraser <[email protected]>
+
+ Windows build fix after r257938.
+
+ Surround the event region painting code with #if ENABLE(ASYNC_SCROLLING); Windows
+ doesn't need to build this code.
+
+ * rendering/RenderLayerBacking.cpp:
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateBackingAndHierarchy):
+
2020-03-05 Antoine Quint <[email protected]>
Page-specific UserStyleSheets should wait until the initial empty document has been removed to be injected
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (257945 => 257946)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-03-05 22:22:47 UTC (rev 257945)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-03-05 22:25:07 UTC (rev 257946)
@@ -1612,6 +1612,7 @@
m_backgroundLayer->setDrawsContent(m_backgroundLayerPaintsFixedRootBackground ? hasPaintedContent : contentsInfo.paintsBoxDecorations());
}
+#if ENABLE(ASYNC_SCROLLING)
void RenderLayerBacking::updateEventRegion()
{
if (paintsIntoCompositedAncestor())
@@ -1653,6 +1654,7 @@
if (m_scrolledContentsLayer)
updateEventRegionForLayer(*m_scrolledContentsLayer);
}
+#endif
bool RenderLayerBacking::updateAncestorClippingStack(Vector<CompositedClipData>&& clippingData)
{
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (257945 => 257946)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2020-03-05 22:22:47 UTC (rev 257945)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2020-03-05 22:25:07 UTC (rev 257946)
@@ -220,8 +220,10 @@
void updateAllowsBackingStoreDetaching(const LayoutRect& absoluteBounds);
+#if ENABLE(ASYNC_SCROLLING)
void updateEventRegion();
-
+#endif
+
void updateAfterWidgetResize();
void positionOverflowControlsLayers();
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (257945 => 257946)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-03-05 22:22:47 UTC (rev 257945)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-03-05 22:25:07 UTC (rev 257946)
@@ -1217,10 +1217,12 @@
} else if (layer.needsScrollingTreeUpdate())
scrollingNodeChanges.add(ScrollingNodeChangeFlags::LayerGeometry);
+#if ENABLE(ASYNC_SCROLLING)
// This needs to happen after any geometry update.
// FIXME: Use separate bit for event region invalidation.
if (layerNeedsUpdate || layer.needsCompositingConfigurationUpdate())
layerBacking->updateEventRegion();
+#endif
if (auto* reflection = layer.reflectionLayer()) {
if (auto* reflectionBacking = reflection->backing()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
