<!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>[203738] 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/203738">203738</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 14:49:26 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ControlStates HashMap to RenderBox.
https://bugs.webkit.org/show_bug.cgi?id=160206
Reviewed by Simon Fraser.
Move and modernize it.
No change in functionality.
* platform/ControlStates.h:
(WebCore::ControlStates::ControlStates): Deleted.
* rendering/RenderBox.cpp:
(WebCore::controlStatesRendererMap):
(WebCore::controlStatesForRenderer):
(WebCore::removeControlStatesForRenderer):
(WebCore::RenderBox::~RenderBox):
(WebCore::RenderBox::paintBoxDecorations):
* rendering/RenderElement.cpp:
(WebCore::controlStatesRendererMap): Deleted.
(WebCore::RenderElement::hasControlStatesForRenderer): Deleted.
(WebCore::RenderElement::controlStatesForRenderer): Deleted.
(WebCore::RenderElement::removeControlStatesForRenderer): Deleted.
(WebCore::RenderElement::addControlStatesForRenderer): Deleted.
* rendering/RenderElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformControlStatesh">trunk/Source/WebCore/platform/ControlStates.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203737 => 203738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-26 21:35:20 UTC (rev 203737)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 21:49:26 UTC (rev 203738)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-07-26 Zalan Bujtas <zalan@apple.com>
+
+ Move ControlStates HashMap to RenderBox.
+ https://bugs.webkit.org/show_bug.cgi?id=160206
+
+ Reviewed by Simon Fraser.
+
+ Move and modernize it.
+
+ No change in functionality.
+
+ * platform/ControlStates.h:
+ (WebCore::ControlStates::ControlStates): Deleted.
+ * rendering/RenderBox.cpp:
+ (WebCore::controlStatesRendererMap):
+ (WebCore::controlStatesForRenderer):
+ (WebCore::removeControlStatesForRenderer):
+ (WebCore::RenderBox::~RenderBox):
+ (WebCore::RenderBox::paintBoxDecorations):
+ * rendering/RenderElement.cpp:
+ (WebCore::controlStatesRendererMap): Deleted.
+ (WebCore::RenderElement::hasControlStatesForRenderer): Deleted.
+ (WebCore::RenderElement::controlStatesForRenderer): Deleted.
+ (WebCore::RenderElement::removeControlStatesForRenderer): Deleted.
+ (WebCore::RenderElement::addControlStatesForRenderer): Deleted.
+ * rendering/RenderElement.h:
+
</ins><span class="cx"> 2016-07-26 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Occasional crash in WebCore::RenderVTTCue::initializeLayoutParameters
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformControlStatesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ControlStates.h (203737 => 203738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ControlStates.h 2016-07-26 21:35:20 UTC (rev 203737)
+++ trunk/Source/WebCore/platform/ControlStates.h 2016-07-26 21:49:26 UTC (rev 203738)
</span><span class="lines">@@ -56,13 +56,6 @@
</span><span class="cx">
</span><span class="cx"> ControlStates(States states)
</span><span class="cx"> : m_states(states)
</span><del>- , m_initialized(false)
- , m_needsRepaint(false)
- , m_isDirty(false)
- , m_timeSinceControlWasFocused(0)
-#if PLATFORM(COCOA)
- , m_controlInstance(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,10 +94,10 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> States m_states;
</span><del>- bool m_initialized;
- bool m_needsRepaint;
- bool m_isDirty;
- double m_timeSinceControlWasFocused;
</del><ins>+ bool m_initialized { false };
+ bool m_needsRepaint { false };
+ bool m_isDirty { false };
+ double m_timeSinceControlWasFocused { 0 };
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<PlatformControlInstance> m_controlInstance;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (203737 => 203738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-07-26 21:35:20 UTC (rev 203737)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-07-26 21:49:26 UTC (rev 203738)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><ins>+#include "ControlStates.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="lines">@@ -109,6 +110,25 @@
</span><span class="cx"> static const int autoscrollBeltSize = 20;
</span><span class="cx"> static const unsigned backgroundObscurationTestMaxDepth = 4;
</span><span class="cx">
</span><ins>+using ControlStatesRendererMap = HashMap<const RenderObject*, std::unique_ptr<ControlStates>>;
+static ControlStatesRendererMap& controlStatesRendererMap()
+{
+ static NeverDestroyed<ControlStatesRendererMap> map;
+ return map;
+}
+
+static ControlStates* controlStatesForRenderer(const RenderBox& renderer)
+{
+ return controlStatesRendererMap().ensure(&renderer, [] {
+ return std::make_unique<ControlStates>();
+ }).iterator->value.get();
+}
+
+static void removeControlStatesForRenderer(const RenderBox& renderer)
+{
+ controlStatesRendererMap().remove(&renderer);
+}
+
</ins><span class="cx"> bool RenderBox::s_hadOverflowClip = false;
</span><span class="cx">
</span><span class="cx"> static bool skipBodyBackground(const RenderBox* bodyElementRenderer)
</span><span class="lines">@@ -158,8 +178,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> view().unscheduleLazyRepaint(*this);
</span><del>- if (hasControlStatesForRenderer(this))
- removeControlStatesForRenderer(this);
</del><ins>+ removeControlStatesForRenderer(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderRegion* RenderBox::clampToStartAndEndRegions(RenderRegion* region) const
</span><span class="lines">@@ -1351,15 +1370,9 @@
</span><span class="cx">
</span><span class="cx"> // If we have a native theme appearance, paint that before painting our background.
</span><span class="cx"> // The theme will tell us whether or not we should also paint the CSS background.
</span><del>- ControlStates* controlStates = nullptr;
</del><span class="cx"> bool borderOrBackgroundPaintingIsNeeded = true;
</span><span class="cx"> if (style().hasAppearance()) {
</span><del>- if (hasControlStatesForRenderer(this))
- controlStates = controlStatesForRenderer(this);
- else {
- controlStates = new ControlStates();
- addControlStatesForRenderer(this, controlStates);
- }
</del><ins>+ ControlStates* controlStates = controlStatesForRenderer(*this);
</ins><span class="cx"> borderOrBackgroundPaintingIsNeeded = theme().paint(*this, *controlStates, paintInfo, paintRect);
</span><span class="cx"> if (controlStates->needsRepaint())
</span><span class="cx"> view().scheduleLazyRepaint(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (203737 => 203738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-07-26 21:35:20 UTC (rev 203737)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-07-26 21:49:26 UTC (rev 203738)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "ContentData.h"
</span><del>-#include "ControlStates.h"
</del><span class="cx"> #include "CursorList.h"
</span><span class="cx"> #include "ElementChildIterator.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="lines">@@ -80,12 +79,6 @@
</span><span class="cx"> bool RenderElement::s_affectsParentBlock = false;
</span><span class="cx"> bool RenderElement::s_noLongerAffectsParentBlock = false;
</span><span class="cx">
</span><del>-static HashMap<const RenderObject*, ControlStates*>& controlStatesRendererMap()
-{
- static NeverDestroyed<HashMap<const RenderObject*, ControlStates*>> map;
- return map;
-}
-
</del><span class="cx"> inline RenderElement::RenderElement(ContainerNode& elementOrDocument, RenderStyle&& style, BaseTypeFlags baseTypeFlags)
</span><span class="cx"> : RenderObject(elementOrDocument)
</span><span class="cx"> , m_baseTypeFlags(baseTypeFlags)
</span><span class="lines">@@ -1510,30 +1503,6 @@
</span><span class="cx"> return is<RenderNamedFlowThread>(renderer) ? downcast<RenderNamedFlowThread>(renderer) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderElement::hasControlStatesForRenderer(const RenderObject* o)
-{
- return controlStatesRendererMap().contains(o);
-}
-
-ControlStates* RenderElement::controlStatesForRenderer(const RenderObject* o)
-{
- return controlStatesRendererMap().get(o);
-}
-
-void RenderElement::removeControlStatesForRenderer(const RenderObject* o)
-{
- ControlStates* states = controlStatesRendererMap().get(o);
- if (states) {
- controlStatesRendererMap().remove(o);
- delete states;
- }
-}
-
-void RenderElement::addControlStatesForRenderer(const RenderObject* o, ControlStates* states)
-{
- controlStatesRendererMap().add(o, states);
-}
-
</del><span class="cx"> const RenderStyle* RenderElement::getCachedPseudoStyle(PseudoId pseudo, const RenderStyle* parentStyle) const
</span><span class="cx"> {
</span><span class="cx"> if (pseudo < FIRST_INTERNAL_PSEUDOID && !style().hasPseudoStyle(pseudo))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (203737 => 203738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-07-26 21:35:20 UTC (rev 203737)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-07-26 21:49:26 UTC (rev 203738)
</span><span class="lines">@@ -258,11 +258,6 @@
</span><span class="cx">
</span><span class="cx"> void setHasContinuation(bool b) { m_hasContinuation = b; }
</span><span class="cx">
</span><del>- static bool hasControlStatesForRenderer(const RenderObject*);
- static ControlStates* controlStatesForRenderer(const RenderObject*);
- static void removeControlStatesForRenderer(const RenderObject*);
- static void addControlStatesForRenderer(const RenderObject*, ControlStates*);
-
</del><span class="cx"> void setRenderBlockHasMarginBeforeQuirk(bool b) { m_renderBlockHasMarginBeforeQuirk = b; }
</span><span class="cx"> void setRenderBlockHasMarginAfterQuirk(bool b) { m_renderBlockHasMarginAfterQuirk = b; }
</span><span class="cx"> void setRenderBlockShouldForceRelayoutChildren(bool b) { m_renderBlockShouldForceRelayoutChildren = b; }
</span></span></pre>
</div>
</div>
</body>
</html>