| Index: Source/core/css/parser/SizesCalcParser.h
|
| diff --git a/Source/core/css/parser/SizesCalcParser.h b/Source/core/css/parser/SizesCalcParser.h
|
| index 4e040c6cee66bfef06805c6ce8133258ff524140..3230ebb1f954fb4e9e69d9460ffb2d17e98bc503 100644
|
| --- a/Source/core/css/parser/SizesCalcParser.h
|
| +++ b/Source/core/css/parser/SizesCalcParser.h
|
| @@ -34,16 +34,14 @@ struct SizesCalcValue {
|
| class SizesCalcParser {
|
|
|
| public:
|
| - static bool parse(MediaQueryTokenIterator start, MediaQueryTokenIterator end, PassRefPtr<MediaValues>, unsigned& result);
|
| + explicit SizesCalcParser(MediaQueryTokenIterator start, MediaQueryTokenIterator end, PassRefPtr<MediaValues>);
|
| + bool viewportDependant() const { return m_viewportDependant; }
|
| + unsigned result();
|
| + bool isValid() const { return m_isValid; }
|
|
|
| private:
|
| - SizesCalcParser(PassRefPtr<MediaValues> mediaValues)
|
| - : m_mediaValues(mediaValues)
|
| - {
|
| - }
|
| -
|
| bool calcToReversePolishNotation(MediaQueryTokenIterator start, MediaQueryTokenIterator end);
|
| - bool calculate(unsigned& result);
|
| + bool calculate();
|
| void appendNumber(const MediaQueryToken&);
|
| bool appendLength(const MediaQueryToken&);
|
| bool handleOperator(Vector<MediaQueryToken>& stack, const MediaQueryToken&);
|
| @@ -51,6 +49,9 @@ private:
|
|
|
| Vector<SizesCalcValue> m_valueList;
|
| RefPtr<MediaValues> m_mediaValues;
|
| + bool m_viewportDependant;
|
| + bool m_isValid;
|
| + unsigned m_result;
|
| };
|
|
|
| } // namespace WebCore
|
|
|