Upstream version 9.38.198.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 c90dd59..b320bb3 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderButton.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderButton.h
@@ -24,9 +24,7 @@
 #include "core/html/HTMLInputElement.h"
 #include "core/rendering/RenderFlexibleBox.h"
 
-namespace WebCore {
-
-class RenderTextFragment;
+namespace blink {
 
 // RenderButtons are just like normal flexboxes except that they will generate an anonymous block child.
 // For inputs, they will also generate an anonymous RenderText and keep its style and content up
@@ -39,7 +37,7 @@ public:
     virtual const char* renderName() const OVERRIDE { return "RenderButton"; }
     virtual bool isRenderButton() const OVERRIDE { return true; }
 
-    virtual bool canBeSelectionLeaf() const OVERRIDE { return node() && node()->rendererIsEditable(); }
+    virtual bool canBeSelectionLeaf() const OVERRIDE { return node() && node()->hasEditableStyle(); }
     virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return true; }
 
     virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) OVERRIDE;
@@ -59,7 +57,7 @@ public:
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode) const OVERRIDE;
 
 private:
-    virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE;
+    virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
     virtual bool hasLineIfEmpty() const OVERRIDE { return isHTMLInputElement(node()); }
@@ -69,6 +67,6 @@ private:
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderButton, isRenderButton());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderButton_h