Index: Source/core/rendering/FastTextAutosizer.cpp |
diff --git a/Source/core/rendering/FastTextAutosizer.cpp b/Source/core/rendering/FastTextAutosizer.cpp |
index 58c860cfccbaada09658da31a96483203f7d201e..6a327d7e5b4a35c1671bf7c24f3b9e7d95cb1c12 100644 |
--- a/Source/core/rendering/FastTextAutosizer.cpp |
+++ b/Source/core/rendering/FastTextAutosizer.cpp |
@@ -45,6 +45,8 @@ using namespace std; |
namespace WebCore { |
+using namespace HTMLNames; |
+ |
FastTextAutosizer::FastTextAutosizer(const Document* document) |
: m_document(document) |
#ifndef NDEBUG |
@@ -97,6 +99,19 @@ void FastTextAutosizer::beginLayout(RenderBlock* block) |
inflate(block); |
} |
+void FastTextAutosizer::inflateListItem(RenderBlock* listItem, RenderObject* listItemMarker) |
+{ |
+#ifndef NDEBUG |
pdr.
2014/01/25 03:50:23
These ifndef's aren't needed because the asserts w
skobes
2014/01/28 03:10:30
Done.
|
+ ASSERT(listItem->isListItem()); |
+ ASSERT(listItemMarker->isListMarker()); |
+#endif |
+ if (!enabled()) |
+ return; |
+ |
+ applyMultiplier(listItem, activeMultiplier()); |
pdr.
2014/01/25 03:50:23
I'm not sure we can call activeMultiplier() here.
skobes
2014/01/28 03:10:30
Fixed.
|
+ applyMultiplier(listItemMarker, activeMultiplier()); |
+} |
+ |
void FastTextAutosizer::endLayout(RenderBlock* block) |
{ |
if (!enabled()) |
@@ -110,6 +125,14 @@ void FastTextAutosizer::endLayout(RenderBlock* block) |
m_clusterStack.removeLast(); |
} |
+float FastTextAutosizer::activeMultiplier() |
+{ |
+ Cluster* cluster = currentCluster(); |
+ if (!cluster) |
+ return 1.0f; |
+ return cluster->m_autosize ? cluster->m_multiplier : 1.0f; |
pdr.
2014/01/25 03:50:23
We should add an assert that the multiplier has be
skobes
2014/01/28 03:10:30
Done.
|
+} |
+ |
void FastTextAutosizer::inflate(RenderBlock* block) |
{ |
Cluster* cluster = currentCluster(); |