<!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>[207126] 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/207126">207126</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 06:42:29 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206661">r206661</a> - Remove ClipRects's custom refcounting.
https://bugs.webkit.org/show_bug.cgi?id=162798
Reviewed by Simon Fraser.
It's safer to use RefCounted<>.
No change in functionality.
* rendering/RenderLayer.cpp:
(WebCore::ClipRects::ClipRects):
(WebCore::ClipRectsCache::getClipRects):
(WebCore::ClipRectsCache::setClipRects):
(WebCore::ClipRectsCache::getIndex):
(WebCore::RenderLayer::updateClipRects):
(WebCore::ClipRects::ref): Deleted.
(WebCore::ClipRects::deref): Deleted.</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>
</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 (207125 => 207126)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:37:42 UTC (rev 207125)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:42:29 UTC (rev 207126)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-09-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Remove ClipRects's custom refcounting.
+ https://bugs.webkit.org/show_bug.cgi?id=162798
+
+ Reviewed by Simon Fraser.
+
+ It's safer to use RefCounted<>.
+
+ No change in functionality.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::ClipRects::ClipRects):
+ (WebCore::ClipRectsCache::getClipRects):
+ (WebCore::ClipRectsCache::setClipRects):
+ (WebCore::ClipRectsCache::getIndex):
+ (WebCore::RenderLayer::updateClipRects):
+ (WebCore::ClipRects::ref): Deleted.
+ (WebCore::ClipRects::deref): Deleted.
+
+2016-09-30 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> RenderLayer::clipRects may return nullptr.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162729
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp (207125 => 207126)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 13:37:42 UTC (rev 207125)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 13:42:29 UTC (rev 207126)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-class ClipRects {
</del><ins>+class ClipRects : public RefCounted<ClipRects> {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> static Ref<ClipRects> create()
</span><span class="lines">@@ -150,8 +150,6 @@
</span><span class="cx"> return adoptRef(*new ClipRects(other));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ClipRects() = default;
-
</del><span class="cx"> void reset()
</span><span class="cx"> {
</span><span class="cx"> m_overflowClipRect.reset();
</span><span class="lines">@@ -172,13 +170,6 @@
</span><span class="cx"> bool fixed() const { return m_fixed; }
</span><span class="cx"> void setFixed(bool fixed) { m_fixed = fixed; }
</span><span class="cx">
</span><del>- void ref() { m_refCount++; }
- void deref()
- {
- if (!--m_refCount)
- delete this;
- }
-
</del><span class="cx"> bool operator==(const ClipRects& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_overflowClipRect == other.overflowClipRect()
</span><span class="lines">@@ -197,6 +188,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ ClipRects() = default;
+
</ins><span class="cx"> ClipRects(const LayoutRect& clipRect)
</span><span class="cx"> : m_overflowClipRect(clipRect)
</span><span class="cx"> , m_fixedClipRect(clipRect)
</span><span class="lines">@@ -205,18 +198,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ClipRects(const ClipRects& other)
</span><del>- : m_overflowClipRect(other.overflowClipRect())
</del><ins>+ : m_fixed(other.fixed())
+ , m_overflowClipRect(other.overflowClipRect())
</ins><span class="cx"> , m_fixedClipRect(other.fixedClipRect())
</span><span class="cx"> , m_posClipRect(other.posClipRect())
</span><del>- , m_fixed(other.fixed())
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool m_fixed { false };
</ins><span class="cx"> ClipRect m_overflowClipRect;
</span><span class="cx"> ClipRect m_fixedClipRect;
</span><span class="cx"> ClipRect m_posClipRect;
</span><del>- unsigned m_refCount = 1;
- bool m_fixed = false;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ClipRectsCache {
</span><span class="lines">@@ -232,9 +224,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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); }
</del><ins>+ ClipRects* getClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow) const
+ {
+ return m_clipRects[getIndex(clipRectsType, respectOverflow)].get();
+ }
</ins><span class="cx">
</span><ins>+ void setClipRects(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow, RefPtr<ClipRects>&& clipRects)
+ {
+ m_clipRects[getIndex(clipRectsType, respectOverflow)] = WTFMove(clipRects);
+ }
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> const RenderLayer* m_clipRectsRoot[NumCachedClipRectsTypes];
</span><span class="cx"> OverlayScrollbarSizeRelevancy m_scrollbarRelevancy[NumCachedClipRectsTypes];
</span><span class="lines">@@ -241,11 +240,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- int getIndex(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow)
</del><ins>+ unsigned getIndex(ClipRectsType clipRectsType, ShouldRespectOverflowClip respectOverflow) const
</ins><span class="cx"> {
</span><del>- int index = static_cast<int>(clipRectsType);
</del><ins>+ unsigned index = static_cast<unsigned>(clipRectsType);
</ins><span class="cx"> if (respectOverflow == RespectOverflowClip)
</span><del>- index += static_cast<int>(NumCachedClipRectsTypes);
</del><ins>+ index += static_cast<unsigned>(NumCachedClipRectsTypes);
+ ASSERT_WITH_SECURITY_IMPLICATION(index < NumCachedClipRectsTypes * 2);
</ins><span class="cx"> return index;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5418,9 +5418,9 @@
</span><span class="cx"> // This code is useful to check cached clip rects, but is too expensive to leave enabled in debug builds by default.
</span><span class="cx"> ClipRectsContext tempContext(clipRectsContext);
</span><span class="cx"> tempContext.clipRectsType = TemporaryClipRects;
</span><del>- ClipRects tempClipRects;
</del><ins>+ Ref<ClipRects> tempClipRects = ClipRects::create();
</ins><span class="cx"> calculateClipRects(tempContext, tempClipRects);
</span><del>- ASSERT(tempClipRects == *clipRects);
</del><ins>+ ASSERT(tempClipRects.get() == *clipRects);
</ins><span class="cx"> #endif
</span><span class="cx"> return *clipRects; // We have the correct cached value.
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>