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

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

Issue 137123004: Fix treatment of non-autosizing containers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update TestExpectations 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 f7986cb62b174f940924c7dc02da326c1e5a1ebc..4f365dc69e4863706904ecc440f19bad961fc06e 100644
--- a/Source/core/rendering/FastTextAutosizer.h
+++ b/Source/core/rendering/FastTextAutosizer.h
@@ -66,12 +66,14 @@ public:
private:
struct Cluster {
- explicit Cluster(RenderBlock* root, float multiplier)
+ explicit Cluster(RenderBlock* root, bool autosize, float multiplier)
: m_root(root)
+ , m_autosize(autosize)
, m_multiplier(multiplier)
{
}
RenderBlock* m_root;
+ bool m_autosize;
float m_multiplier;
};
@@ -100,11 +102,10 @@ private:
void inflate(RenderBlock*);
bool enabled();
void prepareRenderViewInfo(RenderView*);
- bool shouldBeClusterRoot(RenderBlock*);
+ bool isFingerprintingCandidate(RenderBlock*);
bool clusterWantsAutosizing(RenderBlock*);
AtomicString computeFingerprint(RenderBlock*);
- Cluster* getOrCreateCluster(RenderBlock*);
- Cluster* createCluster(RenderBlock*);
+ Cluster* maybeGetOrCreateCluster(RenderBlock*);
Cluster* addSupercluster(AtomicString, RenderBlock*);
RenderBlock* deepestCommonAncestor(BlockSet&);
float computeMultiplier(RenderBlock*);
« 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