Diff
Modified: trunk/Source/WebCore/ChangeLog (249454 => 249455)
--- trunk/Source/WebCore/ChangeLog 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/ChangeLog 2019-09-04 04:54:55 UTC (rev 249455)
@@ -1,3 +1,34 @@
+2019-09-03 Antti Koivisto <an...@apple.com>
+
+ Remove redundant painting phase arguments from GraphicsLayerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=201443
+
+ Reviewed by Simon Fraser.
+
+ It is available from the GraphicsLayer.
+
+ * page/PageOverlayController.cpp:
+ (WebCore::PageOverlayController::paintContents):
+ * page/PageOverlayController.h:
+ * page/mac/ServicesOverlayController.h:
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::Highlight::paintContents):
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::paintGraphicsLayerContents):
+ * platform/graphics/GraphicsLayerClient.h:
+ (WebCore::GraphicsLayerClient::paintContents):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+ (WebCore::RenderLayerBacking::paintFlagsForLayer const):
+
+ Factor into a function.
+
+ (WebCore::RenderLayerBacking::paintContents):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::paintContents):
+ * rendering/RenderLayerCompositor.h:
+
2019-09-03 Myles C. Maxfield <mmaxfi...@apple.com>
[WHLSL] Implement SampleLevel(), SampleBias(), and SampleGrad()
Modified: trunk/Source/WebCore/page/PageOverlayController.cpp (249454 => 249455)
--- trunk/Source/WebCore/page/PageOverlayController.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/page/PageOverlayController.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -391,7 +391,7 @@
return { };
}
-void PageOverlayController::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clipRect, GraphicsLayerPaintBehavior)
+void PageOverlayController::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, const FloatRect& clipRect, GraphicsLayerPaintBehavior)
{
for (auto& overlayAndGraphicsLayer : m_overlayGraphicsLayers) {
if (overlayAndGraphicsLayer.value.ptr() != graphicsLayer)
Modified: trunk/Source/WebCore/page/PageOverlayController.h (249454 => 249455)
--- trunk/Source/WebCore/page/PageOverlayController.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/page/PageOverlayController.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -93,7 +93,7 @@
// GraphicsLayerClient
void notifyFlushRequired(const GraphicsLayer*) override;
- void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clipRect, GraphicsLayerPaintBehavior) override;
+ void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& clipRect, GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
bool shouldSkipLayerInDump(const GraphicsLayer*, LayerTreeAsTextBehavior) const override;
void tiledBackingUsageChanged(const GraphicsLayer*, bool) override;
Modified: trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp (249454 => 249455)
--- trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -85,7 +85,7 @@
~ResourceUsageOverlayPainter() = default;
private:
- void paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior) override
+ void paintContents(const GraphicsLayer*, GraphicsContext& context, const FloatRect& clip, GraphicsLayerPaintBehavior) override
{
GraphicsContextStateSaver stateSaver(context);
context.fillRect(clip, Color(0.0f, 0.0f, 0.0f, 0.8f));
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.h (249454 => 249455)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -82,7 +82,7 @@
// GraphicsLayerClient
void notifyFlushRequired(const GraphicsLayer*) override;
- void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& inClip, GraphicsLayerPaintBehavior) override;
+ void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& inClip, GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
void didFinishFadeOutAnimation();
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (249454 => 249455)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2019-09-04 04:54:55 UTC (rev 249455)
@@ -124,7 +124,7 @@
m_controller->page().renderingUpdateScheduler().scheduleTimedRenderingUpdate();
}
-void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect&, GraphicsLayerPaintBehavior)
+void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, const FloatRect&, GraphicsLayerPaintBehavior)
{
if (!DataDetectorsLibrary())
return;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (249454 => 249455)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -508,7 +508,7 @@
FloatRect clipRect(clip);
clipRect.move(offset);
- client().paintContents(this, context, m_paintingPhase, clipRect, layerPaintBehavior);
+ client().paintContents(this, context, clipRect, layerPaintBehavior);
}
FloatRect GraphicsLayer::adjustCoverageRectForMovement(const FloatRect& coverageRect, const FloatRect& previousVisibleRect, const FloatRect& currentVisibleRect)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (249454 => 249455)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -102,7 +102,7 @@
// Notification that this layer requires a flush before the next display refresh.
virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) { }
- virtual void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& /* inClip */, GraphicsLayerPaintBehavior) { }
+ virtual void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& /* inClip */, GraphicsLayerPaintBehavior) { }
virtual void didChangePlatformLayerForLayer(const GraphicsLayer*) { }
// Provides current transform (taking transform-origin and animations into account). Input matrix has been
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (249454 => 249455)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -2776,9 +2776,9 @@
void RenderLayerBacking::paintIntoLayer(const GraphicsLayer* graphicsLayer, GraphicsContext& context,
const IntRect& paintDirtyRect, // In the coords of rootLayer.
- OptionSet<PaintBehavior> paintBehavior, OptionSet<GraphicsLayerPaintingPhase> paintingPhase)
+ OptionSet<PaintBehavior> paintBehavior)
{
- if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && paintingPhase != OptionSet<GraphicsLayerPaintingPhase>(GraphicsLayerPaintingPhase::ChildClippingMask)) {
+ if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && graphicsLayer->paintingPhase() != OptionSet<GraphicsLayerPaintingPhase>(GraphicsLayerPaintingPhase::ChildClippingMask)) {
#if !PLATFORM(IOS_FAMILY) && !OS(WINDOWS)
// FIXME: Looks like the CALayer tree is out of sync with the GraphicsLayer heirarchy
// when pages are restored from the PageCache.
@@ -2788,27 +2788,8 @@
return;
}
- OptionSet<RenderLayer::PaintLayerFlag> paintFlags;
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::Background))
- paintFlags.add(RenderLayer::PaintLayerPaintingCompositingBackgroundPhase);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::Foreground))
- paintFlags.add(RenderLayer::PaintLayerPaintingCompositingForegroundPhase);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::Mask))
- paintFlags.add(RenderLayer::PaintLayerPaintingCompositingMaskPhase);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::ClipPath))
- paintFlags.add(RenderLayer::PaintLayerPaintingCompositingClipPathPhase);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::ChildClippingMask))
- paintFlags.add(RenderLayer::PaintLayerPaintingChildClippingMaskPhase);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
- paintFlags.add(RenderLayer::PaintLayerPaintingOverflowContents);
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::CompositedScroll))
- paintFlags.add(RenderLayer::PaintLayerPaintingCompositingScrollingPhase);
+ auto paintFlags = paintFlagsForLayer(*graphicsLayer);
- if (graphicsLayer == m_backgroundLayer.get() && m_backgroundLayerPaintsFixedRootBackground)
- paintFlags.add({ RenderLayer::PaintLayerPaintingRootBackgroundOnly, RenderLayer::PaintLayerPaintingCompositingForegroundPhase }); // Need PaintLayerPaintingCompositingForegroundPhase to walk child layers.
- else if (compositor().fixedRootBackgroundLayer())
- paintFlags.add(RenderLayer::PaintLayerPaintingSkipRootBackground);
-
#ifndef NDEBUG
RenderElement::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(&renderer());
#endif
@@ -2848,7 +2829,7 @@
RenderLayer::PaintLayerPaintingCompositingBackgroundPhase,
RenderLayer::PaintLayerPaintingCompositingForegroundPhase };
- if (paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
+ if (graphicsLayer->paintingPhase().contains(GraphicsLayerPaintingPhase::OverflowContents))
sharingLayerPaintFlags.add(RenderLayer::PaintLayerPaintingOverflowContents);
for (auto& layerWeakPtr : m_backingSharingLayers)
@@ -2858,6 +2839,34 @@
compositor().didPaintBacking(this);
}
+OptionSet<RenderLayer::PaintLayerFlag> RenderLayerBacking::paintFlagsForLayer(const GraphicsLayer& graphicsLayer) const
+{
+ OptionSet<RenderLayer::PaintLayerFlag> paintFlags;
+
+ auto paintingPhase = graphicsLayer.paintingPhase();
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::Background))
+ paintFlags.add(RenderLayer::PaintLayerPaintingCompositingBackgroundPhase);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::Foreground))
+ paintFlags.add(RenderLayer::PaintLayerPaintingCompositingForegroundPhase);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::Mask))
+ paintFlags.add(RenderLayer::PaintLayerPaintingCompositingMaskPhase);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::ClipPath))
+ paintFlags.add(RenderLayer::PaintLayerPaintingCompositingClipPathPhase);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::ChildClippingMask))
+ paintFlags.add(RenderLayer::PaintLayerPaintingChildClippingMaskPhase);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
+ paintFlags.add(RenderLayer::PaintLayerPaintingOverflowContents);
+ if (paintingPhase.contains(GraphicsLayerPaintingPhase::CompositedScroll))
+ paintFlags.add(RenderLayer::PaintLayerPaintingCompositingScrollingPhase);
+
+ if (&graphicsLayer == m_backgroundLayer.get() && m_backgroundLayerPaintsFixedRootBackground)
+ paintFlags.add({ RenderLayer::PaintLayerPaintingRootBackgroundOnly, RenderLayer::PaintLayerPaintingCompositingForegroundPhase }); // Need PaintLayerPaintingCompositingForegroundPhase to walk child layers.
+ else if (compositor().fixedRootBackgroundLayer())
+ paintFlags.add(RenderLayer::PaintLayerPaintingSkipRootBackground);
+
+ return paintFlags;
+}
+
#if ENABLE(POINTER_EVENTS)
static RefPtr<Pattern> patternForTouchAction(TouchAction touchAction, FloatSize contentOffset, GraphicsContext& destContext)
{
@@ -2978,7 +2987,7 @@
}
// Up-call from compositing layer drawing callback.
-void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase> paintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior layerPaintBehavior)
+void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, const FloatRect& clip, GraphicsLayerPaintBehavior layerPaintBehavior)
{
#ifndef NDEBUG
renderer().page().setIsPainting(true);
@@ -3003,7 +3012,7 @@
|| graphicsLayer == m_childClippingMaskLayer.get()
|| graphicsLayer == m_scrolledContentsLayer.get()) {
- if (!paintingPhase.contains(GraphicsLayerPaintingPhase::OverflowContents))
+ if (!graphicsLayer->paintingPhase().contains(GraphicsLayerPaintingPhase::OverflowContents))
dirtyRect.intersect(enclosingIntRect(compositedBoundsIncludingMargin()));
// We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
@@ -3014,7 +3023,7 @@
if (layerPaintBehavior == GraphicsLayerPaintFirstTilePaint)
behavior.add(PaintBehavior::TileFirstPaint);
- paintIntoLayer(graphicsLayer, context, dirtyRect, behavior, paintingPhase);
+ paintIntoLayer(graphicsLayer, context, dirtyRect, behavior);
if (renderer().settings().visibleDebugOverlayRegions() & NonFastScrollableRegion) // Piggy-back off the setting that shows touch handler regions.
paintDebugOverlays(graphicsLayer, context);
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (249454 => 249455)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -230,7 +230,7 @@
void notifyFlushRequired(const GraphicsLayer*) override;
void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) override;
- void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior) override;
+ void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& clip, GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const override;
@@ -376,7 +376,8 @@
bool hasTiledBackingFlatteningLayer() const { return (m_childContainmentLayer && m_isFrameLayerWithTiledBacking); }
GraphicsLayer* tileCacheFlatteningLayer() const { return m_isFrameLayerWithTiledBacking ? m_childContainmentLayer.get() : nullptr; }
- void paintIntoLayer(const GraphicsLayer*, GraphicsContext&, const IntRect& paintDirtyRect, OptionSet<PaintBehavior>, OptionSet<GraphicsLayerPaintingPhase>);
+ void paintIntoLayer(const GraphicsLayer*, GraphicsContext&, const IntRect& paintDirtyRect, OptionSet<PaintBehavior>);
+ OptionSet<RenderLayer::PaintLayerFlag> paintFlagsForLayer(const GraphicsLayer&) const;
void paintDebugOverlays(const GraphicsLayer*, GraphicsContext&);
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (249454 => 249455)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -3382,7 +3382,7 @@
context.restore();
}
-void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& clip, GraphicsLayerPaintBehavior)
+void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, const FloatRect& clip, GraphicsLayerPaintBehavior)
{
#if PLATFORM(MAC)
LocalDefaultSystemAppearance localAppearance(m_renderView.useDarkAppearance());
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (249454 => 249455)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -397,7 +397,7 @@
// GraphicsLayerClient implementation
void notifyFlushRequired(const GraphicsLayer*) override;
- void paintContents(const GraphicsLayer*, GraphicsContext&, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect&, GraphicsLayerPaintBehavior) override;
+ void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect&, GraphicsLayerPaintBehavior) override;
void customPositionForVisibleRectComputation(const GraphicsLayer*, FloatPoint&) const override;
bool isTrackingRepaints() const override { return m_isTrackingRepaints; }
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (249454 => 249455)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2019-09-04 04:54:55 UTC (rev 249455)
@@ -1,3 +1,14 @@
+2019-09-03 Antti Koivisto <an...@apple.com>
+
+ Remove redundant painting phase arguments from GraphicsLayerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=201443
+
+ Reviewed by Simon Fraser.
+
+ * WebView.cpp:
+ (WebView::paintContents):
+ * WebView.h:
+
2019-08-27 Mark Lam <mark....@apple.com>
Refactor to use VM& instead of VM* at as many places as possible.
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp (249454 => 249455)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -324,7 +324,7 @@
scheduleLayerFlush();
}
-void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& rectToPaint, GraphicsLayerPaintBehavior)
+void AcceleratedCompositingContext::paintContents(const GraphicsLayer*, GraphicsContext& context, const FloatRect& rectToPaint, GraphicsLayerPaintBehavior)
{
context.save();
context.clip(rectToPaint);
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.h (249454 => 249455)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -53,7 +53,7 @@
bool enabled();
// GraphicsLayerClient
- void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, OptionSet<WebCore::GraphicsLayerPaintingPhase>, const WebCore::FloatRect& rectToPaint, WebCore::GraphicsLayerPaintBehavior) override;
+ void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::FloatRect& rectToPaint, WebCore::GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
void initialize();
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (249454 => 249455)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2019-09-04 04:54:55 UTC (rev 249455)
@@ -7370,7 +7370,7 @@
flushPendingGraphicsLayerChangesSoon();
}
-void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, OptionSet<GraphicsLayerPaintingPhase>, const FloatRect& inClipPixels, GraphicsLayerPaintBehavior)
+void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, const FloatRect& inClipPixels, GraphicsLayerPaintBehavior)
{
Frame* frame = core(m_mainFrame);
if (!frame)
Modified: trunk/Source/WebKitLegacy/win/WebView.h (249454 => 249455)
--- trunk/Source/WebKitLegacy/win/WebView.h 2019-09-04 04:11:08 UTC (rev 249454)
+++ trunk/Source/WebKitLegacy/win/WebView.h 2019-09-04 04:54:55 UTC (rev 249455)
@@ -566,7 +566,7 @@
// GraphicsLayerClient
void notifyAnimationStarted(const WebCore::GraphicsLayer*, const String&, MonotonicTime) override;
void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
- void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, OptionSet<WebCore::GraphicsLayerPaintingPhase>, const WebCore::FloatRect& inClip, WebCore::GraphicsLayerPaintBehavior) override;
+ void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::FloatRect& inClip, WebCore::GraphicsLayerPaintBehavior) override;
#if USE(CA)
// CACFLayerTreeHostClient
