source: webkit/trunk/Source/WebCore/css/CSSValuePair.h

Last change on this file was 274546, checked in by [email protected], 4 years ago

Add CSSValuePair.h in preparation for Pair.h refactor
https://bugs.webkit.org/show_bug.cgi?id=223205

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-03-16
Reviewed by Simon Fraser.

Add new CSSValuePair class, which is intended to replace Pair.h.
Pair.h has some problems, namely:

  1. It's not a sub-class of CSSValue, making it awkward to use.
  2. It can only contain CSSPrimitiveValues.

CSSValuePair will fix both of these shortcomings.

  • Sources.txt:

Add CSSValuePair.cpp.

  • css/CSSValue.cpp:

(WebCore::CSSValue::cssText const):
Handle new ValuePairClass value.
(WebCore::CSSValue::separatorCssText const):
Added.
(WebCore::CSSValue::destroy):
Handle new ValuePairClass value.

  • css/CSSValue.h:

(WebCore::CSSValue::isValuePair const):
Added.
(WebCore::CSSValue::CSSValue):
Add new ValuePairClass value. Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

  • css/CSSValueList.cpp:

(WebCore::CSSValueList::CSSValueList):
(WebCore::CSSValueList::copy):
(WebCore::CSSValueList::customCSSText const):
Refactor to use new separatorCssText() function.
(WebCore::CSSValueList::equals const):
Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

  • css/CSSValueList.h:

(WebCore::CSSValueList::separator const):
Rename m_valueListSeparator to m_valueSeparator.

  • css/CSSValuePair.cpp:

(WebCore::CSSValuePair::customCSSText const):
(WebCore::CSSValuePair::equals const):
Added.

  • css/CSSValuePair.h:

(WebCore::CSSValuePair::create):
(WebCore::CSSValuePair::first const):
(WebCore::CSSValuePair::second const):
(WebCore::CSSValuePair::CSSValuePair):
Added.

  • css/DeprecatedCSSOMValue.h:
  • css/DeprecatedCSSOMValueList.cpp:

(WebCore::DeprecatedCSSOMValueList::cssText const):

  • css/DeprecatedCSSOMValueList.h:

(WebCore::DeprecatedCSSOMValueList::DeprecatedCSSOMValueList):
Rename m_valueListSeparator to m_valueSeparator,
ValueListSeparator to ValueSeparator, and
ValueListSeparatorBits to ValueSeparatorBits.

File size: 3.0 KB
Line 
1/*
2 * Copyright (C) 2021 Tyler Wilcock <[email protected]>.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#pragma once
27
28#include "CSSValue.h"
29
30namespace WebCore {
31
32/**
33 * Represents a pair of CSS values.
34 */
35class CSSValuePair : public CSSValue {
36public:
37 enum class IdenticalValueEncoding : uint8_t {
38 DoNotCoalesce,
39 Coalesce
40 };
41
42 static Ref<CSSValuePair> create(Ref<CSSValue>&& first, Ref<CSSValue>&& second, ValueSeparator separator)
43 {
44 return adoptRef(*new CSSValuePair(WTFMove(first), WTFMove(second), separator));
45 }
46 static Ref<CSSValuePair> create(Ref<CSSValue>&& first, Ref<CSSValue>&& second, ValueSeparator separator, IdenticalValueEncoding encoding)
47 {
48 return adoptRef(*new CSSValuePair(WTFMove(first), WTFMove(second), separator, encoding));
49 }
50
51 Ref<CSSValue> first() const { return m_first; }
52 Ref<CSSValue> second() const { return m_second; }
53
54 String customCSSText() const;
55 bool equals(const CSSValuePair& other) const;
56
57private:
58 explicit CSSValuePair(Ref<CSSValue>&& first, Ref<CSSValue>&& second, ValueSeparator separator)
59 : CSSValue(ValuePairClass)
60 , m_first(WTFMove(first))
61 , m_second(WTFMove(second))
62 {
63 m_valueSeparator = separator;
64 }
65
66 explicit CSSValuePair(Ref<CSSValue>&& first, Ref<CSSValue>&& second, ValueSeparator separator, IdenticalValueEncoding encoding)
67 : CSSValue(ValuePairClass)
68 , m_encoding(encoding)
69 , m_first(WTFMove(first))
70 , m_second(WTFMove(second))
71 {
72 m_valueSeparator = separator;
73 }
74
75 IdenticalValueEncoding m_encoding { IdenticalValueEncoding::Coalesce };
76 Ref<CSSValue> m_first;
77 Ref<CSSValue> m_second;
78};
79
80} // namespace WebCore
81
82SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSValuePair, isValuePair())
Note: See TracBrowser for help on using the repository browser.