| Index: Source/core/dom/Document.h
|
| diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
|
| index e822620b9d2901c53141f655b292b894d7493c4a..4fa870bdcf8ccd59138f293e85766194fe2c40c7 100644
|
| --- a/Source/core/dom/Document.h
|
| +++ b/Source/core/dom/Document.h
|
| @@ -473,7 +473,7 @@ public:
|
| // Special support for editing
|
| PassRefPtr<Text> createEditingTextNode(const String&);
|
|
|
| - void setStyleDependentState(RenderStyle* documentStyle);
|
| + void setupFontBuilder(RenderStyle* documentStyle);
|
|
|
| void updateStyleIfNeeded();
|
| void updateStyleForNodeIfNeeded(Node*);
|
| @@ -781,6 +781,12 @@ public:
|
|
|
| HTMLHeadElement* head();
|
|
|
| + // Decide which element is to define the viewport's overflow policy. If |rootStyle| is set, use
|
| + // that as the style for the root element, rather than obtaining it on our own. The reason for
|
| + // this is that style may not have been associated with the elements yet - in which case it may
|
| + // have been calculated on the fly (without associating it with the actual element) somewhere.
|
| + Element* viewportDefiningElement(RenderStyle* rootStyle = 0) const;
|
| +
|
| DocumentMarkerController* markers() const { return m_markers.get(); }
|
|
|
| bool directionSetOnDocumentElement() const { return m_directionSetOnDocumentElement; }
|
|
|