Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderButton.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderButton.h b/src/third_party/WebKit/Source/core/rendering/RenderButton.h
index b320bb3..bfe7e28 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderButton.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderButton.h
@@ -45,8 +45,6 @@ public:
     virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { }
     virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
 
-    void setupInnerStyle(RenderStyle*);
-
     // <button> should allow whitespace even though RenderFlexibleBox doesn't.
     virtual bool canHaveWhitespaceChildren() const OVERRIDE { return true; }
 
@@ -57,8 +55,7 @@ public:
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const OVERRIDE;
 
 private:
-    virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+    virtual void updateAnonymousChildStyle(const RenderObject* child, RenderStyle* childStyle) const OVERRIDE;
 
     virtual bool hasLineIfEmpty() const OVERRIDE { return isHTMLInputElement(node()); }