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

Last change on this file was 292375, checked in by Antti Koivisto, 3 years ago

[CSS Container Queries] Simplify grammar
https://bugs.webkit.org/show_bug.cgi?id=238732

Reviewed by Sam Weinig.

Because size() function syntax is no longer supported, separate SizeQuery and SizeCondition productions
are no longer needed.

Some slightly unnecessary templatization is retained to help with future work.

  • css/ContainerQuery.cpp:
  • css/ContainerQuery.h:
  • css/ContainerQueryParser.cpp:

(WebCore::ContainerQueryParser::consumeContainerQuery):
(WebCore::ContainerQueryParser::consumeCondition):
(WebCore::ContainerQueryParser::consumeSizeFeature):
(WebCore::ContainerQueryParser::consumePlainSizeFeature):
(WebCore::ContainerQueryParser::consumeSizeQuery): Deleted.

  • css/ContainerQueryParser.h:
  • style/ContainerQueryEvaluator.cpp:

(WebCore::Style::ContainerQueryEvaluator::evaluateQuery const):

  • style/ContainerQueryEvaluator.h:
File size: 2.3 KB
Line 
1/*
2 * Copyright (C) 2022 Apple Inc. All rights reserved.
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 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
20 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#pragma once
26
27#include "CSSParserContext.h"
28#include "CSSParserToken.h"
29#include "ContainerQuery.h"
30
31namespace WebCore {
32
33class CSSParserTokenRange;
34
35class ContainerQueryParser {
36public:
37 static std::optional<FilteredContainerQuery> consumeFilteredContainerQuery(CSSParserTokenRange&, const CSSParserContext&);
38
39private:
40 std::optional<FilteredContainerQuery> consumeFilteredContainerQuery(CSSParserTokenRange&);
41 std::optional<CQ::ContainerQuery> consumeContainerQuery(CSSParserTokenRange&);
42 template<typename ConditionType> std::optional<ConditionType> consumeCondition(CSSParserTokenRange&);
43 std::optional<CQ::SizeFeature> consumeSizeFeature(CSSParserTokenRange&);
44 std::optional<CQ::SizeFeature> consumePlainSizeFeature(CSSParserTokenRange&);
45 std::optional<CQ::SizeFeature> consumeRangeSizeFeature(CSSParserTokenRange&);
46 RefPtr<CSSValue> consumeValue(CSSParserTokenRange&);
47
48 ContainerQueryParser(const CSSParserContext& context)
49 : m_context(context) { }
50
51 const CSSParserContext m_context;
52
53 OptionSet<CQ::Axis> m_requiredAxes;
54};
55
56}
Note: See TracBrowser for help on using the repository browser.