Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1624)

Unified Diff: Source/core/rendering/FastTextAutosizer.h

Issue 135733002: [FastTextAutosizer] Incorporate accessibility and device scale factors (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update after reviewer comments Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/FastTextAutosizer.h
diff --git a/Source/core/rendering/FastTextAutosizer.h b/Source/core/rendering/FastTextAutosizer.h
index d502164cd447fb6a33bab6ef4b883755182ce9d0..120d53ca1c0e80e1ddb4411efd7445f46fa4ac70 100644
--- a/Source/core/rendering/FastTextAutosizer.h
+++ b/Source/core/rendering/FastTextAutosizer.h
@@ -99,7 +99,7 @@ private:
explicit FastTextAutosizer(Document*);
bool enabled();
- void prepareWindowInfo(RenderView*);
+ void prepareRenderViewInfo(RenderView*);
bool shouldBeClusterRoot(RenderBlock*);
bool clusterWantsAutosizing(RenderBlock*);
AtomicString computeFingerprint(RenderBlock*);
@@ -113,6 +113,10 @@ private:
Document* m_document;
int m_windowWidth; // Frame 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.
+#ifndef NDEBUG
+ bool m_renderViewInfoPrepared; // Used for assertions.
+#endif
// Clusters are created and destroyed during layout. The map key is the
// cluster root. Clusters whose roots share the same fingerprint use the
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698