Move viewport unit resolution to style recalc time

Source/core/css/CSSToLengthConversionData.cpp

Index: Source/core/css/CSSToLengthConversionData.cpp
diff --git a/Source/core/css/CSSToLengthConversionData.cpp b/Source/core/css/CSSToLengthConversionData.cpp
index 6085a69892b23d5ba62dfdfddae7ebc43e620229..66583963904254f4ca9df0d03dd9e102bba52212 100644
--- a/Source/core/css/CSSToLengthConversionData.cpp
+++ b/Source/core/css/CSSToLengthConversionData.cpp
@@ -31,10 +31,45 @@
 #include "config.h"
 #include "core/css/CSSToLengthConversionData.h"
 
+#include "core/rendering/RenderView.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace WebCore {
 
+CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, float zoom, bool computingFontSize)
+    : m_style(style)
+    , m_rootStyle(rootStyle)
+    , m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
+    , m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
+    , m_zoom(zoom)
+    , m_useEffectiveZoom(false)
+    , m_computingFontSize(computingFontSize)
+{
+    ASSERT(zoom > 0);
+}
+
+CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSize)
+    : m_style(style)
+    , m_rootStyle(rootStyle)
+    , m_viewportWidth(renderView ? renderView->layoutViewportWidth() : 0)
+    , m_viewportHeight(renderView ? renderView->layoutViewportHeight() : 0)
+    , m_useEffectiveZoom(true)
+    , m_computingFontSize(computingFontSize)
+{
+}
+
+CSSToLengthConversionData::CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingFontSize)
+    : m_style(style)
+    , m_rootStyle(rootStyle)
+    , m_viewportWidth(viewportWidth)
+    , m_viewportHeight(viewportHeight)
+    , m_zoom(zoom)
+    , m_useEffectiveZoom(false)
+    , m_computingFontSize(computingFontSize)
+{
+    ASSERT(zoom > 0);
+}
+
 float CSSToLengthConversionData::zoom() const
 {
     if (m_useEffectiveZoom)
@@ -42,4 +77,25 @@ float CSSToLengthConversionData::zoom() const
     return m_zoom;
 }
 
+double CSSToLengthConversionData::viewportWidthPercent() const
+{
+    m_style->setHasViewportUnits();

[kenneth.r.christiansen, 2014/01/02 09:03:26]

isn't there any way to assert to make sure this is true? Also if the style is
modified to not use viewport units anymore it will still be marked as such, no?

[Timothy Loh, 2014/01/03 00:23:09]

Not sure what your first question is. I don't think styles really get modified
after they're constructed during style resolution; we just create new ones. The
bool on Document doesn't currently get reset anywhere, but this probably isn't a
case to optimise right now.

+    return m_viewportWidth / 100;
+}
+double CSSToLengthConversionData::viewportHeightPercent() const
+{
+    m_style->setHasViewportUnits();
+    return m_viewportHeight / 100;
+}
+double CSSToLengthConversionData::viewportMinPercent() const
+{
+    m_style->setHasViewportUnits();
+    return std::min(m_viewportWidth, m_viewportHeight) / 100;
+}
+double CSSToLengthConversionData::viewportMaxPercent() const
+{
+    m_style->setHasViewportUnits();
+    return std::max(m_viewportWidth, m_viewportHeight) / 100;
+}
+
 } // namespace WebCore