Index: Source/core/rendering/FastTextAutosizer.h |
diff --git a/Source/core/rendering/FastTextAutosizer.h b/Source/core/rendering/FastTextAutosizer.h |
index 7419126c33f0f0887435aceb41112e40cf983388..ca8def549822c142d585e60e3b4bb3a191b6ca71 100644 |
--- a/Source/core/rendering/FastTextAutosizer.h |
+++ b/Source/core/rendering/FastTextAutosizer.h |
@@ -67,25 +67,8 @@ public: |
class LayoutScope { |
public: |
- explicit LayoutScope(Document& document, RenderBlock* block) |
- : m_block(0) |
- { |
- m_textAutosizer = document.fastTextAutosizer(); |
- if (m_textAutosizer) { |
- if (!m_textAutosizer->enabled()) { |
- m_textAutosizer = 0; |
- return; |
- } |
- m_block = block; |
- m_textAutosizer->beginLayout(m_block); |
- } |
- } |
- |
- ~LayoutScope() |
- { |
- if (m_textAutosizer) |
- m_textAutosizer->endLayout(m_block); |
- } |
+ explicit LayoutScope(RenderBlock*); |
+ ~LayoutScope(); |
private: |
FastTextAutosizer* m_textAutosizer; |
RenderBlock* m_block; |
@@ -197,7 +180,7 @@ private: |
void inflateTable(RenderTable*); |
void inflate(RenderBlock*); |
bool enabled(); |
- void prepareRenderViewInfo(); |
+ void updateRenderViewInfo(); |
void prepareClusterStack(const RenderObject*); |
bool isFingerprintingCandidate(const RenderBlock*); |
bool clusterHasEnoughTextToAutosize(Cluster*, const RenderBlock* widthProvider = 0); |
@@ -221,6 +204,7 @@ private: |
bool mightBeWiderOrNarrowerDescendant(const RenderBlock*); |
bool isWiderOrNarrowerDescendant(Cluster*); |
bool isLayoutRoot(const RenderBlock*) const; |
+ bool isInLayout() const; |
Cluster* currentCluster() const; |
@@ -237,6 +221,7 @@ private: |
int m_frameWidth; // LocalFrame width in density-independent pixels (DIPs). |
int m_layoutWidth; // Layout width in CSS pixels. |
float m_baseMultiplier; // Includes accessibility font scale factor and device scale adjustment. |
+ float m_maxMultiplier; // Maximum possible multiplier for the current base multiplier and layout/frame width. |
const RenderBlock* m_firstBlock; // First block to receive beginLayout. |
#ifndef NDEBUG |
bool m_renderViewInfoPrepared; |