| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ViewportSize(double width, double height) : m_size(width, height) {} | 76 ViewportSize(double width, double height) : m_size(width, height) {} |
| 77 explicit ViewportSize(const LayoutViewItem&); | 77 explicit ViewportSize(const LayoutViewItem&); |
| 78 | 78 |
| 79 double width() const { return m_size.width(); } | 79 double width() const { return m_size.width(); } |
| 80 double height() const { return m_size.height(); } | 80 double height() const { return m_size.height(); } |
| 81 | 81 |
| 82 private: | 82 private: |
| 83 DoubleSize m_size; | 83 DoubleSize m_size; |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 CSSToLengthConversionData() {} | 86 CSSToLengthConversionData() : m_style(nullptr), m_zoom(1) {} |
| 87 CSSToLengthConversionData(const ComputedStyle*, | 87 CSSToLengthConversionData(const ComputedStyle*, |
| 88 const FontSizes&, | 88 const FontSizes&, |
| 89 const ViewportSize&, | 89 const ViewportSize&, |
| 90 float zoom); | 90 float zoom); |
| 91 CSSToLengthConversionData(const ComputedStyle* currStyle, | 91 CSSToLengthConversionData(const ComputedStyle* currStyle, |
| 92 const ComputedStyle* rootStyle, | 92 const ComputedStyle* rootStyle, |
| 93 const LayoutViewItem&, | 93 const LayoutViewItem&, |
| 94 float zoom); | 94 float zoom); |
| 95 | 95 |
| 96 float zoom() const { return m_zoom; } | 96 float zoom() const { return m_zoom; } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 122 private: | 122 private: |
| 123 const ComputedStyle* m_style; | 123 const ComputedStyle* m_style; |
| 124 FontSizes m_fontSizes; | 124 FontSizes m_fontSizes; |
| 125 ViewportSize m_viewportSize; | 125 ViewportSize m_viewportSize; |
| 126 float m_zoom; | 126 float m_zoom; |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 } // namespace blink | 129 } // namespace blink |
| 130 | 130 |
| 131 #endif | 131 #endif |
| OLD | NEW |