haikuwebkit/Source/WebCore/css/CSSValuePair.cpp

48 lines
1.9 KiB
C++
Raw Permalink Normal View History

Add CSSValuePair.h in preparation for Pair.h refactor https://bugs.webkit.org/show_bug.cgi?id=223205 Patch by Tyler Wilcock <twilco.o@protonmail.com> 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. Canonical link: https://commits.webkit.org/235392@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274546 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 02:12:13 +00:00
/*
* Copyright (C) 2021 Tyler Wilcock <twilco.o@protonmail.com>.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "CSSValuePair.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
String CSSValuePair::customCSSText() const
{
String first = this->first()->cssText();
String second = this->second()->cssText();
if (m_encoding == IdenticalValueEncoding::Coalesce && first == second)
return first;
return makeString(first, separatorCSSText(), second);
Add CSSValuePair.h in preparation for Pair.h refactor https://bugs.webkit.org/show_bug.cgi?id=223205 Patch by Tyler Wilcock <twilco.o@protonmail.com> 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. Canonical link: https://commits.webkit.org/235392@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@274546 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2021-03-17 02:12:13 +00:00
}
bool CSSValuePair::equals(const CSSValuePair &other) const
{
return m_valueSeparator == other.m_valueSeparator && m_first.get().equals(other.m_first) && m_second.get().equals(other.m_second);
}
} // namespace WebCore