<!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>[161200] trunk/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/161200">161200</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-01 16:52:55 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderScrollbar: Map of scrollbar parts should use RenderPtr.
<https://webkit.org/b/126367>
Turn RenderScrollbar::m_parts into HashMap of RenderPtrs. This makes
renderer destruction automatic and lets us remove some code.
Reviewed by Antti Koivisto.
* rendering/RenderPtr.h:
Add HashTraits for RenderPtr so we can use them as values in
WTF hash tables.
* rendering/RenderScrollbar.h:
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::~RenderScrollbar):
(WebCore::RenderScrollbar::setParent):
(WebCore::RenderScrollbar::updateScrollbarParts):
(WebCore::RenderScrollbar::updateScrollbarPart):
Remove now-unneeded kludges of logic to manually delete scrollbar
part renderers in various scenarios.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderPtrh">trunk/Source/WebCore/rendering/RenderPtr.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarh">trunk/Source/WebCore/rendering/RenderScrollbar.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161199 => 161200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 00:31:40 UTC (rev 161199)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 00:52:55 UTC (rev 161200)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-01 Andreas Kling <akling@apple.com>
+
+ RenderScrollbar: Map of scrollbar parts should use RenderPtr.
+ <https://webkit.org/b/126367>
+
+ Turn RenderScrollbar::m_parts into HashMap of RenderPtrs. This makes
+ renderer destruction automatic and lets us remove some code.
+
+ Reviewed by Antti Koivisto.
+
+ * rendering/RenderPtr.h:
+
+ Add HashTraits for RenderPtr so we can use them as values in
+ WTF hash tables.
+
+ * rendering/RenderScrollbar.h:
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::~RenderScrollbar):
+ (WebCore::RenderScrollbar::setParent):
+ (WebCore::RenderScrollbar::updateScrollbarParts):
+ (WebCore::RenderScrollbar::updateScrollbarPart):
+
+ Remove now-unneeded kludges of logic to manually delete scrollbar
+ part renderers in various scenarios.
+
</ins><span class="cx"> 2014-01-01 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove reattachRenderTree
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderPtr.h (161199 => 161200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderPtr.h 2014-01-02 00:31:40 UTC (rev 161199)
+++ trunk/Source/WebCore/rendering/RenderPtr.h 2014-01-02 00:52:55 UTC (rev 161200)
</span><span class="lines">@@ -26,10 +26,11 @@
</span><span class="cx"> #ifndef RenderPtr_h
</span><span class="cx"> #define RenderPtr_h
</span><span class="cx">
</span><del>-#include <wtf/Assertions.h>
</del><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <cstddef>
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/Assertions.h>
+#include <wtf/HashTraits.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -159,4 +160,17 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+namespace WTF {
+
+template<typename T> struct HashTraits<WebCore::RenderPtr<T>> : SimpleClassHashTraits<WebCore::RenderPtr<T>> {
+ typedef std::nullptr_t EmptyValueType;
+ static EmptyValueType emptyValue() { return nullptr; }
+
+ typedef T* PeekType;
+ static T* peek(const WebCore::RenderPtr<T>& value) { return value.get(); }
+ static T* peek(std::nullptr_t) { return nullptr; }
+};
+
+} // namespace WTF
+
</ins><span class="cx"> #endif // RenderPtr_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (161199 => 161200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-01-02 00:31:40 UTC (rev 161199)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-01-02 00:52:55 UTC (rev 161200)
</span><span class="lines">@@ -68,15 +68,6 @@
</span><span class="cx">
</span><span class="cx"> RenderScrollbar::~RenderScrollbar()
</span><span class="cx"> {
</span><del>- if (!m_parts.isEmpty()) {
- // When a scrollbar is detached from its parent (causing all parts removal) and
- // ready to be destroyed, its destruction can be delayed because of RefPtr
- // maintained in other classes such as EventHandler (m_lastScrollbarUnderMouse).
- // Meanwhile, we can have a call to updateScrollbarPart which recreates the
- // scrollbar part. So, we need to destroy these parts since we don't want them
- // to call on a destroyed scrollbar. See webkit bug 68009.
- updateScrollbarParts(true);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox* RenderScrollbar::owningRenderer() const
</span><span class="lines">@@ -92,10 +83,8 @@
</span><span class="cx"> void RenderScrollbar::setParent(ScrollView* parent)
</span><span class="cx"> {
</span><span class="cx"> Scrollbar::setParent(parent);
</span><del>- if (!parent) {
- // Destroy all of the scrollbar's RenderBoxes.
- updateScrollbarParts(true);
- }
</del><ins>+ if (!parent)
+ m_parts.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbar::setEnabled(bool e)
</span><span class="lines">@@ -163,21 +152,18 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderScrollbar::updateScrollbarParts(bool destroy)
</del><ins>+void RenderScrollbar::updateScrollbarParts()
</ins><span class="cx"> {
</span><del>- updateScrollbarPart(ScrollbarBGPart, destroy);
- updateScrollbarPart(BackButtonStartPart, destroy);
- updateScrollbarPart(ForwardButtonStartPart, destroy);
- updateScrollbarPart(BackTrackPart, destroy);
- updateScrollbarPart(ThumbPart, destroy);
- updateScrollbarPart(ForwardTrackPart, destroy);
- updateScrollbarPart(BackButtonEndPart, destroy);
- updateScrollbarPart(ForwardButtonEndPart, destroy);
- updateScrollbarPart(TrackBGPart, destroy);
</del><ins>+ updateScrollbarPart(ScrollbarBGPart);
+ updateScrollbarPart(BackButtonStartPart);
+ updateScrollbarPart(ForwardButtonStartPart);
+ updateScrollbarPart(BackTrackPart);
+ updateScrollbarPart(ThumbPart);
+ updateScrollbarPart(ForwardTrackPart);
+ updateScrollbarPart(BackButtonEndPart);
+ updateScrollbarPart(ForwardButtonEndPart);
+ updateScrollbarPart(TrackBGPart);
</ins><span class="cx">
</span><del>- if (destroy)
- return;
-
</del><span class="cx"> // See if the scrollbar's thickness changed. If so, we need to mark our owning object as needing a layout.
</span><span class="cx"> bool isHorizontal = orientation() == HorizontalScrollbar;
</span><span class="cx"> int oldThickness = isHorizontal ? height() : width();
</span><span class="lines">@@ -220,12 +206,12 @@
</span><span class="cx"> return SCROLLBAR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType, bool destroy)
</del><ins>+void RenderScrollbar::updateScrollbarPart(ScrollbarPart partType)
</ins><span class="cx"> {
</span><span class="cx"> if (partType == NoPart)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<RenderStyle> partStyle = destroy ? nullptr : getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType));
</del><ins>+ RefPtr<RenderStyle> partStyle = getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType));
</ins><span class="cx"> bool needRenderer = partStyle && partStyle->display() != NONE;
</span><span class="cx">
</span><span class="cx"> if (needRenderer && partStyle->display() != BLOCK) {
</span><span class="lines">@@ -251,18 +237,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (needRenderer) {
- RenderScrollbarPart*& partRendererSlot = m_parts.add(partType, nullptr).iterator->value;
- if (partRendererSlot)
- partRendererSlot->setStyle(partStyle.releaseNonNull());
- else {
- partRendererSlot = new RenderScrollbarPart(owningRenderer()->document(), partStyle.releaseNonNull(), this, partType);
- partRendererSlot->initializeStyle();
- }
- } else {
- if (RenderScrollbarPart* partRenderer = m_parts.take(partType))
- partRenderer->destroy();
</del><ins>+ if (!needRenderer) {
+ m_parts.remove(partType);
+ return;
</ins><span class="cx"> }
</span><ins>+
+ if (auto& partRendererSlot = m_parts.add(partType, nullptr).iterator->value)
+ partRendererSlot->setStyle(partStyle.releaseNonNull());
+ else {
+ partRendererSlot = createRenderer<RenderScrollbarPart>(owningRenderer()->document(), partStyle.releaseNonNull(), this, partType);
+ partRendererSlot->initializeStyle();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbar::paintPart(GraphicsContext* graphicsContext, ScrollbarPart partType, const IntRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.h (161199 => 161200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-01-02 00:31:40 UTC (rev 161199)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.h 2014-01-02 00:52:55 UTC (rev 161200)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef RenderScrollbar_h
</span><span class="cx"> #define RenderScrollbar_h
</span><span class="cx">
</span><ins>+#include "RenderPtr.h"
</ins><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -75,9 +76,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isCustomScrollbar() const OVERRIDE { return true; }
</span><span class="cx">
</span><del>- void updateScrollbarParts(bool destroy = false);
</del><ins>+ void updateScrollbarParts();
</ins><span class="cx">
</span><del>- void updateScrollbarPart(ScrollbarPart, bool destroy = false);
</del><ins>+ void updateScrollbarPart(ScrollbarPart);
</ins><span class="cx">
</span><span class="cx"> // This Scrollbar(Widget) may outlive the DOM which created it (during tear down),
</span><span class="cx"> // so we keep a reference to the Element which caused this custom scrollbar creation.
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx"> RefPtr<Element> m_ownerElement;
</span><span class="cx">
</span><span class="cx"> Frame* m_owningFrame;
</span><del>- HashMap<unsigned, RenderScrollbarPart*> m_parts;
</del><ins>+ HashMap<unsigned, RenderPtr<RenderScrollbarPart>> m_parts;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline RenderScrollbar* toRenderScrollbar(ScrollbarThemeClient* scrollbar)
</span></span></pre>
</div>
</div>
</body>
</html>