Changeset 257696 in webkit for trunk/Source/WebCore/css/CSSKeyframeRule.cpp

Timestamp:

Mar 1, 2020, 4:40:05 PM (5 years ago)

Author:

Darin Adler

Message:

Move some vectors around instead of heap-allocating them and moving the pointers
​https://bugs.webkit.org/show_bug.cgi?id=208422

Reviewed by Sam Weinig.

• css/CSSKeyframeRule.cpp:

(WebCore::StyleRuleKeyframe::StyleRuleKeyframe): Take Vector&& instead of
unique_ptr<Vector>.
(WebCore::StyleRuleKeyframe::create): Moved these here from the header.
Take Vector&& instead of unique_ptr<Vector>.
(WebCore::StyleRuleKeyframe::setKeyText): Update since the result is a
Vector rather than a unique_ptr<Vector>.

• css/CSSKeyframeRule.h: Updated for the above.

• css/CSSKeyframesRule.cpp:

(WebCore::StyleRuleKeyframes::findKeyframeIndex const): Return Optional<size_t>
so we don't depend on notFound. This is our better modern pattern, since
notFound can work wrong if we mix size_t and unsigned, for example. Also
updatd since result of parseKeyFrameKeyList is now a Vector rather than
a unique_ptr<Vector>.
(WebCore::CSSKeyframesRule::deleteRule): Updated for the above.
(WebCore::CSSKeyframesRule::findRule): Ditto.

• css/CSSKeyframesRule.h: Updated for the above.

• css/parser/CSSParser.cpp:

(WebCore::CSSParser::parseKeyframeKeyList): Return Vector instead of
unique_ptr<Vector>.

• css/parser/CSSParser.h: Updated for the above.

• css/parser/CSSParserImpl.cpp:

(WebCore::CSSParserImpl::parseKeyframeKeyList): Return Vector instead of
unique_ptr<Vector>.
(WebCore::CSSParserImpl::consumeKeyframeStyleRule): Updated for the
above change.
(WebCore::CSSParserImpl::consumeKeyframeKeyList): Return Vector instead
of unique_ptr<Vector>.

• css/parser/CSSParserImpl.h: Updated for the above.

• platform/graphics/FloatPolygon.cpp:

(WebCore::FloatPolygon::FloatPolygon): Take Vector&& instead of
unique_ptr<Vector>.

• platform/graphics/FloatPolygon.h: Take Vector&& instead of unique_ptr<Vector>.

Also changed m_vertices to a Vector instead of a unique_ptr<Vector>.

• rendering/shapes/PolygonShape.h: Take Vector&& instead of unique_ptr<Vector>.

• rendering/shapes/Shape.cpp:

(WebCore::createPolygonShape): Take Vector&& instead of unique_ptr<Vector>.
(WebCore::Shape::createShape): Use a Vector instead of a unique_ptr<Vector>.

File:

• trunk/Source/WebCore/css/CSSKeyframeRule.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSKeyframeRule.cpp

@@ -41 +41 @@
 }
 
-StyleRuleKeyframe::StyleRuleKeyframe(std::unique_ptr<Vector<double>> keys, Ref<StyleProperties>&& properties)
+StyleRuleKeyframe::StyleRuleKeyframe(Vector<double>&& keys, Ref<StyleProperties>&& properties)
     : StyleRuleBase(StyleRuleType::Keyframe)
     , m_properties(WTFMove(properties))
-    , m_keys(*keys)
+    , m_keys(WTFMove(keys))
 {
 }
-    
+
+Ref<StyleRuleKeyframe> StyleRuleKeyframe::create(Ref<StyleProperties>&& properties)
+{
+    return adoptRef(*new StyleRuleKeyframe(WTFMove(properties)));
+}
+
+Ref<StyleRuleKeyframe> StyleRuleKeyframe::create(Vector<double>&& keys, Ref<StyleProperties>&& properties)
+{
+    return adoptRef(*new StyleRuleKeyframe(WTFMove(keys), WTFMove(properties)));
+}
+
 StyleRuleKeyframe::~StyleRuleKeyframe() = default;
 
@@ -72 +82 @@
     ASSERT(!keyText.isNull());
     auto keys = CSSParser::parseKeyframeKeyList(keyText);
-    if (!keys || keys->isEmpty())
+    if (keys.isEmpty())
         return false;
-    m_keys = *keys;
+    m_keys = WTFMove(keys);
     return true;
 }