source: webkit/trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp

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

[CSS Parser] Eliminate the Scope class and fold it into CSSTokenizer
https://bugs.webkit.org/show_bug.cgi?id=165532

Reviewed by Dean Jackson.

The Scope class, nested inside CSSTokenizer, is both poorly named and serves
no purpose. It's especially weird that it was the entry point into tokenization
instead of CSSTokenizer.

Eliminate the class, fold its members and functions into CSSTokenizer, and have
callers just make a CSSTokenizer instead.

  • css/parser/CSSParser.cpp:

(WebCore::CSSParser::parseSupportsCondition):
(WebCore::CSSParser::parseSelector):

  • css/parser/CSSParserImpl.cpp:

(WebCore::CSSParserImpl::parseValue):
(WebCore::CSSParserImpl::parseCustomPropertyValue):
(WebCore::CSSParserImpl::parseInlineStyleDeclaration):
(WebCore::CSSParserImpl::parseDeclarationList):
(WebCore::CSSParserImpl::parseRule):
(WebCore::CSSParserImpl::parseStyleSheet):
(WebCore::CSSParserImpl::parseKeyframeKeyList):
(WebCore::CSSParserImpl::parseDeclarationListForInspector):
(WebCore::CSSParserImpl::parseStyleSheetForInspector):

  • css/parser/CSSTokenizer.cpp:

(WebCore::CSSTokenizer::CSSTokenizer):
(WebCore::CSSTokenizer::tokenRange):
(WebCore::CSSTokenizer::tokenCount):
(WebCore::CSSTokenizer::registerString):
(WebCore::CSSTokenizer::Scope::Scope): Deleted.
(WebCore::CSSTokenizer::Scope::tokenRange): Deleted.
(WebCore::CSSTokenizer::Scope::tokenCount): Deleted.

  • css/parser/CSSTokenizer.h:

(WebCore::CSSTokenizer::Scope::storeString): Deleted.

  • css/parser/CSSTokenizerInputStream.cpp:

(WebCore::CSSTokenizerInputStream::CSSTokenizerInputStream):

  • css/parser/CSSTokenizerInputStream.h:
  • css/parser/MediaQueryParser.cpp:

(WebCore::MediaQueryParser::parseMediaQuerySet):

  • css/parser/SizesAttributeParser.cpp:

(WebCore::SizesAttributeParser::SizesAttributeParser):

File size: 3.0 KB
Line 
1// Copyright 2014 The Chromium Authors. All rights reserved.
2// Copyright (C) 2016 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 are
6// met:
7//
8// * Redistributions of source code must retain the above copyright
9// notice, this list of conditions and the following disclaimer.
10// * Redistributions in binary form must reproduce the above
11// copyright notice, this list of conditions and the following disclaimer
12// in the documentation and/or other materials provided with the
13// distribution.
14// * Neither the name of Google Inc. nor the names of its
15// contributors may be used to endorse or promote products derived from
16// this software without specific prior written permission.
17//
18// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29
30#include "config.h"
31#include "CSSTokenizerInputStream.h"
32
33#include "HTMLParserIdioms.h"
34
35namespace WebCore {
36
37CSSTokenizerInputStream::CSSTokenizerInputStream(const String& input)
38 : m_offset(0)
39 , m_stringLength(input.length())
40 , m_string(input.impl())
41{
42}
43
44void CSSTokenizerInputStream::advanceUntilNonWhitespace()
45{
46 // Using HTML space here rather than CSS space since we don't do preprocessing
47 if (m_string->is8Bit()) {
48 const LChar* characters = m_string->characters8();
49 while (m_offset < m_stringLength && isHTMLSpace(characters[m_offset]))
50 ++m_offset;
51 } else {
52 const UChar* characters = m_string->characters16();
53 while (m_offset < m_stringLength && isHTMLSpace(characters[m_offset]))
54 ++m_offset;
55 }
56}
57
58double CSSTokenizerInputStream::getDouble(unsigned start, unsigned end) const
59{
60 ASSERT(start <= end && ((m_offset + end) <= m_stringLength));
61 bool isResultOK = false;
62 double result = 0.0;
63 if (start < end) {
64 if (m_string->is8Bit())
65 result = charactersToDouble(m_string->characters8() + m_offset + start, end - start, &isResultOK);
66 else
67 result = charactersToDouble(m_string->characters16() + m_offset + start, end - start, &isResultOK);
68 }
69 // FIXME: It looks like callers ensure we have a valid number
70 return isResultOK ? result : 0.0;
71}
72
73} // namespace WebCore
Note: See TracBrowser for help on using the repository browser.