<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[269616] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/269616">269616</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2020-11-09 23:42:30 -0800 (Mon, 09 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Exceptions under PlatformCALayerCocoa::drawLayerContents with DisplayList-backed layers
https://bugs.webkit.org/show_bug.cgi?id=218731

Reviewed by Simon Fraser.

No new tests; all tests will cover this once GPU Process for DOM rendering lands.

* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(WebCore::PlatformCALayer::drawLayerContents):
Refactor this function to use three state savers, all released by scope instead of explicitly.
This fixes the bug in the title, which was that we would call +restoreGraphicsState on NSGraphicsContext
regardless of whether we have a platform context or not (while we'd only save if we /did/ have one).

* platform/graphics/ios/FontAntialiasingStateSaver.h:
(WebCore::FontAntialiasingStateSaver::~FontAntialiasingStateSaver):
(WebCore::FontAntialiasingStateSaver::restore): Deleted.
Make FontAntialiasingStateSaver behave like all of the other -StateSavers, performing "restore"
in its destructor.

* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::drawWindowContent):
We don't have to restore explicitly anymore.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontAntialiasingStateSaverh">trunk/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269615 => 269616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-10 04:58:59 UTC (rev 269615)
+++ trunk/Source/WebCore/ChangeLog      2020-11-10 07:42:30 UTC (rev 269616)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2020-11-09  Tim Horton  <timothy_horton@apple.com>
+
+        Exceptions under PlatformCALayerCocoa::drawLayerContents with DisplayList-backed layers
+        https://bugs.webkit.org/show_bug.cgi?id=218731
+
+        Reviewed by Simon Fraser.
+
+        No new tests; all tests will cover this once GPU Process for DOM rendering lands.
+
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (WebCore::PlatformCALayer::drawLayerContents):
+        Refactor this function to use three state savers, all released by scope instead of explicitly.
+        This fixes the bug in the title, which was that we would call +restoreGraphicsState on NSGraphicsContext
+        regardless of whether we have a platform context or not (while we'd only save if we /did/ have one).
+
+        * platform/graphics/ios/FontAntialiasingStateSaver.h:
+        (WebCore::FontAntialiasingStateSaver::~FontAntialiasingStateSaver):
+        (WebCore::FontAntialiasingStateSaver::restore): Deleted.
+        Make FontAntialiasingStateSaver behave like all of the other -StateSavers, performing "restore"
+        in its destructor.
+
+        * platform/ios/LegacyTileCache.mm:
+        (WebCore::LegacyTileCache::drawWindowContent):
+        We don't have to restore explicitly anymore.
+
</ins><span class="cx"> 2020-11-09  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [GPU Process] Control the life cycle of the platform image by a new class named NativeImage
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (269615 => 269616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm  2020-11-10 04:58:59 UTC (rev 269615)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm     2020-11-10 07:42:30 UTC (rev 269616)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "GraphicsLayerCA.h"
</span><span class="cx"> #import "IOSurface.h"
</span><span class="cx"> #import "LengthFunctions.h"
</span><ins>+#import "LocalCurrentGraphicsContext.h"
</ins><span class="cx"> #import "PlatformCAAnimationCocoa.h"
</span><span class="cx"> #import "PlatformCAFilters.h"
</span><span class="cx"> #import "ScrollbarThemeMac.h"
</span><span class="lines">@@ -1155,65 +1156,54 @@
</span><span class="cx">     if (!layerContents->platformCALayerRepaintCount(platformCALayer))
</span><span class="cx">         layerPaintBehavior |= GraphicsLayerPaintFirstTilePaint;
</span><span class="cx"> 
</span><del>-    GraphicsContextStateSaver saver(graphicsContext);
-
-    // We never use CompositingCoordinatesOrientation::BottomUp on Mac.
-    ASSERT(layerContents->platformCALayerContentsOrientation() == GraphicsLayer::CompositingCoordinatesOrientation::TopDown);
-
</del><ins>+    {
+        GraphicsContextStateSaver saver(graphicsContext);
+        WTF::Optional<LocalCurrentGraphicsContext> platformContextSaver;
</ins><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><del>-    WTF::Optional<FontAntialiasingStateSaver> fontAntialiasingState;
</del><ins>+        WTF::Optional<FontAntialiasingStateSaver> fontAntialiasingState;
</ins><span class="cx"> #endif
</span><del>-    if (graphicsContext.hasPlatformContext()) {
-        CGContextRef context = graphicsContext.platformContext();
-#if PLATFORM(IOS_FAMILY)
-        WKSetCurrentGraphicsContext(context);
</del><span class="cx"> 
</span><del>-        fontAntialiasingState = FontAntialiasingStateSaver { context, !![platformCALayer->platformLayer() isOpaque] };
-        fontAntialiasingState->setup([WAKWindow hasLandscapeOrientation]);
-#else
-        [NSGraphicsContext saveGraphicsState];
</del><ins>+        // We never use CompositingCoordinatesOrientation::BottomUp on Mac.
+        ASSERT(layerContents->platformCALayerContentsOrientation() == GraphicsLayer::CompositingCoordinatesOrientation::TopDown);
</ins><span class="cx"> 
</span><del>-        // Set up an NSGraphicsContext for the context, so that parts of AppKit that rely on
-        // the current NSGraphicsContext (e.g. NSCell drawing) get the right one.
-        NSGraphicsContext* layerContext = [NSGraphicsContext graphicsContextWithCGContext:context flipped:YES];
-        [NSGraphicsContext setCurrentContext:layerContext];
</del><ins>+        if (graphicsContext.hasPlatformContext()) {
+            platformContextSaver.emplace(graphicsContext);
+#if PLATFORM(IOS_FAMILY)
+            CGContextRef context = graphicsContext.platformContext();
+            WKSetCurrentGraphicsContext(context);
+            fontAntialiasingState.emplace(context, !![platformCALayer->platformLayer() isOpaque]);
+            fontAntialiasingState->setup([WAKWindow hasLandscapeOrientation]);
</ins><span class="cx"> #endif
</span><del>-    }
-    
-    {
-        graphicsContext.setIsCALayerContext(true);
-        graphicsContext.setIsAcceleratedContext(platformCALayer->acceleratesDrawing());
-
-        if (!layerContents->platformCALayerContentsOpaque() && !platformCALayer->supportsSubpixelAntialiasedText() && FontCascade::isSubpixelAntialiasingAvailable()) {
-            // Turn off font smoothing to improve the appearance of text rendered onto a transparent background.
-            graphicsContext.setShouldSmoothFonts(false);
</del><span class="cx">         }
</span><ins>+        
+        {
+            graphicsContext.setIsCALayerContext(true);
+            graphicsContext.setIsAcceleratedContext(platformCALayer->acceleratesDrawing());
</ins><span class="cx"> 
</span><ins>+            if (!layerContents->platformCALayerContentsOpaque() && !platformCALayer->supportsSubpixelAntialiasedText() && FontCascade::isSubpixelAntialiasingAvailable()) {
+                // Turn off font smoothing to improve the appearance of text rendered onto a transparent background.
+                graphicsContext.setShouldSmoothFonts(false);
+            }
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>-        // It's important to get the clip from the context, because it may be significantly
-        // smaller than the layer bounds (e.g. tiled layers)
-        ThemeMac::setFocusRingClipRect(graphicsContext.clipBounds());
</del><ins>+            // It's important to get the clip from the context, because it may be significantly
+            // smaller than the layer bounds (e.g. tiled layers)
+            ThemeMac::setFocusRingClipRect(graphicsContext.clipBounds());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        for (const auto& rect : dirtyRects) {
-            GraphicsContextStateSaver stateSaver(graphicsContext);
-            graphicsContext.clip(rect);
</del><ins>+            for (const auto& rect : dirtyRects) {
+                GraphicsContextStateSaver stateSaver(graphicsContext);
+                graphicsContext.clip(rect);
</ins><span class="cx"> 
</span><del>-            layerContents->platformCALayerPaintContents(platformCALayer, graphicsContext, rect, layerPaintBehavior);
-        }
</del><ins>+                layerContents->platformCALayerPaintContents(platformCALayer, graphicsContext, rect, layerPaintBehavior);
+            }
</ins><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-        if (fontAntialiasingState)
-            fontAntialiasingState->restore();
-#else
-        ThemeMac::setFocusRingClipRect(FloatRect());
-
-        [NSGraphicsContext restoreGraphicsState];
</del><ins>+#if PLATFORM(MAC)
+            ThemeMac::setFocusRingClipRect(FloatRect());
</ins><span class="cx"> #endif
</span><ins>+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    saver.restore();
-
</del><span class="cx">     // Re-fetch the layer owner, since <rdar://problem/9125151> indicates that it might have been destroyed during painting.
</span><span class="cx">     layerContents = platformCALayer->owner();
</span><span class="cx">     ASSERT(layerContents);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontAntialiasingStateSaverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h (269615 => 269616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h  2020-11-10 04:58:59 UTC (rev 269615)
+++ trunk/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h     2020-11-10 07:42:30 UTC (rev 269616)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class FontAntialiasingStateSaver {
</span><ins>+    WTF_MAKE_NONCOPYABLE(FontAntialiasingStateSaver);
</ins><span class="cx"> public:
</span><span class="cx">     FontAntialiasingStateSaver(CGContextRef context, bool useOrientationDependentFontAntialiasing)
</span><span class="cx"> #if !PLATFORM(IOS_FAMILY_SIMULATOR)
</span><span class="lines">@@ -46,6 +47,14 @@
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    ~FontAntialiasingStateSaver()
+    {
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
+        if (m_useOrientationDependentFontAntialiasing)
+            CGContextSetFontAntialiasingStyle(m_context, m_oldAntialiasingStyle);
+#endif
+    }
+
</ins><span class="cx">     void setup(bool isLandscapeOrientation)
</span><span class="cx">     {
</span><span class="cx"> #if !PLATFORM(IOS_FAMILY_SIMULATOR)
</span><span class="lines">@@ -58,14 +67,6 @@
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void restore()
-    {
-#if !PLATFORM(IOS_FAMILY_SIMULATOR)
-        if (m_useOrientationDependentFontAntialiasing)
-            CGContextSetFontAntialiasingStyle(m_context, m_oldAntialiasingStyle);
-#endif
-    }
-
</del><span class="cx"> private:
</span><span class="cx"> #if !PLATFORM(IOS_FAMILY_SIMULATOR)
</span><span class="cx">     CGContextRef m_context;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (269615 => 269616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm     2020-11-10 04:58:59 UTC (rev 269615)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm        2020-11-10 07:42:30 UTC (rev 269616)
</span><span class="lines">@@ -537,8 +537,6 @@
</span><span class="cx">         CGRect dirtyRectInSuper = [hostLayer() convertRect:dirtyRect fromLayer:layer];
</span><span class="cx">         [m_window displayRect:dirtyRectInSuper];
</span><span class="cx">     }
</span><del>-
-    fontAntialiasingState.restore();
</del><span class="cx">     
</span><span class="cx">     if (drawingFlags == DrawingFlags::Snapshotting)
</span><span class="cx">         [m_window setIsInSnapshottingPaint:NO];
</span></span></pre>
</div>
</div>

</body>
</html>