CSS Length calculation with MediaValues

Source/core/css/CSSToLengthConversionData.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #ifndef CSSToLengthConversionData_h
 #define CSSToLengthConversionData_h
 
 #include "wtf/Assertions.h"
 #include "wtf/Noncopyable.h"
 
 namespace WebCore {
 
 class RenderStyle;
 class RenderView;
+class MediaValues;
 
 class CSSToLengthConversionData {
 public:
     CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, const RenderView*, float zoom, bool computingFontSize = false);
     CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, const RenderView*, bool computingFontSize = false);
     CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* rootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingFontSize = false);
+    CSSToLengthConversionData(const MediaValues*, float zoom, bool computingFontSize = false);
 
     const RenderStyle& style() const { return *m_style; }
     const RenderStyle* rootStyle() const { return m_rootStyle; }
     float zoom() const;
-    bool computingFontSize() const { return m_computingFontSize; }
+    bool computingFontSize() const;
+    double fontSpecifiedSize() const;
+    double fontComputedSize() const;
+    double rootFontSpecifiedSize() const;
+    double rootFontComputedSize() const;
+    bool hasXHeight() const;
+    double xHeight() const;
+    double zeroWidth() const;
+    bool hasRoot() const { return !!m_rootStyle; }
 
     // Accessing these marks the style as having viewport units
     double viewportWidthPercent() const;
     double viewportHeightPercent() const;
     double viewportMinPercent() const;
     double viewportMaxPercent() const;
 
     void setStyle(const RenderStyle* style) { m_style = style; }
     void setRootStyle(const RenderStyle* rootStyle) { m_rootStyle = rootStyle; }
 
     CSSToLengthConversionData copyWithAdjustedZoom(float newZoom) const
     {
         return CSSToLengthConversionData(m_style, m_rootStyle, m_viewportWidth, m_viewportHeight, newZoom, m_computingFontSize);
     }
 
 private:
     const RenderStyle* m_style;
     const RenderStyle* m_rootStyle;
+    const MediaValues* m_mediaValues; // Can't be a RefPtr since it would create a dependency cycle.

[eseidel, 2014/04/08 16:51:28]

Could you elaborate more on the cycle?

[esprehn, 2014/04/08 17:40:39]

CSSLengthToConversionData should only be created on the stack, there should be
no cycles.

     float m_viewportWidth;
     float m_viewportHeight;
     float m_zoom;
     bool m_useEffectiveZoom;
     bool m_computingFontSize;
 };
 
 } // namespace WebCore
 
 #endif