<!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>[207125] releases/WebKitGTK/webkit-2.14/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/207125">207125</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 06:37:42 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206639">r206639</a> - RenderLayer::clipRects may return nullptr.
https://bugs.webkit.org/show_bug.cgi?id=162729
Reviewed by Chris Dumez.
This patch refactors RenderLayer::updateClipRects(), parentClipRects() and backgroundClipRect()
so that we don't have to rely on this seemingly unsafe line: clipRects = *parent()->clipRects(clipRectsContext);
Now updateClipRects() returns the computed/cached clip rects as opposed to update and refetch them.
While this patch makes the code look more readable/safer, it also eliminates cached item tripple retrievals.
No change in functionality.
* rendering/RenderLayer.cpp:
(WebCore::ClipRectsCache::getClipRects):
(WebCore::ClipRectsCache::setClipRects):
(WebCore::RenderLayer::updateClipRects):
(WebCore::RenderLayer::clipRects):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayerh">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207124 => 207125)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:33:06 UTC (rev 207124)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:37:42 UTC (rev 207125)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-09-30 Zalan Bujtas <zalan@apple.com>
+
+ RenderLayer::clipRects may return nullptr.
+ https://bugs.webkit.org/show_bug.cgi?id=162729
+
+ Reviewed by Chris Dumez.
+
+ This patch refactors RenderLayer::updateClipRects(), parentClipRects() and backgroundClipRect()
+ so that we don't have to rely on this seemingly unsafe line: clipRects = *parent()->clipRects(clipRectsContext);
+ Now updateClipRects() returns the computed/cached clip rects as opposed to update and refetch them.
+ While this patch makes the code look more readable/safer, it also eliminates cached item tripple retrievals.
+
+ No change in functionality.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::ClipRectsCache::getClipRects):
+ (WebCore::ClipRectsCache::setClipRects):
+ (WebCore::RenderLayer::updateClipRects):
+ (WebCore::RenderLayer::clipRects):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+
</ins><span class="cx"> 2016-09-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix hit testing on display:block <svg> elements
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp (207124 => 207125)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 13:33:06 UTC (rev 207124)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 13:37:42 UTC (rev 207125)
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PassRefPtr<ClipRects> getClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow) { return m_clipRects[getIndex(clipRectsType, respectOverflow)]; }
- void setClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow, PassRefPtr<ClipRects> clipRects) { m_clipRects[getIndex(clipRectsType, respectOverflow)] = clipRects; }
</del><ins>+ ClipRects* getClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow) { return m_clipRects[getIndex(clipRectsType, respectOverflow)].get(); }
+ void setClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow, RefPtr<ClipRects>&& clipRects) { m_clipRects[getIndex(clipRectsType, respectOverflow)] = WTFMove(clipRects); }
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> const RenderLayer* m_clipRectsRoot[NumCachedClipRectsTypes];
</span><span class="lines">@@ -5405,46 +5405,49 @@
</span><span class="cx"> return resultLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::updateClipRects(const ClipRectsContext& clipRectsContext)
</del><ins>+Ref<ClipRects> RenderLayer::updateClipRects(const ClipRectsContext& clipRectsContext)
</ins><span class="cx"> {
</span><span class="cx"> ClipRectsType clipRectsType = clipRectsContext.clipRectsType;
</span><span class="cx"> ASSERT(clipRectsType < NumCachedClipRectsTypes);
</span><del>- if (m_clipRectsCache && m_clipRectsCache->getClipRects(clipRectsType, clipRectsContext.respectOverflowClip)) {
- ASSERT(clipRectsContext.rootLayer == m_clipRectsCache->m_clipRectsRoot[clipRectsType]);
- ASSERT(m_clipRectsCache->m_scrollbarRelevancy[clipRectsType] == clipRectsContext.overlayScrollbarSizeRelevancy);
</del><ins>+ if (m_clipRectsCache) {
+ if (auto* clipRects = m_clipRectsCache->getClipRects(clipRectsType, clipRectsContext.respectOverflowClip)) {
+ ASSERT(clipRectsContext.rootLayer == m_clipRectsCache->m_clipRectsRoot[clipRectsType]);
+ ASSERT(m_clipRectsCache->m_scrollbarRelevancy[clipRectsType] == clipRectsContext.overlayScrollbarSizeRelevancy);
</ins><span class="cx">
</span><span class="cx"> #ifdef CHECK_CACHED_CLIP_RECTS
</span><del>- // This code is useful to check cached clip rects, but is too expensive to leave enabled in debug builds by default.
- ClipRectsContext tempContext(clipRectsContext);
- tempContext.clipRectsType = TemporaryClipRects;
- ClipRects clipRects;
- calculateClipRects(tempContext, clipRects);
- ASSERT(clipRects == *m_clipRectsCache->getClipRects(clipRectsType, clipRectsContext.respectOverflowClip).get());
</del><ins>+ // This code is useful to check cached clip rects, but is too expensive to leave enabled in debug builds by default.
+ ClipRectsContext tempContext(clipRectsContext);
+ tempContext.clipRectsType = TemporaryClipRects;
+ ClipRects tempClipRects;
+ calculateClipRects(tempContext, tempClipRects);
+ ASSERT(tempClipRects == *clipRects);
</ins><span class="cx"> #endif
</span><del>- return; // We have the correct cached value.
</del><ins>+ return *clipRects; // We have the correct cached value.
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // For transformed layers, the root layer was shifted to be us, so there is no need to
- // examine the parent. We want to cache clip rects with us as the root.
- RenderLayer* parentLayer = clipRectsContext.rootLayer != this ? parent() : nullptr;
- if (parentLayer)
- parentLayer->updateClipRects(clipRectsContext);
-
- ClipRects clipRects;
- calculateClipRects(clipRectsContext, clipRects);
-
</del><span class="cx"> if (!m_clipRectsCache)
</span><span class="cx"> m_clipRectsCache = std::make_unique<ClipRectsCache>();
</span><del>-
- if (parentLayer && parentLayer->clipRects(clipRectsContext) && clipRects == *parentLayer->clipRects(clipRectsContext))
- m_clipRectsCache->setClipRects(clipRectsType, clipRectsContext.respectOverflowClip, parentLayer->clipRects(clipRectsContext));
- else
- m_clipRectsCache->setClipRects(clipRectsType, clipRectsContext.respectOverflowClip, ClipRects::create(clipRects));
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_clipRectsCache->m_clipRectsRoot[clipRectsType] = clipRectsContext.rootLayer;
</span><span class="cx"> m_clipRectsCache->m_scrollbarRelevancy[clipRectsType] = clipRectsContext.overlayScrollbarSizeRelevancy;
</span><span class="cx"> #endif
</span><ins>+
+ RefPtr<ClipRects> parentClipRects;
+ // For transformed layers, the root layer was shifted to be us, so there is no need to
+ // examine the parent. We want to cache clip rects with us as the root.
+ if (auto* parentLayer = (clipRectsContext.rootLayer != this ? parent() : nullptr))
+ parentClipRects = parentLayer->updateClipRects(clipRectsContext);
+
+ auto clipRects = ClipRects::create();
+ calculateClipRects(clipRectsContext, clipRects);
+
+ if (parentClipRects && *parentClipRects == clipRects) {
+ m_clipRectsCache->setClipRects(clipRectsType, clipRectsContext.respectOverflowClip, parentClipRects.copyRef());
+ return parentClipRects.releaseNonNull();
+ }
+ m_clipRectsCache->setClipRects(clipRectsType, clipRectsContext.respectOverflowClip, clipRects.copyRef());
+ return clipRects;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::mapLayerClipRectsToFragmentationLayer(ClipRects& clipRects) const
</span><span class="lines">@@ -5482,7 +5485,9 @@
</span><span class="cx"> ClipRects* RenderLayer::clipRects(const ClipRectsContext& context) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(context.clipRectsType < NumCachedClipRectsTypes);
</span><del>- return m_clipRectsCache ? m_clipRectsCache->getClipRects(context.clipRectsType, context.respectOverflowClip).get() : nullptr;
</del><ins>+ if (!m_clipRectsCache)
+ return nullptr;
+ return m_clipRectsCache->getClipRects(context.clipRectsType, context.respectOverflowClip);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::calculateClipRects(const ClipRectsContext& clipRectsContext, ClipRects& clipRects) const
</span><span class="lines">@@ -5557,19 +5562,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::parentClipRects(const ClipRectsContext& clipRectsContext, ClipRects& clipRects) const
</del><ins>+Ref<ClipRects> RenderLayer::parentClipRects(const ClipRectsContext& clipRectsContext) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(parent());
</span><del>- if (renderer().isRenderNamedFlowThread() && mapLayerClipRectsToFragmentationLayer(clipRects))
- return;
</del><ins>+ if (renderer().isRenderNamedFlowThread()) {
+ auto parentClipRects = ClipRects::create();
+ if (mapLayerClipRectsToFragmentationLayer(parentClipRects))
+ return parentClipRects;
+ }
</ins><span class="cx">
</span><span class="cx"> if (clipRectsContext.clipRectsType == TemporaryClipRects) {
</span><del>- parent()->calculateClipRects(clipRectsContext, clipRects);
- return;
</del><ins>+ auto parentClipRects = ClipRects::create();
+ parent()->calculateClipRects(clipRectsContext, parentClipRects);
+ return parentClipRects;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- parent()->updateClipRects(clipRectsContext);
- clipRects = *parent()->clipRects(clipRectsContext);
</del><ins>+ return parent()->updateClipRects(clipRectsContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline ClipRect backgroundClipRectForPosition(const ClipRects& parentRects, EPosition position)
</span><span class="lines">@@ -5586,25 +5594,24 @@
</span><span class="cx"> ClipRect RenderLayer::backgroundClipRect(const ClipRectsContext& clipRectsContext) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(parent());
</span><ins>+ auto computeParentRects = [this, &clipRectsContext] () {
+ // If we cross into a different pagination context, then we can't rely on the cache.
+ // Just switch over to using TemporaryClipRects.
+ if (clipRectsContext.clipRectsType != TemporaryClipRects
+ && parent()->enclosingPaginationLayer(IncludeCompositedPaginatedLayers) != enclosingPaginationLayer(IncludeCompositedPaginatedLayers)) {
+ ClipRectsContext tempContext(clipRectsContext);
+ tempContext.clipRectsType = TemporaryClipRects;
+ return parentClipRects(tempContext);
+ }
+ return parentClipRects(clipRectsContext);
+ };
</ins><span class="cx">
</span><del>- ClipRects parentRects;
-
- // If we cross into a different pagination context, then we can't rely on the cache.
- // Just switch over to using TemporaryClipRects.
- if (clipRectsContext.clipRectsType != TemporaryClipRects && parent()->enclosingPaginationLayer(IncludeCompositedPaginatedLayers) != enclosingPaginationLayer(IncludeCompositedPaginatedLayers)) {
- ClipRectsContext tempContext(clipRectsContext);
- tempContext.clipRectsType = TemporaryClipRects;
- parentClipRects(tempContext, parentRects);
- } else
- parentClipRects(clipRectsContext, parentRects);
-
</del><ins>+ auto parentRects = computeParentRects();
</ins><span class="cx"> ClipRect backgroundClipRect = backgroundClipRectForPosition(parentRects, renderer().style().position());
</span><span class="cx"> RenderView& view = renderer().view();
</span><del>-
</del><span class="cx"> // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite.
</span><del>- if (parentRects.fixed() && &clipRectsContext.rootLayer->renderer() == &view && !backgroundClipRect.isInfinite())
</del><ins>+ if (parentRects->fixed() && &clipRectsContext.rootLayer->renderer() == &view && !backgroundClipRect.isInfinite())
</ins><span class="cx"> backgroundClipRect.moveBy(view.frameView().scrollPositionForFixedPosition());
</span><del>-
</del><span class="cx"> return backgroundClipRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6068,9 +6075,8 @@
</span><span class="cx"> m_clipRectsCache = nullptr;
</span><span class="cx"> else {
</span><span class="cx"> ASSERT(typeToClear < NumCachedClipRectsTypes);
</span><del>- RefPtr<ClipRects> dummy;
- m_clipRectsCache->setClipRects(typeToClear, RespectOverflowClip, dummy);
- m_clipRectsCache->setClipRects(typeToClear, IgnoreOverflowClip, dummy);
</del><ins>+ m_clipRectsCache->setClipRects(typeToClear, RespectOverflowClip, nullptr);
+ m_clipRectsCache->setClipRects(typeToClear, IgnoreOverflowClip, nullptr);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.h (207124 => 207125)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.h 2016-10-11 13:33:06 UTC (rev 207124)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.h 2016-10-11 13:37:42 UTC (rev 207125)
</span><span class="lines">@@ -695,8 +695,8 @@
</span><span class="cx"> bool clipToDirtyRect;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Compute and cache clip rects computed with the given layer as the root
- void updateClipRects(const ClipRectsContext&);
</del><ins>+ // Compute, cache and return clip rects computed with the given layer as the root.
+ Ref<ClipRects> updateClipRects(const ClipRectsContext&);
</ins><span class="cx"> // Compute and return the clip rects. If useCached is true, will used previously computed clip rects on ancestors
</span><span class="cx"> // (rather than computing them all from scratch up the parent chain).
</span><span class="cx"> void calculateClipRects(const ClipRectsContext&, ClipRects&) const;
</span><span class="lines">@@ -933,7 +933,7 @@
</span><span class="cx"> void dirtyAncestorChainHasBlendingDescendants();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void parentClipRects(const ClipRectsContext&, ClipRects&) const;
</del><ins>+ Ref<ClipRects> parentClipRects(const ClipRectsContext&) const;
</ins><span class="cx"> ClipRect backgroundClipRect(const ClipRectsContext&) const;
</span><span class="cx">
</span><span class="cx"> RenderLayer* enclosingTransformedAncestor() const;
</span></span></pre>
</div>
</div>
</body>
</html>