CSS Length calculation with MediaValues

Source/core/css/MediaValues.h

Index: Source/core/css/MediaValues.h
diff --git a/Source/core/css/MediaValues.h b/Source/core/css/MediaValues.h
index d399a76c6f548b3724de4ee10d609cbc3d8b255a..905327ef840f77ef0d4bb2b3cd0be4e9d1d86bf7 100644
--- a/Source/core/css/MediaValues.h
+++ b/Source/core/css/MediaValues.h
@@ -16,7 +16,7 @@ namespace WebCore {
 
 class Document;
 
-class MediaValues : public RefCounted<MediaValues> {
+class MediaValues : public RefCounted<MediaValues>, public CSSLengthData {
 public:
     enum MediaValuesMode { CachingMode,
         DynamicMode };
@@ -27,7 +27,7 @@ public:
         UnknownPointer };
 
 
-    static PassRefPtr<MediaValues> create(Document*, MediaValuesMode);
+    static PassRefPtr<MediaValues> create(const Document&, MediaValuesMode);
     static PassRefPtr<MediaValues> create(LocalFrame*, RenderStyle*, MediaValuesMode);
     static PassRefPtr<MediaValues> create(MediaValuesMode,
         int viewportWidth,
@@ -39,11 +39,16 @@ public:
         int monochromeBitsPerComponent,
         PointerDeviceType,
         int defaultFontSize,
+        int computedFontSize,
+        bool hasXHeight,
+        double xHeight,
+        double zeroWidth,
         bool threeDEnabled,
         bool scanMediaType,
         bool screenMediaType,
         bool printMediaType,
-        bool strictMode);
+        bool strictMode,
+        float effectiveZoom);
     PassRefPtr<MediaValues> copy() const;
     bool isSafeToSendToAnotherThread() const;
 
@@ -56,14 +61,32 @@ public:
     int monochromeBitsPerComponent() const;
     PointerDeviceType pointer() const;
     int defaultFontSize() const;
+    int computedFontSize() const;
     bool threeDEnabled() const;
     bool scanMediaType() const;
     bool screenMediaType() const;
     bool printMediaType() const;
     bool strictMode() const;
+    float effectiveZoom() const;
     RenderStyle* style() const { return m_style.get(); }
     Document* document() const;
 
+    virtual float zoom() const;
+    virtual bool computingFontSize() const;
+    virtual double fontSpecifiedSize() const;
+    virtual double fontComputedSize() const;
+    virtual double rootFontSpecifiedSize() const;
+    virtual double rootFontComputedSize() const;
+    virtual bool hasXHeight() const;
+    virtual double xHeight() const;
+    virtual double zeroWidth() const;
+    virtual bool hasRoot() const;
+
+    virtual double viewportWidthPercent() const;
+    virtual double viewportHeightPercent() const;
+    virtual double viewportMinPercent() const;
+    virtual double viewportMaxPercent() const;
+
 private:
     MediaValues(LocalFrame* frame, PassRefPtr<RenderStyle> style, MediaValuesMode mode)
         : m_style(style)
@@ -78,11 +101,16 @@ private:
         , m_monochromeBitsPerComponent(0)
         , m_pointer(UnknownPointer)
         , m_defaultFontSize(0)
+        , m_computedFontSize(0)
+        , m_hasXHeight(false)
+        , m_xHeight(0.0)
+        , m_zeroWidth(0.0)
         , m_threeDEnabled(false)
         , m_scanMediaType(false)
         , m_screenMediaType(false)
         , m_printMediaType(false)
         , m_strictMode(false)
+        , m_effectiveZoom(1.0)
     {
     }
 
@@ -100,11 +128,16 @@ private:
     int m_monochromeBitsPerComponent;
     PointerDeviceType m_pointer;
     int m_defaultFontSize;
+    int m_computedFontSize;
+    bool m_hasXHeight;
+    double m_xHeight;
+    double m_zeroWidth;
     bool m_threeDEnabled;
     bool m_scanMediaType;
     bool m_screenMediaType;
     bool m_printMediaType;
     bool m_strictMode;
+    float m_effectiveZoom;
 };
 
 } // namespace