<!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>[243360] trunk/Source/WebKit</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/243360">243360</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2019-03-21 21:22:05 -0700 (Thu, 21 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up some TiledCoreAnimationDrawingArea members
https://bugs.webkit.org/show_bug.cgi?id=196124

Reviewed by Tim Horton.

The giant m_transform was unused.

Group the bools etc.

* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
(WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243359 => 243360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/ChangeLog       2019-03-22 04:22:05 UTC (rev 243360)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up some TiledCoreAnimationDrawingArea members
+        https://bugs.webkit.org/show_bug.cgi?id=196124
+
+        Reviewed by Tim Horton.
+
+        The giant m_transform was unused.
+        
+        Group the bools etc.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
+        (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
+
</ins><span class="cx"> 2019-03-21  Brady Eidson  <beidson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Certain WebProcesses should opt-out of the freezer.
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (243359 => 243360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h       2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h  2019-03-22 04:22:05 UTC (rev 243360)
</span><span class="lines">@@ -136,28 +136,25 @@
</span><span class="cx">     void startLayerFlushThrottlingTimer();
</span><span class="cx">     void layerFlushThrottlingTimerFired();
</span><span class="cx"> 
</span><del>-    bool m_layerTreeStateIsFrozen;
-
</del><span class="cx">     std::unique_ptr<LayerHostingContext> m_layerHostingContext;
</span><span class="cx"> 
</span><span class="cx">     RetainPtr<CALayer> m_hostingLayer;
</span><span class="cx">     RetainPtr<CALayer> m_rootLayer;
</span><span class="cx">     RetainPtr<CALayer> m_debugInfoLayer;
</span><del>-
</del><span class="cx">     RetainPtr<CALayer> m_pendingRootLayer;
</span><span class="cx"> 
</span><del>-    bool m_isPaintingSuspended;
-
</del><span class="cx">     Optional<WebCore::FloatRect> m_viewExposedRect;
</span><span class="cx">     Optional<WebCore::FloatRect> m_scrolledViewExposedRect;
</span><span class="cx"> 
</span><ins>+    WebCore::IntSize m_lastViewSizeForScaleToFit;
+    WebCore::IntSize m_lastDocumentSizeForScaleToFit;
+
</ins><span class="cx">     WebCore::IntSize m_lastSentIntrinsicContentSize;
</span><del>-    bool m_inUpdateGeometry;
</del><span class="cx"> 
</span><del>-    double m_transientZoomScale;
</del><ins>+    double m_transientZoomScale { 1 };
</ins><span class="cx">     WebCore::FloatPoint m_transientZoomOrigin;
</span><span class="cx"> 
</span><del>-    WebCore::TransformationMatrix m_transform;
</del><ins>+    WebCore::Timer m_layerFlushThrottlingTimer;
</ins><span class="cx"> 
</span><span class="cx">     RunLoop::Timer<TiledCoreAnimationDrawingArea> m_sendDidUpdateActivityStateTimer;
</span><span class="cx">     Vector<CallbackID> m_nextActivityStateChangeCallbackIDs;
</span><span class="lines">@@ -165,21 +162,19 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr<WebCore::GraphicsLayer> m_viewOverlayRootLayer;
</span><span class="cx"> 
</span><del>-    bool m_shouldScaleViewToFitDocument { false };
-    bool m_isScalingViewToFitDocument { false };
-    WebCore::IntSize m_lastViewSizeForScaleToFit;
-    WebCore::IntSize m_lastDocumentSizeForScaleToFit;
-
</del><span class="cx">     OptionSet<WebCore::LayoutMilestone> m_pendingNewlyReachedLayoutMilestones;
</span><span class="cx">     Vector<CallbackID> m_pendingCallbackIDs;
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr<WebCore::RunLoopObserver> m_layerFlushRunLoopObserver;
</span><span class="cx"> 
</span><ins>+    bool m_isPaintingSuspended { false };
+    bool m_inUpdateGeometry { false };
+    bool m_layerTreeStateIsFrozen { false };
+    bool m_shouldScaleViewToFitDocument { false };
+    bool m_isScalingViewToFitDocument { false };
</ins><span class="cx">     bool m_isThrottlingLayerFlushes { false };
</span><span class="cx">     bool m_isLayerFlushThrottlingTemporarilyDisabledForInteraction { false };
</span><span class="cx">     bool m_needsSendEnterAcceleratedCompositingMode { true };
</span><del>-
-    WebCore::Timer m_layerFlushThrottlingTimer;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (243359 => 243360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm      2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-03-22 04:22:05 UTC (rev 243360)
</span><span class="lines">@@ -75,12 +75,9 @@
</span><span class="cx"> 
</span><span class="cx"> TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea(WebPage& webPage, const WebPageCreationParameters& parameters)
</span><span class="cx">     : DrawingArea(DrawingAreaTypeTiledCoreAnimation, parameters.drawingAreaIdentifier, webPage)
</span><del>-    , m_layerTreeStateIsFrozen(false)
</del><ins>+    , m_layerFlushThrottlingTimer(*this, &TiledCoreAnimationDrawingArea::layerFlushThrottlingTimerFired)
+    , m_sendDidUpdateActivityStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateActivityStateTimerFired)
</ins><span class="cx">     , m_isPaintingSuspended(!(parameters.activityState & ActivityState::IsVisible))
</span><del>-    , m_transientZoomScale(1)
-    , m_sendDidUpdateActivityStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateActivityStateTimerFired)
-    , m_viewOverlayRootLayer(nullptr)
-    , m_layerFlushThrottlingTimer(*this, &TiledCoreAnimationDrawingArea::layerFlushThrottlingTimerFired)
</del><span class="cx"> {
</span><span class="cx">     m_webPage.corePage()->settings().setForceCompositingMode(true);
</span><span class="cx"> 
</span><span class="lines">@@ -698,7 +695,6 @@
</span><span class="cx"> 
</span><span class="cx">     bool hadRootLayer = !!m_rootLayer;
</span><span class="cx">     m_rootLayer = layer;
</span><del>-    [m_rootLayer setSublayerTransform:m_transform];
</del><span class="cx"> 
</span><span class="cx">     updateRootLayers();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>