| Index: third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.h b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| index a99f0751e458c9b1f9e0a6906fdba4f7affac00c..15e61dfd90c2466091900b3cc612336209f12e3a 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| @@ -73,9 +73,7 @@ public:
|
| class LayoutScope {
|
| STACK_ALLOCATED();
|
| public:
|
| - // TODO(kojii): SubtreeLayoutScope should not be optional once all
|
| - // callers are fixed.
|
| - explicit LayoutScope(LayoutBlock*, SubtreeLayoutScope* = nullptr);
|
| + explicit LayoutScope(LayoutBlock*, SubtreeLayoutScope*);
|
| ~LayoutScope();
|
| protected:
|
| Member<TextAutosizer> m_textAutosizer;
|
| @@ -85,7 +83,7 @@ public:
|
| class TableLayoutScope : LayoutScope {
|
| STACK_ALLOCATED();
|
| public:
|
| - explicit TableLayoutScope(LayoutTable*);
|
| + explicit TableLayoutScope(LayoutTable*, SubtreeLayoutScope*);
|
| };
|
|
|
| class CORE_EXPORT DeferUpdatePageInfo {
|
| @@ -266,7 +264,7 @@ private:
|
|
|
| void beginLayout(LayoutBlock*, SubtreeLayoutScope*);
|
| void endLayout(LayoutBlock*);
|
| - void inflateAutoTable(LayoutTable*);
|
| + void inflateAutoTable(LayoutTable*, SubtreeLayoutScope*);
|
| float inflate(LayoutObject*, SubtreeLayoutScope*, InflateBehavior = ThisBlockOnly, float multiplier = 0);
|
| bool shouldHandleLayout() const;
|
| IntSize windowSize() const;
|
|
|