Attachment #256613 for bug #146856

View Details Raw Unified Return to Bug 146856



2015-07-10  Daniel Bates  <dabates@apple.com>

        Cleanup: Remove default constructor for WebCore::Pair()
        https://bugs.webkit.org/show_bug.cgi?id=146856
        <rdar://problem/21773212>

        Reviewed by NOBODY (OOPS!).

        Remove default constructor for WebCore::Pair() and the setters Pair::set{First, Second}()
        since they are not used and it seems weird to keep the latter after the removal of the former.
        Should it turn out that we find a user for having a default constructor and/or setters then
        we can revert this change.

        * css/Pair.h:
        (WebCore::Pair::create): Deleted.
        (WebCore::Pair::setFirst): Deleted.
        (WebCore::Pair::setSecond): Deleted.
        (WebCore::Pair::Pair): Deleted.

2015-07-10  Daniel Bates  <dabates@apple.com>

        Serialized declaration for background-size/-webkit-mask-size should preserve identical
        values instead of coalescing them
        https://bugs.webkit.org/show_bug.cgi?id=143191



        Coalesce
    };

    static Ref<Pair> create()
    {
        return adoptRef(*new Pair);
    }
    static Ref<Pair> create(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second)
    {
        return adoptRef(*new Pair(WTF::move(first), WTF::move(second)));

    CSSPrimitiveValue* first() const { return m_first.get(); }
    CSSPrimitiveValue* second() const { return m_second.get(); }

    void setFirst(RefPtr<CSSPrimitiveValue>&& first) { m_first = WTF::move(first); }
    void setSecond(RefPtr<CSSPrimitiveValue>&& second) { m_second = WTF::move(second); }

    String cssText() const
    {
        String first = this->first()->cssText();

    bool equals(const Pair& other) const { return compareCSSValuePtr(m_first, other.m_first) && compareCSSValuePtr(m_second, other.m_second); }

private:
    Pair() : m_first(nullptr), m_second(nullptr) { }
    Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second) : m_first(WTF::move(first)), m_second(WTF::move(second)) { }
    Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second, IdenticalValueEncoding encoding) : m_first(WTF::move(first)), m_second(WTF::move(second)), m_encoding(encoding) { }


Return to Bug 146856

Lines 1-5 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +19 lines
1	2015-07-10 Daniel Bates <dabates@apple.com>	1	2015-07-10 Daniel Bates <dabates@apple.com>
2		2
		3	Cleanup: Remove default constructor for WebCore::Pair()
		4	https://bugs.webkit.org/show_bug.cgi?id=146856
		5	<rdar://problem/21773212>
		6
		7	Reviewed by NOBODY (OOPS!).
		8
		9	Remove default constructor for WebCore::Pair() and the setters Pair::set{First, Second}()
		10	since they are not used and it seems weird to keep the latter after the removal of the former.
		11	Should it turn out that we find a user for having a default constructor and/or setters then
		12	we can revert this change.
		13
		14	* css/Pair.h:
		15	(WebCore::Pair::create): Deleted.
		16	(WebCore::Pair::setFirst): Deleted.
		17	(WebCore::Pair::setSecond): Deleted.
		18	(WebCore::Pair::Pair): Deleted.
		19
		20	2015-07-10 Daniel Bates <dabates@apple.com>
		21
3	Serialized declaration for background-size/-webkit-mask-size should preserve identical	22	Serialized declaration for background-size/-webkit-mask-size should preserve identical
4	values instead of coalescing them	23	values instead of coalescing them
5	https://bugs.webkit.org/show_bug.cgi?id=143191	24	https://bugs.webkit.org/show_bug.cgi?id=143191

Lines 39-48 public: a/Source/WebCore/css/Pair.h_sec1
- a/Source/WebCore/css/Pair.h -8 lines
39	Coalesce	39	Coalesce
40	};	40	};
41		41
42	static Ref<Pair> create()
43	{
44	return adoptRef(*new Pair);
45	}
46	static Ref<Pair> create(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second)	42	static Ref<Pair> create(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second)
47	{	43	{
48	return adoptRef(*new Pair(WTF::move(first), WTF::move(second)));	44	return adoptRef(*new Pair(WTF::move(first), WTF::move(second)));
Lines 56-64 public: a/Source/WebCore/css/Pair.h_sec2
56	CSSPrimitiveValue* first() const { return m_first.get(); }	52	CSSPrimitiveValue* first() const { return m_first.get(); }
57	CSSPrimitiveValue* second() const { return m_second.get(); }	53	CSSPrimitiveValue* second() const { return m_second.get(); }
58		54
59	void setFirst(RefPtr<CSSPrimitiveValue>&& first) { m_first = WTF::move(first); }
60	void setSecond(RefPtr<CSSPrimitiveValue>&& second) { m_second = WTF::move(second); }
61
62	String cssText() const	55	String cssText() const
63	{	56	{
64	String first = this->first()->cssText();	57	String first = this->first()->cssText();
Lines 71-77 public: a/Source/WebCore/css/Pair.h_sec3
71	bool equals(const Pair& other) const { return compareCSSValuePtr(m_first, other.m_first) && compareCSSValuePtr(m_second, other.m_second); }	64	bool equals(const Pair& other) const { return compareCSSValuePtr(m_first, other.m_first) && compareCSSValuePtr(m_second, other.m_second); }
72		65
73	private:	66	private:
74	Pair() : m_first(nullptr), m_second(nullptr) { }
75	Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second) : m_first(WTF::move(first)), m_second(WTF::move(second)) { }	67	Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second) : m_first(WTF::move(first)), m_second(WTF::move(second)) { }
76	Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second, IdenticalValueEncoding encoding) : m_first(WTF::move(first)), m_second(WTF::move(second)), m_encoding(encoding) { }	68	Pair(RefPtr<CSSPrimitiveValue>&& first, RefPtr<CSSPrimitiveValue>&& second, IdenticalValueEncoding encoding) : m_first(WTF::move(first)), m_second(WTF::move(second)), m_encoding(encoding) { }
77		69