<!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>[164910] trunk/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/164910">164910</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-02-28 21:36:01 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Assertions and bad behavior when zooming into an iframe containing apple.com
https://bugs.webkit.org/show_bug.cgi?id=129537
Reviewed by Benjamin Poulain.
When building RemoteLayerTreeTransactions, the ordering of setting created
layers and doing the recursive tree walk was wrong, such that we failed
to noticed layers created during the recursiveBuildTransaction().
Also harden the UI-side code against Obj-C exceptions thrown when layers
are missing.
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
(WebKit::RemoteLayerTreePropertyApplier::applyProperties): Assert when
children are not found, and protect against Obj-C exceptions.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::LayerCreationProperties):
Initialize the members.
* WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
(WebKit::RemoteLayerTreeContext::buildTransaction): Do the recursive walk
before setting created and destroyed layers, since the walk can create
layers (especially when swapping into tiled layers).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeContextmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164909 => 164910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-01 05:34:19 UTC (rev 164909)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-01 05:36:01 UTC (rev 164910)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-28 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Assertions and bad behavior when zooming into an iframe containing apple.com
+ https://bugs.webkit.org/show_bug.cgi?id=129537
+
+ Reviewed by Benjamin Poulain.
+
+ When building RemoteLayerTreeTransactions, the ordering of setting created
+ layers and doing the recursive tree walk was wrong, such that we failed
+ to noticed layers created during the recursiveBuildTransaction().
+
+ Also harden the UI-side code against Obj-C exceptions thrown when layers
+ are missing.
+
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+ (WebKit::RemoteLayerTreePropertyApplier::applyProperties): Assert when
+ children are not found, and protect against Obj-C exceptions.
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerCreationProperties::LayerCreationProperties):
+ Initialize the members.
+ * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
+ (WebKit::RemoteLayerTreeContext::buildTransaction): Do the recursive walk
+ before setting created and destroyed layers, since the walk can create
+ layers (especially when swapping into tiled layers).
+
</ins><span class="cx"> 2014-02-28 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix WebKit2 build after r164890
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (164909 => 164910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2014-03-01 05:34:19 UTC (rev 164909)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2014-03-01 05:36:01 UTC (rev 164910)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import "PlatformCALayerRemote.h"
</span><span class="cx"> #import <QuartzCore/CALayer.h>
</span><ins>+#import <WebCore/BlockExceptions.h>
</ins><span class="cx"> #import <WebCore/PlatformCAFilters.h>
</span><span class="cx"> #import <WebCore/ScrollbarThemeMac.h>
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -197,12 +198,15 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreePropertyApplier::applyProperties(CALayer *layer, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
</span><span class="cx"> {
</span><ins>+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> applyPropertiesToLayer(layer, properties);
</span><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged) {
</span><span class="cx"> RetainPtr<NSMutableArray> children = adoptNS([[NSMutableArray alloc] initWithCapacity:properties.children.size()]);
</span><del>- for (auto& child : properties.children)
</del><ins>+ for (auto& child : properties.children) {
+ ASSERT(relatedLayers.get(child));
</ins><span class="cx"> [children addObject:relatedLayers.get(child)];
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> layer.sublayers = children.get();
</span><span class="cx"> }
</span><span class="lines">@@ -225,17 +229,21 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ END_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void RemoteLayerTreePropertyApplier::applyProperties(UIView *view, const RemoteLayerTreeTransaction::LayerProperties& properties, const RelatedLayerMap& relatedLayers)
</span><span class="cx"> {
</span><ins>+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> applyPropertiesToLayer(view.layer, properties);
</span><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged) {
</span><span class="cx"> RetainPtr<NSMutableArray> children = adoptNS([[NSMutableArray alloc] initWithCapacity:properties.children.size()]);
</span><del>- for (auto& child : properties.children)
</del><ins>+ for (auto child : properties.children) {
+ ASSERT(relatedLayers.get(child));
</ins><span class="cx"> [children addObject:relatedLayers.get(child)];
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> [view _web_setSubviews:children.get()];
</span><span class="cx"> }
</span><span class="lines">@@ -251,6 +259,7 @@
</span><span class="cx"> maskView.layer.mask = maskView.layer;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ END_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (164909 => 164910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-03-01 05:34:19 UTC (rev 164909)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-03-01 05:36:01 UTC (rev 164910)
</span><span class="lines">@@ -41,6 +41,9 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeTransaction::LayerCreationProperties::LayerCreationProperties()
</span><ins>+ : layerID(0)
+ , type(PlatformCALayer::LayerTypeLayer)
+ , hostingContextID(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm (164909 => 164910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm 2014-03-01 05:34:19 UTC (rev 164909)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm 2014-03-01 05:36:01 UTC (rev 164910)
</span><span class="lines">@@ -95,11 +95,11 @@
</span><span class="cx"> {
</span><span class="cx"> PlatformCALayerRemote& rootLayerRemote = toPlatformCALayerRemote(rootLayer);
</span><span class="cx"> transaction.setRootLayerID(rootLayerRemote.layerID());
</span><del>-
</del><ins>+
+ rootLayerRemote.recursiveBuildTransaction(transaction);
+
</ins><span class="cx"> transaction.setCreatedLayers(std::move(m_createdLayers));
</span><span class="cx"> transaction.setDestroyedLayerIDs(std::move(m_destroyedLayers));
</span><del>-
- rootLayerRemote.recursiveBuildTransaction(transaction);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>