Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / resolver / StyleAdjuster.h

diff --git a/src/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.h b/src/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.h
index 0118c0a..afc82db 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.h
+++ b/src/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.h
@@ -22,7 +22,9 @@
 #ifndef StyleAdjuster_h
 #define StyleAdjuster_h
 
-namespace WebCore {
+#include "platform/heap/Handle.h"
+
+namespace blink {
 
 class CachedUAStyle;
 class Element;
@@ -32,23 +34,23 @@ class RenderStyle;
 // and the web expects that we expose "adjusted" values when
 // for those property/element pairs.
 class StyleAdjuster {
+    STACK_ALLOCATED();
 public:
-    StyleAdjuster(const CachedUAStyle& cachedUAStyle, bool useQuirksModeStyles)
-        : m_cachedUAStyle(cachedUAStyle)
-        , m_useQuirksModeStyles(useQuirksModeStyles)
+    StyleAdjuster(bool useQuirksModeStyles)
+        : m_useQuirksModeStyles(useQuirksModeStyles)
     { }
 
-    void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*);
+    void adjustRenderStyle(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element*, const CachedUAStyle*);
 
 private:
     void adjustStyleForDisplay(RenderStyle* styleToAdjust, RenderStyle* parentStyle);
     void adjustStyleForTagName(RenderStyle* styleToAdjust, RenderStyle* parentStyle, Element&);
-    void adjustOverflow(RenderStyle* styleToAdjust, Element*);
+    void adjustOverflow(RenderStyle* styleToAdjust);
+    void adjustStyleForAlignment(RenderStyle& styleToAdjust, const RenderStyle& parentStyle);
 
-    const CachedUAStyle& m_cachedUAStyle;
     bool m_useQuirksModeStyles;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // StyleAdjuster_h