| Index: third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h
|
| diff --git a/third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h b/third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h
|
| index 0dabd0f8a07769d640c6fc3715f070c0f1048347..7104d6daa23c45c9125d662b71d2cba831619383 100644
|
| --- a/third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h
|
| +++ b/third_party/WebKit/Source/core/frame/PageScaleConstraintsSet.h
|
| @@ -85,9 +85,7 @@ public:
|
| // This is set when one of the inputs to finalConstraints changes.
|
| bool constraintsDirty() const { return m_constraintsDirty; }
|
|
|
| - void didChangeViewSize(const IntSize&);
|
| -
|
| - IntSize mainFrameSize() const;
|
| + void didChangeInitialContainingBlockSize(const IntSize&);
|
|
|
| IntSize layoutSize() const;
|
|
|
| @@ -103,7 +101,7 @@ private:
|
| PageScaleConstraints m_finalConstraints;
|
|
|
| int m_lastContentsWidth;
|
| - IntSize m_viewSize;
|
| + IntSize m_icbSize;
|
|
|
| bool m_needsReset;
|
| bool m_constraintsDirty;
|
|
|