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

Unified Diff: third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp

Issue 2730633004: [CSS Typed OM] Rearrange StylePropertyMap classes to match the new spec. (Closed)
Patch Set: Remove spurious : Created 3 years, 9 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
Index: third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
index 4e56ef6b250774a22471ecd668928a39b76a75f5..befd94cdfa132ed847f233b1b15ee87c65753ff7 100644
--- a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
@@ -12,81 +12,6 @@
namespace blink {
-namespace {
-
-class StylePropertyMapIterationSource final
- : public PairIterable<String, CSSStyleValueOrCSSStyleValueSequence>::
- IterationSource {
- public:
- explicit StylePropertyMapIterationSource(
- HeapVector<StylePropertyMap::StylePropertyMapEntry> values)
- : m_index(0), m_values(values) {}
-
- bool next(ScriptState*,
- String& key,
- CSSStyleValueOrCSSStyleValueSequence& value,
- ExceptionState&) override {
- if (m_index >= m_values.size())
- return false;
-
- const StylePropertyMap::StylePropertyMapEntry& pair =
- m_values.at(m_index++);
- key = pair.first;
- value = pair.second;
- return true;
- }
-
- DEFINE_INLINE_VIRTUAL_TRACE() {
- visitor->trace(m_values);
- PairIterable<String, CSSStyleValueOrCSSStyleValueSequence>::
- IterationSource::trace(visitor);
- }
-
- private:
- size_t m_index;
- const HeapVector<StylePropertyMap::StylePropertyMapEntry> m_values;
-};
-
-} // namespace
-
-CSSStyleValue* StylePropertyMap::get(const String& propertyName,
- ExceptionState& exceptionState) {
- CSSPropertyID propertyID = cssPropertyID(propertyName);
- if (propertyID == CSSPropertyInvalid || propertyID == CSSPropertyVariable) {
- // TODO(meade): Handle custom properties here.
- exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
- return nullptr;
- }
-
- CSSStyleValueVector styleVector = getAllInternal(propertyID);
- if (styleVector.isEmpty())
- return nullptr;
-
- return styleVector[0];
-}
-
-CSSStyleValueVector StylePropertyMap::getAll(const String& propertyName,
- ExceptionState& exceptionState) {
- CSSPropertyID propertyID = cssPropertyID(propertyName);
- if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable)
- return getAllInternal(propertyID);
-
- // TODO(meade): Handle custom properties here.
- exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
- return CSSStyleValueVector();
-}
-
-bool StylePropertyMap::has(const String& propertyName,
- ExceptionState& exceptionState) {
- CSSPropertyID propertyID = cssPropertyID(propertyName);
- if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable)
- return !getAllInternal(propertyID).isEmpty();
-
- // TODO(meade): Handle custom properties here.
- exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
- return false;
-}
-
void StylePropertyMap::set(const String& propertyName,
CSSStyleValueOrCSSStyleValueSequenceOrString& item,
ExceptionState& exceptionState) {
@@ -123,10 +48,4 @@ void StylePropertyMap::remove(const String& propertyName,
exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
}
-StylePropertyMap::IterationSource* StylePropertyMap::startIteration(
- ScriptState*,
- ExceptionState&) {
- return new StylePropertyMapIterationSource(getIterationEntries());
-}
-
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698