| Index: third_party/WebKit/Source/core/css/CSSToLengthConversionData.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.h b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.h
|
| index 8e6ad9653ec4a383c7a7722a38ad55af7220cebb..8349423674731ad0798fa8f51ca9b3342f01278e 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.h
|
| @@ -42,7 +42,7 @@
|
| namespace blink {
|
|
|
| class ComputedStyle;
|
| -class LayoutView;
|
| +class LayoutViewItem;
|
| class Font;
|
|
|
| class CORE_EXPORT CSSToLengthConversionData {
|
| @@ -71,7 +71,7 @@ public:
|
| public:
|
| ViewportSize() { }
|
| ViewportSize(double width, double height) : m_size(width, height) { }
|
| - explicit ViewportSize(const LayoutView*);
|
| + explicit ViewportSize(const LayoutViewItem&);
|
|
|
| double width() const { return m_size.width(); }
|
| double height() const { return m_size.height(); }
|
| @@ -81,7 +81,7 @@ public:
|
|
|
| CSSToLengthConversionData() { }
|
| CSSToLengthConversionData(const ComputedStyle*, const FontSizes&, const ViewportSize&, float zoom);
|
| - CSSToLengthConversionData(const ComputedStyle* currStyle, const ComputedStyle* rootStyle, const LayoutView*, float zoom);
|
| + CSSToLengthConversionData(const ComputedStyle* currStyle, const ComputedStyle* rootStyle, const LayoutViewItem&, float zoom);
|
|
|
| float zoom() const { return m_zoom; }
|
|
|
|
|