Index: Source/core/dom/Document.h |
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h |
index 2b9bd5f6f648136d2724469e17352e5caf6e15d1..51123684f699c4fc5efcf42a04d0c03c18edeb28 100644 |
--- a/Source/core/dom/Document.h |
+++ b/Source/core/dom/Document.h |
@@ -474,7 +474,7 @@ public: |
void setupFontBuilder(RenderStyle* documentStyle); |
- void updateStyleIfNeeded(); |
+ void updateStyleIfNeeded() { updateRenderTree(NoChange); } |
void updateStyleForNodeIfNeeded(Node*); |
ojan
2014/03/25 23:39:11
Shouldn't these two also be renamed?
esprehn
2014/03/25 23:51:14
Sure, I didn't want to touch so many files, but I
|
void updateLayout(); |
enum RunPostLayoutTasks { |
@@ -605,7 +605,7 @@ public: |
void setHistoryItemDocumentStateDirty(bool dirty) { m_historyItemDocumentStateDirty = dirty; } |
bool historyItemDocumentStateDirty() const { return m_historyItemDocumentStateDirty; } |
- bool shouldScheduleLayout(); |
+ bool shouldScheduleLayout() const; |
bool shouldParserYieldAgressivelyBeforeScriptExecution(); |
int elapsedTime() const; |
@@ -646,7 +646,7 @@ public: |
void setCSSTarget(Element*); |
Element* cssTarget() const { return m_cssTarget; } |
- void scheduleStyleRecalc(); |
+ void scheduleRenderTreeUpdate(); |
bool hasPendingForcedStyleRecalc() const; |
void registerNodeList(LiveNodeListBase*); |
@@ -1085,7 +1085,9 @@ private: |
bool dirtyElementsForLayerUpdate(); |
void updateDistributionIfNeeded(); |
void updateUseShadowTreesIfNeeded(); |
+ void evaluateMediaQueryListIfNeeded(); |
+ void updateRenderTree(StyleRecalcChange); |
void updateStyle(StyleRecalcChange); |
ojan
2014/03/25 23:39:11
Can this be private now?
esprehn
2014/03/25 23:51:14
It is private, this whole block is.
|
void detachParser(); |
@@ -1150,9 +1152,8 @@ private: |
void didRemoveTouchEventHandler(Node*, bool clearAll); |
- // Returns true if Document::recalcStyle() needs to be run. |
- bool shouldCallRecalcStyleForDocument(); |
- bool shouldScheduleStyleRecalc(); |
+ bool needsRenderTreeUpdate() const; |
+ bool shouldScheduleRenderTreeUpdate() const; |
DocumentLifecycle m_lifecycle; |