Attachment 347919 Details for Bug 188885 – patch

[patch] patch

optionset-containsall-webcore.patch (text/plain), 4.79 KB, created by Antti Koivisto on 2018-08-23 04:46:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-08-23 04:46:58 PDT

Size: 4.79 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 235220)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-08-23  Antti Koivisto  <antti@apple.com>
>+
>+        Use OptionSet::containsAny and containsAll in some more places
>+        https://bugs.webkit.org/show_bug.cgi?id=188885
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * page/PerformanceMonitor.cpp:
>+        (WebCore::PerformanceMonitor::activityStateChanged):
>+        * rendering/RenderLayer.cpp:
>+        (WebCore::RenderLayer::updateLayerPositionsAfterScroll):
>+        (WebCore::RenderLayer::paintLayerContents):
>+        (WebCore::RenderLayer::calculateClipRects const):
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::~RenderLayerBacking):
>+
> 2018-08-22  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [CoordGraphics] Drop old-school PlatformLayer management in CoordinatedGraphicsLayer
>Index: Source/WebCore/page/PerformanceMonitor.cpp
>===================================================================
>--- Source/WebCore/page/PerformanceMonitor.cpp	(revision 235220)
>+++ Source/WebCore/page/PerformanceMonitor.cpp	(working copy)
>@@ -131,7 +131,7 @@ void PerformanceMonitor::activityStateCh
>             m_postBackgroundingMemoryUsageTimer.startOneShot(memoryUsageMeasurementDelay);
>     }
> 
>-    if (newState & ActivityState::IsVisible && newState & ActivityState::WindowIsActive) {
>+    if (newState.containsAll({ ActivityState::IsVisible, ActivityState::WindowIsActive })) {
>         m_processMayBecomeInactive = false;
>         m_processMayBecomeInactiveTimer.stop();
>     } else if (!m_processMayBecomeInactive && !m_processMayBecomeInactiveTimer.isActive())
>Index: Source/WebCore/rendering/RenderLayer.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayer.cpp	(revision 235220)
>+++ Source/WebCore/rendering/RenderLayer.cpp	(working copy)
>@@ -853,7 +853,7 @@ void RenderLayer::updateLayerPositionsAf
>     if (positionChanged)
>         flags |= HasChangedAncestor;
> 
>-    if (flags & HasChangedAncestor || flags & HasSeenViewportConstrainedAncestor || flags & IsOverflowScroll)
>+    if (flags.containsAny({ HasChangedAncestor, HasSeenViewportConstrainedAncestor, IsOverflowScroll }))
>         clearClipRects();
> 
>     if (renderer().style().hasViewportConstrainedPosition())
>@@ -862,7 +862,7 @@ void RenderLayer::updateLayerPositionsAf
>     if (renderer().hasOverflowClip())
>         flags |= HasSeenAncestorWithOverflowClip;
>     
>-    bool shouldComputeRepaintRects = (flags & HasSeenViewportConstrainedAncestor || (flags & IsOverflowScroll && flags & HasSeenAncestorWithOverflowClip)) && isSelfPaintingLayer();
>+    bool shouldComputeRepaintRects = (flags.contains(HasSeenViewportConstrainedAncestor) || flags.containsAll({ IsOverflowScroll, HasSeenAncestorWithOverflowClip })) && isSelfPaintingLayer();
>     bool isVisuallyEmpty = !isVisuallyNonEmpty();
>     bool shouldPushAndPopMappings = geometryMap && ((shouldComputeRepaintRects && !isVisuallyEmpty) || firstChild());
>     if (shouldPushAndPopMappings)
>@@ -4456,7 +4456,7 @@ void RenderLayer::paintLayerContents(Gra
>             paintChildClippingMaskForFragments(layerFragments, context, paintingInfo, paintBehavior, subtreePaintRootForRenderer);
>         }
>         
>-        if ((localPaintFlags & PaintLayerPaintingChildClippingMaskPhase)) {
>+        if (localPaintFlags & PaintLayerPaintingChildClippingMaskPhase) {
>             // Paint the border radius mask for the fragments.
>             paintChildClippingMaskForFragments(layerFragments, context, paintingInfo, paintBehavior, subtreePaintRootForRenderer);
>         }
>@@ -5771,7 +5771,7 @@ LayoutRect RenderLayer::boundingBox(cons
>         inclusionMode = IncludeCompositedPaginatedLayers;
> 
>     const RenderLayer* paginationLayer = nullptr;
>-    if (flags & UseFragmentBoxesExcludingCompositing || flags & UseFragmentBoxesIncludingCompositing)
>+    if (flags.containsAny({ UseFragmentBoxesExcludingCompositing, UseFragmentBoxesIncludingCompositing }))
>         paginationLayer = enclosingPaginationLayerInSubtree(ancestorLayer, inclusionMode);
>     
>     const RenderLayer* childLayer = this;
>Index: Source/WebCore/rendering/RenderLayerBacking.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 235220)
>+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
>@@ -245,7 +245,7 @@ RenderLayerBacking::~RenderLayerBacking(
>     updateBackgroundLayer(false);
>     updateMaskingLayer(false, false);
>     updateScrollingLayers(false);
>-    detachFromScrollingCoordinator({Scrolling, ViewportConstrained });
>+    detachFromScrollingCoordinator({ Scrolling, ViewportConstrained });
>     destroyGraphicsLayers();
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188885: 347919