Remove NonSelectableText subclass of Text

Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/dom/Text.h"
 
+#include "HTMLNames.h"
 #include "SVGNames.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExceptionCodePlaceholder.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/NodeRenderingContext.h"
 #include "core/dom/ScopedEventQueue.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/rendering/RenderCombineText.h"
 #include "core/rendering/RenderText.h"
+#include "core/rendering/RenderTextFragment.h"
 #include "core/rendering/svg/RenderSVGInlineText.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 
 using namespace std;
 
 namespace WebCore {
 
+using namespace HTMLNames;
+
 PassRefPtr<Text> Text::create(Document* document, const String& data)
 {
     return adoptRef(new Text(document, data, CreateText));
 }
 
 PassRefPtr<Text> Text::createEditingText(Document* document, const String& data)
 {
     return adoptRef(new Text(document, data, CreateEditingText));
 }
 
@@ skipping 196 matching lines @@
 {
     Node* parentOrShadowHostNode = text->parentOrShadowHostNode();
     return parentOrShadowHostNode->isSVGElement() && !parentOrShadowHostNode->hasTagName(SVGNames::foreignObjectTag);
 }
 
 void Text::createTextRendererIfNeeded()
 {
     NodeRenderingContext(this).createRendererForTextIfNeeded();
 }
 
-RenderText* Text::createTextRenderer(RenderStyle* style)
+RenderText* Text::createTextRenderer(ContainerNode* renderingParent, RenderStyle* style)
 {
     if (isSVGText(this) || isSVGShadowText(this))
         return new (document()->renderArena()) RenderSVGInlineText(this, dataImpl());
 
     if (style->hasTextCombine())
         return new (document()->renderArena()) RenderCombineText(this, dataImpl());
 
+    // button input types (submit, button, reset) have special selection behavior
+    // provided by RenderTextFragment's implementation of canBeSelectionLeaf()
+    // that makes it only selectable if the button is inside an editable region.
+    //
+    // FIXME: We should probably add a new css property like -webkit-user-select: editable
+    // that makes text selectable only if contenteditable is used around it and remove
+    // this special case.
+    if (renderingParent->hasTagName(inputTag) && renderingParent->renderer()->isRenderButton())
+        return new (document()->renderArena()) RenderTextFragment(this, dataImpl());
+
     return new (document()->renderArena()) RenderText(this, dataImpl());
 }
 
 void Text::attach(const AttachContext& context)
 {
     createTextRendererIfNeeded();
     CharacterData::attach(context);
 }
 
 bool Text::recalcTextStyle(StyleChange change)
@@ skipping 70 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace WebCore