<!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>[212527] branches/safari-603-branch/Source/WebKit2</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/212527">212527</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 21:28:07 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212312">r212312</a>. rdar://problem/30505482</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2PlatformLoggingh">branches/safari-603-branch/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebPageWebFramecpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebPageWebFrameh">branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212312. rdar://problem/30505482
+
+ 2017-02-14 Simon Fraser <simon.fraser@apple.com>
+
+ Add logging and defensive fixes to try to detect problems causing blank tabs
+ https://bugs.webkit.org/show_bug.cgi?id=168270
+ rdar://problem/30505482
+
+ Reviewed by Jon Lee.
+
+ Add release logging when -[WKWebView _beginAnimatedResizeWithUpdates:] and -[WKWebView _endAnimatedResize]
+ are unbalanced across a commit, to detect cases where _endAnimatedResize wasn't called enough times.
+
+ Also log when RemoteLayerTreeHost::updateLayerTree() fails to find a root layer, which should never happen.
+
+ In WebPageProxy, clear m_firstLayerTreeTransactionIdAfterDidCommitLoad on a web process crash.
+
+ * Platform/Logging.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didCommitLayerTree:]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ (-[WKWebView _endAnimatedResize]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetState):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::isAlwaysOnLoggingAllowed):
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::updateLayerTree):
+ (WebKit::RemoteLayerTreeHost::clearLayers):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::WebFrame):
+ * WebProcess/WebPage/WebFrame.h:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212260. rdar://problem/30481079
</span><span class="cx">
</span><span class="cx"> 2017-02-13 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Platform/Logging.h (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Platform/Logging.h 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/Platform/Logging.h 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> M(StorageAPI) \
</span><span class="cx"> M(TextInput) \
</span><span class="cx"> M(ViewGestures) \
</span><ins>+ M(ViewState) \
</ins><span class="cx"> M(VirtualMemory) \
</span><span class="cx"> M(VisibleRects) \
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -135,6 +135,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(_page && _page->isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
+
</ins><span class="cx"> @interface UIScrollView (UIScrollViewInternal)
</span><span class="cx"> - (void)_adjustForAutomaticKeyboardInfo:(NSDictionary*)info animated:(BOOL)animated lastAdjustment:(CGFloat*)lastAdjustment;
</span><span class="cx"> - (BOOL)_isScrollingToTop;
</span><span class="lines">@@ -273,6 +275,8 @@
</span><span class="cx">
</span><span class="cx"> BOOL _delayUpdateVisibleContentRects;
</span><span class="cx"> BOOL _hadDelayedUpdateVisibleContentRects;
</span><ins>+
+ int _activeAnimatedResizeCount;
</ins><span class="cx">
</span><span class="cx"> Vector<std::function<void ()>> _snapshotsDeferredDuringResize;
</span><span class="cx"> RetainPtr<NSMutableArray> _stableStatePresentationUpdateCallbacks;
</span><span class="lines">@@ -1310,6 +1314,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (_activeAnimatedResizeCount)
+ RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _didCommitLayerTree:] - %d animated resizes in flight", self, _activeAnimatedResizeCount);
+
</ins><span class="cx"> CGSize newContentSize = roundScrollViewContentSize(*_page, [_contentView frame].size);
</span><span class="cx"> [_scrollView _setContentSizePreservingContentOffsetDuringRubberband:newContentSize];
</span><span class="cx">
</span><span class="lines">@@ -4294,6 +4301,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ++_activeAnimatedResizeCount;
</ins><span class="cx"> _resizeAnimationTransformAdjustments = CATransform3DIdentity;
</span><span class="cx">
</span><span class="cx"> NSUInteger indexOfContentView = [[_scrollView subviews] indexOfObject:_contentView.get()];
</span><span class="lines">@@ -4364,12 +4372,13 @@
</span><span class="cx">
</span><span class="cx"> if (!_resizeAnimationView) {
</span><span class="cx"> // Paranoia. If _resizeAnimationView is null we'll end up setting a zero scale on the content view.
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _endAnimatedResize:] - _resizeAnimationView is nil", self);
</ins><span class="cx"> _dynamicViewportUpdateMode = DynamicViewportUpdateMode::NotResizing;
</span><span class="cx"> [_contentView setHidden:NO];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ --_activeAnimatedResizeCount;
</ins><span class="cx"> NSUInteger indexOfResizeAnimationView = [[_scrollView subviews] indexOfObject:_resizeAnimationView.get()];
</span><span class="cx"> [_scrollView insertSubview:_contentView.get() atIndex:indexOfResizeAnimationView];
</span><span class="cx"> [_scrollView insertSubview:[_contentView unscaledView] atIndex:indexOfResizeAnimationView + 1];
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -5420,6 +5420,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ m_firstLayerTreeTransactionIdAfterDidCommitLoad = 0;
</ins><span class="cx"> m_lastVisibleContentRectUpdate = VisibleContentRectUpdateInfo();
</span><span class="cx"> m_dynamicViewportSizeUpdateWaitingForTarget = false;
</span><span class="cx"> m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit = false;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasDebugIndicator() const { return !!m_debugIndicatorLayerTreeHost; }
</span><span class="cx">
</span><ins>+ bool isAlwaysOnLoggingAllowed() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> void sizeDidChange() override;
</span><span class="cx"> void deviceScaleFactorDidChange() override;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -473,4 +473,9 @@
</span><span class="cx"> return m_remoteLayerTreeHost.rootLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RemoteLayerTreeDrawingAreaProxy::isAlwaysOnLoggingAllowed() const
+{
+ return m_webPageProxy.isAlwaysOnLoggingAllowed();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "RemoteLayerTreeHost.h"
</span><span class="cx">
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxy.h"
</span><span class="cx"> #import "RemoteLayerTreePropertyApplier.h"
</span><span class="cx"> #import "RemoteLayerTreeTransaction.h"
</span><span class="lines">@@ -48,6 +49,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(m_drawingArea.isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
+
</ins><span class="cx"> RemoteLayerTreeHost::RemoteLayerTreeHost(RemoteLayerTreeDrawingAreaProxy& drawingArea)
</span><span class="cx"> : m_drawingArea(drawingArea)
</span><span class="cx"> , m_rootLayer(nullptr)
</span><span class="lines">@@ -72,6 +75,10 @@
</span><span class="cx">
</span><span class="cx"> bool rootLayerChanged = false;
</span><span class="cx"> LayerOrView *rootLayer = getLayer(transaction.rootLayerID());
</span><ins>+
+ if (!rootLayer)
+ RELEASE_LOG_IF_ALLOWED("%p RemoteLayerTreeHost::updateLayerTree - failed to find root layer with ID %llu", this, transaction.rootLayerID());
+
</ins><span class="cx"> if (m_rootLayer != rootLayer) {
</span><span class="cx"> m_rootLayer = rootLayer;
</span><span class="cx"> rootLayerChanged = true;
</span><span class="lines">@@ -194,9 +201,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_layers.clear();
</span><del>-
- if (m_rootLayer)
- m_rootLayer = nullptr;
</del><ins>+ m_rootLayer = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSString* const WKLayerIDPropertyKey = @"WKLayerID";
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -147,16 +147,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebFrame::WebFrame(std::unique_ptr<WebFrameLoaderClient> frameLoaderClient)
</span><del>- : m_coreFrame(0)
- , m_policyListenerID(0)
- , m_policyFunction(0)
- , m_policyDownloadID(0)
- , m_frameLoaderClient(WTFMove(frameLoaderClient))
- , m_loadListener(0)
</del><ins>+ : m_frameLoaderClient(WTFMove(frameLoaderClient))
</ins><span class="cx"> , m_frameID(generateFrameID())
</span><del>-#if PLATFORM(IOS)
- , m_firstLayerTreeTransactionIDAfterDidCommitLoad(0)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_frameLoaderClient->setWebFrame(this);
</span><span class="cx"> WebProcess::singleton().addWebFrame(m_frameID, this);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebPageWebFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.h (212526 => 212527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2017-02-17 05:28:03 UTC (rev 212526)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2017-02-17 05:28:07 UTC (rev 212527)
</span><span class="lines">@@ -169,19 +169,19 @@
</span><span class="cx"> static PassRefPtr<WebFrame> create(std::unique_ptr<WebFrameLoaderClient>);
</span><span class="cx"> WebFrame(std::unique_ptr<WebFrameLoaderClient>);
</span><span class="cx">
</span><del>- WebCore::Frame* m_coreFrame;
</del><ins>+ WebCore::Frame* m_coreFrame { nullptr };
</ins><span class="cx">
</span><del>- uint64_t m_policyListenerID;
- WebCore::FramePolicyFunction m_policyFunction;
- DownloadID m_policyDownloadID;
</del><ins>+ uint64_t m_policyListenerID { 0 };
+ WebCore::FramePolicyFunction m_policyFunction { nullptr };
+ DownloadID m_policyDownloadID { 0 };
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebFrameLoaderClient> m_frameLoaderClient;
</span><del>- LoadListener* m_loadListener;
</del><ins>+ LoadListener* m_loadListener { nullptr };
</ins><span class="cx">
</span><del>- uint64_t m_frameID;
</del><ins>+ uint64_t m_frameID { 0 };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- uint64_t m_firstLayerTreeTransactionIDAfterDidCommitLoad;
</del><ins>+ uint64_t m_firstLayerTreeTransactionIDAfterDidCommitLoad { 0 };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>