X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Frendering%2FRenderButton.h;h=b320bb3770b2944dd56afb72c0e90f8b0ddeef1a;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=8aaed6266c947f3bf898371776e13ef70a16db18;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/rendering/RenderButton.h b/src/third_party/WebKit/Source/core/rendering/RenderButton.h index 8aaed62..b320bb3 100644 --- a/src/third_party/WebKit/Source/core/rendering/RenderButton.h +++ b/src/third_party/WebKit/Source/core/rendering/RenderButton.h @@ -24,7 +24,7 @@ #include "core/html/HTMLInputElement.h" #include "core/rendering/RenderFlexibleBox.h" -namespace WebCore { +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 @@ -37,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; @@ -67,6 +67,6 @@ private: DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderButton, isRenderButton()); -} // namespace WebCore +} // namespace blink #endif // RenderButton_h