- Revision
- 203738
- Author
- za...@apple.com
- Date
- 2016-07-26 14:49:26 -0700 (Tue, 26 Jul 2016)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (203737 => 203738)
--- 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)
@@ -1,3 +1,30 @@
+2016-07-26 Zalan Bujtas <za...@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:
+
2016-07-26 Eric Carlson <eric.carl...@apple.com>
Occasional crash in WebCore::RenderVTTCue::initializeLayoutParameters
Modified: trunk/Source/WebCore/platform/ControlStates.h (203737 => 203738)
--- 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)
@@ -56,13 +56,6 @@
ControlStates(States states)
: m_states(states)
- , m_initialized(false)
- , m_needsRepaint(false)
- , m_isDirty(false)
- , m_timeSinceControlWasFocused(0)
-#if PLATFORM(COCOA)
- , m_controlInstance(nullptr)
-#endif
{
}
@@ -101,10 +94,10 @@
private:
States m_states;
- bool m_initialized;
- bool m_needsRepaint;
- bool m_isDirty;
- double m_timeSinceControlWasFocused;
+ bool m_initialized { false };
+ bool m_needsRepaint { false };
+ bool m_isDirty { false };
+ double m_timeSinceControlWasFocused { 0 };
#if PLATFORM(COCOA)
RetainPtr<PlatformControlInstance> m_controlInstance;
#endif
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (203737 => 203738)
--- 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)
@@ -28,6 +28,7 @@
#include "CSSFontSelector.h"
#include "Chrome.h"
#include "ChromeClient.h"
+#include "ControlStates.h"
#include "Document.h"
#include "EventHandler.h"
#include "FloatQuad.h"
@@ -109,6 +110,25 @@
static const int autoscrollBeltSize = 20;
static const unsigned backgroundObscurationTestMaxDepth = 4;
+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);
+}
+
bool RenderBox::s_hadOverflowClip = false;
static bool skipBodyBackground(const RenderBox* bodyElementRenderer)
@@ -158,8 +178,7 @@
#endif
view().unscheduleLazyRepaint(*this);
- if (hasControlStatesForRenderer(this))
- removeControlStatesForRenderer(this);
+ removeControlStatesForRenderer(*this);
}
RenderRegion* RenderBox::clampToStartAndEndRegions(RenderRegion* region) const
@@ -1351,15 +1370,9 @@
// If we have a native theme appearance, paint that before painting our background.
// The theme will tell us whether or not we should also paint the CSS background.
- ControlStates* controlStates = nullptr;
bool borderOrBackgroundPaintingIsNeeded = true;
if (style().hasAppearance()) {
- if (hasControlStatesForRenderer(this))
- controlStates = controlStatesForRenderer(this);
- else {
- controlStates = new ControlStates();
- addControlStatesForRenderer(this, controlStates);
- }
+ ControlStates* controlStates = controlStatesForRenderer(*this);
borderOrBackgroundPaintingIsNeeded = theme().paint(*this, *controlStates, paintInfo, paintRect);
if (controlStates->needsRepaint())
view().scheduleLazyRepaint(*this);
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (203737 => 203738)
--- 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)
@@ -27,7 +27,6 @@
#include "AXObjectCache.h"
#include "ContentData.h"
-#include "ControlStates.h"
#include "CursorList.h"
#include "ElementChildIterator.h"
#include "EventHandler.h"
@@ -80,12 +79,6 @@
bool RenderElement::s_affectsParentBlock = false;
bool RenderElement::s_noLongerAffectsParentBlock = false;
-static HashMap<const RenderObject*, ControlStates*>& controlStatesRendererMap()
-{
- static NeverDestroyed<HashMap<const RenderObject*, ControlStates*>> map;
- return map;
-}
-
inline RenderElement::RenderElement(ContainerNode& elementOrDocument, RenderStyle&& style, BaseTypeFlags baseTypeFlags)
: RenderObject(elementOrDocument)
, m_baseTypeFlags(baseTypeFlags)
@@ -1510,30 +1503,6 @@
return is<RenderNamedFlowThread>(renderer) ? downcast<RenderNamedFlowThread>(renderer) : nullptr;
}
-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);
-}
-
const RenderStyle* RenderElement::getCachedPseudoStyle(PseudoId pseudo, const RenderStyle* parentStyle) const
{
if (pseudo < FIRST_INTERNAL_PSEUDOID && !style().hasPseudoStyle(pseudo))
Modified: trunk/Source/WebCore/rendering/RenderElement.h (203737 => 203738)
--- 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)
@@ -258,11 +258,6 @@
void setHasContinuation(bool b) { m_hasContinuation = b; }
- static bool hasControlStatesForRenderer(const RenderObject*);
- static ControlStates* controlStatesForRenderer(const RenderObject*);
- static void removeControlStatesForRenderer(const RenderObject*);
- static void addControlStatesForRenderer(const RenderObject*, ControlStates*);
-
void setRenderBlockHasMarginBeforeQuirk(bool b) { m_renderBlockHasMarginBeforeQuirk = b; }
void setRenderBlockHasMarginAfterQuirk(bool b) { m_renderBlockHasMarginAfterQuirk = b; }
void setRenderBlockShouldForceRelayoutChildren(bool b) { m_renderBlockShouldForceRelayoutChildren = b; }
