| Index: Source/core/rendering/RenderBlock.h
|
| diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
|
| index cbdd9f3852d30c21718c9931c959db0ed9f8bbc7..de6b5a457f59871a2686b5108367b1ae5b256dfd 100644
|
| --- a/Source/core/rendering/RenderBlock.h
|
| +++ b/Source/core/rendering/RenderBlock.h
|
| @@ -209,8 +209,6 @@ public:
|
| ColumnInfo* columnInfo() const;
|
| int columnGap() const;
|
|
|
| - void updateColumnInfoFromStyle(RenderStyle*);
|
| -
|
| // These two functions take the ColumnInfo* to avoid repeated lookups of the info in the global HashMap.
|
| unsigned columnCount(ColumnInfo*) const;
|
| LayoutRect columnRectAt(ColumnInfo*, unsigned) const;
|
| @@ -567,7 +565,7 @@ protected:
|
|
|
| bool logicalWidthChangedInRegions(RenderFlowThread*) const;
|
|
|
| - virtual bool requiresColumns(int desiredColumnCount) const;
|
| + bool requiresColumns(int desiredColumnCount) const;
|
|
|
| virtual bool updateLogicalWidthAndColumnWidth();
|
|
|
|
|