Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: third_party/WebKit/Source/core/style/StyleVariableData.cpp

Issue 1858553002: Refactor StyleVariableData to fallback on root map for performance reasons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleVariableData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/StyleVariableData.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleVariableData.cpp b/third_party/WebKit/Source/core/style/StyleVariableData.cpp
index c00080d7a2ec3a870346d210a671f2556845a996..f9eae7096d7db3fe57f99ea65504fcdd73811a48 100644
--- a/third_party/WebKit/Source/core/style/StyleVariableData.cpp
+++ b/third_party/WebKit/Source/core/style/StyleVariableData.cpp
@@ -10,9 +10,16 @@ namespace blink {
bool StyleVariableData::operator==(const StyleVariableData& other) const
{
- if (m_data.size() != other.m_data.size()) {
+ // It's technically possible for divergent roots to be value-equal,
+ // but unlikely. This equality operator is used for optimization purposes
+ // so it's OK to be occasionally wrong.
+ // TODO(shanestephens): Rename this to something that indicates it may not
+ // always return equality.
+ if (m_root != other.m_root)
+ return false;
+
+ if (m_data.size() != other.m_data.size())
return false;
- }
for (const auto& iter : m_data) {
RefPtr<CSSVariableData> otherData = other.m_data.get(iter.key);
@@ -23,4 +30,37 @@ bool StyleVariableData::operator==(const StyleVariableData& other) const
return true;
}
+StyleVariableData::StyleVariableData(StyleVariableData& other)
+{
+ if (!other.m_root) {
+ m_root = &other;
+ } else {
+ m_data = other.m_data;
+ m_root = other.m_root;
+ }
+}
+
+CSSVariableData* StyleVariableData::getVariable(const AtomicString& name) const
+{
+ auto result = m_data.find(name);
+ if (result == m_data.end() && m_root)
+ return m_root->getVariable(name);
+ if (result == m_data.end())
+ return nullptr;
+ return result->value.get();
+}
+
+std::unique_ptr<HashMap<AtomicString, RefPtr<CSSVariableData>>> StyleVariableData::getVariables() const
+{
+ std::unique_ptr<HashMap<AtomicString, RefPtr<CSSVariableData>>> result;
+ if (m_root) {
+ result.reset(new HashMap<AtomicString, RefPtr<CSSVariableData>>(m_root->m_data));
+ for (auto it = m_data.begin(); it != m_data.end(); ++it)
+ result->set(it->key, it->value);
+ } else {
+ result.reset(new HashMap<AtomicString, RefPtr<CSSVariableData>>(m_data));
+ }
+ return result;
+}
+
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleVariableData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698