Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (135528 => 135529)
--- trunk/Source/WebCore/CMakeLists.txt 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-11-22 17:34:36 UTC (rev 135529)
@@ -1146,7 +1146,6 @@
dom/DocumentStyleSheetCollection.cpp
dom/DocumentType.cpp
dom/DynamicNodeList.cpp
- dom/EditingText.cpp
dom/Element.cpp
dom/ElementAttributeData.cpp
dom/ElementRareData.cpp
Modified: trunk/Source/WebCore/ChangeLog (135528 => 135529)
--- trunk/Source/WebCore/ChangeLog 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/ChangeLog 2012-11-22 17:34:36 UTC (rev 135529)
@@ -1,3 +1,50 @@
+2012-11-22 Antti Koivisto <[email protected]>
+
+ Merge EditingText into Text
+ https://bugs.webkit.org/show_bug.cgi?id=103060
+
+ Reviewed by Ryosuke Niwa.
+
+ Remove the EditingText class. Its only function beyond the regular Text is that it always creates a renderer.
+ It can be replaced with a bit.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/CDATASection.cpp:
+ (WebCore::CDATASection::CDATASection):
+ * dom/Document.cpp:
+ (WebCore::Document::createEditingTextNode):
+ * dom/Document.h:
+ (WebCore):
+ (Document):
+ * dom/EditingText.cpp: Removed.
+ * dom/EditingText.h: Removed.
+ * dom/Node.h:
+ (WebCore::Node::hasName):
+ (WebCore::Node::isEditingText):
+ (WebCore::Node::setHasName):
+
+ Use the same bit as hasName() which is Element specific.
+
+ * dom/Text.cpp:
+ (WebCore::Text::create):
+ (WebCore):
+ (WebCore::Text::createEditingText):
+ (WebCore::Text::rendererIsNeeded):
+ * dom/Text.h:
+ (Text):
+ (WebCore::Text::Text):
+ * editing/Editor.cpp:
+ * editing/InsertTextCommand.cpp:
+ * editing/ReplaceSelectionCommand.cpp:
+ * editing/htmlediting.cpp:
+ * editing/mac/EditorMac.mm:
+ * page/Frame.cpp:
+
2012-11-22 Eugene Klyuchnikov <[email protected]>
Web Inspector: Timeline: Disclosure arrows rendered underneath frame boundaries
Modified: trunk/Source/WebCore/GNUmakefile.list.am (135528 => 135529)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-11-22 17:34:36 UTC (rev 135529)
@@ -2774,8 +2774,6 @@
Source/WebCore/dom/DOMTimeStamp.h \
Source/WebCore/dom/DynamicNodeList.cpp \
Source/WebCore/dom/DynamicNodeList.h \
- Source/WebCore/dom/EditingText.cpp \
- Source/WebCore/dom/EditingText.h \
Source/WebCore/dom/Element.cpp \
Source/WebCore/dom/Element.h \
Source/WebCore/dom/ElementAttributeData.cpp \
Modified: trunk/Source/WebCore/Target.pri (135528 => 135529)
--- trunk/Source/WebCore/Target.pri 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/Target.pri 2012-11-22 17:34:36 UTC (rev 135529)
@@ -385,7 +385,6 @@
dom/DOMStringMap.cpp \
dom/DatasetDOMStringMap.cpp \
dom/DynamicNodeList.cpp \
- dom/EditingText.cpp \
dom/Element.cpp \
dom/ElementAttributeData.cpp \
dom/ElementRareData.cpp \
@@ -1564,7 +1563,6 @@
dom/DOMTimeStamp.h \
dom/DatasetDOMStringMap.h \
dom/DynamicNodeList.h \
- dom/EditingText.h \
dom/Element.h \
dom/ElementShadow.h \
dom/ElementAttributeData.h \
Modified: trunk/Source/WebCore/WebCore.gypi (135528 => 135529)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-22 17:34:36 UTC (rev 135529)
@@ -3841,8 +3841,6 @@
'dom/DocumentType.cpp',
'dom/DynamicNodeList.cpp',
'dom/DynamicNodeList.h',
- 'dom/EditingText.cpp',
- 'dom/EditingText.h',
'dom/ElementShadow.cpp',
'dom/Element.cpp',
'dom/ElementAttributeData.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (135528 => 135529)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-22 17:34:36 UTC (rev 135529)
@@ -51077,63 +51077,7 @@
RelativePath="..\dom\DynamicNodeList.h"
>
</File>
- <File
- RelativePath="..\dom\EditingText.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\dom\EditingText.h"
- >
- </File>
- <File
+ <File
RelativePath="..\dom\Element.cpp"
>
<FileConfiguration
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (135528 => 135529)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-22 17:34:36 UTC (rev 135529)
@@ -1770,8 +1770,6 @@
6550B6A0099DF0270090D781 /* CharacterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B696099DF0270090D781 /* CharacterData.h */; settings = {ATTRIBUTES = (Private, ); }; };
6550B6A1099DF0270090D781 /* Comment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6550B697099DF0270090D781 /* Comment.cpp */; };
6550B6A2099DF0270090D781 /* Comment.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B698099DF0270090D781 /* Comment.h */; };
- 6550B6A3099DF0270090D781 /* EditingText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6550B699099DF0270090D781 /* EditingText.cpp */; };
- 6550B6A4099DF0270090D781 /* EditingText.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B69A099DF0270090D781 /* EditingText.h */; };
6550B6A5099DF0270090D781 /* Text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6550B69B099DF0270090D781 /* Text.cpp */; };
6550B6A6099DF0270090D781 /* Text.h in Headers */ = {isa = PBXBuildFile; fileRef = 6550B69C099DF0270090D781 /* Text.h */; settings = {ATTRIBUTES = (Private, ); }; };
65653F2D0D9727D200CA9723 /* SVGAltGlyphElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65653F2A0D9727D200CA9723 /* SVGAltGlyphElement.cpp */; };
@@ -9018,8 +9016,6 @@
6550B696099DF0270090D781 /* CharacterData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CharacterData.h; sourceTree = "<group>"; };
6550B697099DF0270090D781 /* Comment.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Comment.cpp; sourceTree = "<group>"; };
6550B698099DF0270090D781 /* Comment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Comment.h; sourceTree = "<group>"; };
- 6550B699099DF0270090D781 /* EditingText.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = EditingText.cpp; sourceTree = "<group>"; };
- 6550B69A099DF0270090D781 /* EditingText.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditingText.h; sourceTree = "<group>"; };
6550B69B099DF0270090D781 /* Text.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Text.cpp; sourceTree = "<group>"; };
6550B69C099DF0270090D781 /* Text.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Text.h; sourceTree = "<group>"; };
65653F2A0D9727D200CA9723 /* SVGAltGlyphElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAltGlyphElement.cpp; sourceTree = "<group>"; };
@@ -21891,8 +21887,6 @@
05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */,
BC7FA61E0D1F0CBD00DB22A9 /* DynamicNodeList.cpp */,
BC7FA61F0D1F0CBD00DB22A9 /* DynamicNodeList.h */,
- 6550B699099DF0270090D781 /* EditingText.cpp */,
- 6550B69A099DF0270090D781 /* EditingText.h */,
A8C4A7F609D563270003AC8D /* Element.cpp */,
A8C4A7F509D563270003AC8D /* Element.h */,
93EEC1EA09C2877700C515D1 /* Element.idl */,
@@ -23541,7 +23535,6 @@
4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */,
3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */,
9BAB6C6C12550631001626D4 /* EditingStyle.h in Headers */,
- 6550B6A4099DF0270090D781 /* EditingText.h in Headers */,
4B3043CD0AE0373B00A82647 /* Editor.h in Headers */,
1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */,
4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */,
@@ -26805,7 +26798,6 @@
FD6ED2C3136B8E42003CF072 /* DynamicsCompressorNode.cpp in Sources */,
93309DE3099E64920056E581 /* EditCommand.cpp in Sources */,
9BAB6C6D12550631001626D4 /* EditingStyle.cpp in Sources */,
- 6550B6A3099DF0270090D781 /* EditingText.cpp in Sources */,
4B3043CC0AE0373B00A82647 /* Editor.cpp in Sources */,
93A38B4B0D0E5808006872C2 /* EditorCommand.cpp in Sources */,
ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */,
Modified: trunk/Source/WebCore/dom/CDATASection.cpp (135528 => 135529)
--- trunk/Source/WebCore/dom/CDATASection.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/CDATASection.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -27,7 +27,7 @@
namespace WebCore {
inline CDATASection::CDATASection(Document* document, const String& data)
- : Text(document, data)
+ : Text(document, data, CreateText)
{
}
Modified: trunk/Source/WebCore/dom/CharacterData.h (135528 => 135529)
--- trunk/Source/WebCore/dom/CharacterData.h 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/CharacterData.h 2012-11-22 17:34:36 UTC (rev 135529)
@@ -54,7 +54,7 @@
: Node(document, type)
, m_data(!text.isNull() ? text : emptyString())
{
- ASSERT(type == CreateOther || type == CreateText);
+ ASSERT(type == CreateOther || type == CreateText || type == CreateEditingText);
}
virtual bool rendererIsNeeded(const NodeRenderingContext&);
Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (135528 => 135529)
--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -68,7 +68,6 @@
#include "DocumentParser.cpp"
#include "DocumentType.cpp"
#include "DynamicNodeList.cpp"
-#include "EditingText.cpp"
#include "Element.cpp"
#include "ElementAttributeData.cpp"
#include "ElementShadow.cpp"
Modified: trunk/Source/WebCore/dom/Document.cpp (135528 => 135529)
--- trunk/Source/WebCore/dom/Document.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -57,7 +57,6 @@
#include "DocumentMarkerController.h"
#include "DocumentStyleSheetCollection.h"
#include "DocumentType.h"
-#include "EditingText.h"
#include "Editor.h"
#include "Element.h"
#include "ElementShadow.h"
@@ -918,9 +917,9 @@
return EntityReference::create(this, name);
}
-PassRefPtr<EditingText> Document::createEditingTextNode(const String& text)
+PassRefPtr<Text> Document::createEditingTextNode(const String& text)
{
- return EditingText::create(this, text);
+ return Text::createEditingText(this, text);
}
PassRefPtr<CSSStyleDeclaration> Document::createCSSStyleDeclaration()
Modified: trunk/Source/WebCore/dom/Document.h (135528 => 135529)
--- trunk/Source/WebCore/dom/Document.h 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/Document.h 2012-11-22 17:34:36 UTC (rev 135529)
@@ -81,7 +81,6 @@
class DocumentType;
class DocumentWeakReference;
class DynamicNodeListCacheBase;
-class EditingText;
class Element;
class ElementAttributeData;
class EntityReference;
@@ -525,7 +524,7 @@
// Special support for editing
PassRefPtr<CSSStyleDeclaration> createCSSStyleDeclaration();
- PassRefPtr<EditingText> createEditingTextNode(const String&);
+ PassRefPtr<Text> createEditingTextNode(const String&);
void recalcStyle(StyleChange = NoChange);
bool childNeedsAndNotInStyleRecalc();
Deleted: trunk/Source/WebCore/dom/EditingText.cpp (135528 => 135529)
--- trunk/Source/WebCore/dom/EditingText.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/EditingText.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2003, 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 "EditingText.h"
-
-#include "Document.h"
-
-// FIXME: Does this really require a class? Perhaps instead any text node
-// inside an editable element could have the "always create a renderer" behavior.
-
-namespace WebCore {
-
-inline EditingText::EditingText(Document* document, const String& data)
- : Text(document, data)
-{
-}
-
-PassRefPtr<EditingText> EditingText::create(Document* document, const String& data)
-{
- return adoptRef(new EditingText(document, data));
-}
-
-bool EditingText::rendererIsNeeded(const NodeRenderingContext&)
-{
- return true;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/dom/EditingText.h (135528 => 135529)
--- trunk/Source/WebCore/dom/EditingText.h 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/EditingText.h 2012-11-22 17:34:36 UTC (rev 135529)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2003, 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.
- *
- */
-
-#ifndef EditingText_h
-#define EditingText_h
-
-#include "Text.h"
-
-namespace WebCore {
-
-class EditingText : public Text {
-public:
- static PassRefPtr<EditingText> create(Document*, const String&);
-
-private:
- virtual bool rendererIsNeeded(const NodeRenderingContext&);
-
- EditingText(Document*, const String&);
-};
-
-} // namespace WebCore
-
-#endif // EditingText_h
Modified: trunk/Source/WebCore/dom/Node.h (135528 => 135529)
--- trunk/Source/WebCore/dom/Node.h 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/Node.h 2012-11-22 17:34:36 UTC (rev 135529)
@@ -317,7 +317,7 @@
virtual void notifyLoadedSheetAndAllCriticalSubresources(bool /* error loading subresource */) { }
virtual void startLoadingDynamicSheet() { ASSERT_NOT_REACHED(); }
- bool hasName() const { return getFlag(HasNameFlag); }
+ bool hasName() const { return !isTextNode() && getFlag(HasNameOrIsEditingTextFlag); }
bool hasID() const;
bool hasClass() const;
@@ -331,8 +331,9 @@
StyleChangeType styleChangeType() const { return static_cast<StyleChangeType>(m_nodeFlags & StyleChangeMask); }
bool childNeedsStyleRecalc() const { return getFlag(ChildNeedsStyleRecalcFlag); }
bool isLink() const { return getFlag(IsLinkFlag); }
+ bool isEditingText() const { return isTextNode() && getFlag(HasNameOrIsEditingTextFlag); }
- void setHasName(bool f) { setFlag(f, HasNameFlag); }
+ void setHasName(bool f) { ASSERT(!isTextNode()); setFlag(f, HasNameOrIsEditingTextFlag); }
void setChildNeedsStyleRecalc() { setFlag(ChildNeedsStyleRecalcFlag); }
void clearChildNeedsStyleRecalc() { clearFlag(ChildNeedsStyleRecalcFlag); }
@@ -717,7 +718,7 @@
SelfOrAncestorHasDirAutoFlag = 1 << 21,
- HasNameFlag = 1 << 22,
+ HasNameOrIsEditingTextFlag = 1 << 22,
InNamedFlowFlag = 1 << 23,
HasSyntheticAttrChildNodesFlag = 1 << 24,
@@ -753,7 +754,8 @@
CreateFrameOwnerElement = CreateHTMLElement | HasCustomCallbacksFlag,
CreateSVGElement = CreateStyledElement | IsSVGFlag,
CreateDocument = CreateContainer | InDocumentFlag,
- CreateInsertionPoint = CreateHTMLElement | IsInsertionPointFlag
+ CreateInsertionPoint = CreateHTMLElement | IsInsertionPointFlag,
+ CreateEditingText = CreateText | HasNameOrIsEditingTextFlag,
};
Node(Document*, ConstructionType);
Modified: trunk/Source/WebCore/dom/Text.cpp (135528 => 135529)
--- trunk/Source/WebCore/dom/Text.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/Text.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -42,9 +42,14 @@
PassRefPtr<Text> Text::create(Document* document, const String& data)
{
- return adoptRef(new Text(document, data));
+ return adoptRef(new Text(document, data, CreateText));
}
+PassRefPtr<Text> Text::createEditingText(Document* document, const String& data)
+{
+ return adoptRef(new Text(document, data, CreateEditingText));
+}
+
PassRefPtr<Text> Text::splitText(unsigned offset, ExceptionCode& ec)
{
ec = 0;
@@ -192,6 +197,8 @@
bool Text::rendererIsNeeded(const NodeRenderingContext& context)
{
+ if (isEditingText())
+ return true;
if (!CharacterData::rendererIsNeeded(context))
return false;
Modified: trunk/Source/WebCore/dom/Text.h (135528 => 135529)
--- trunk/Source/WebCore/dom/Text.h 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/dom/Text.h 2012-11-22 17:34:36 UTC (rev 135529)
@@ -33,6 +33,7 @@
static PassRefPtr<Text> create(Document*, const String&);
static PassRefPtr<Text> createWithLengthLimit(Document*, const String&, unsigned positionInString, unsigned lengthLimit = defaultLengthLimit);
+ static PassRefPtr<Text> createEditingText(Document*, const String&);
PassRefPtr<Text> splitText(unsigned offset, ExceptionCode&);
@@ -48,8 +49,8 @@
virtual bool canContainRangeEndPoint() const { return true; }
protected:
- Text(Document* document, const String& data)
- : CharacterData(document, data, CreateText)
+ Text(Document* document, const String& data, ConstructionType type)
+ : CharacterData(document, data, type)
{
}
Modified: trunk/Source/WebCore/editing/Editor.cpp (135528 => 135529)
--- trunk/Source/WebCore/editing/Editor.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/editing/Editor.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -43,7 +43,6 @@
#include "DictationCommand.h"
#include "DocumentFragment.h"
#include "DocumentMarkerController.h"
-#include "EditingText.h"
#include "EditorClient.h"
#include "EventHandler.h"
#include "EventNames.h"
Modified: trunk/Source/WebCore/editing/InsertTextCommand.cpp (135528 => 135529)
--- trunk/Source/WebCore/editing/InsertTextCommand.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/editing/InsertTextCommand.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -28,10 +28,10 @@
#include "Document.h"
#include "Element.h"
-#include "EditingText.h"
#include "Editor.h"
#include "Frame.h"
#include "HTMLInterchange.h"
+#include "Text.h"
#include "htmlediting.h"
#include "visible_units.h"
#include <wtf/unicode/CharacterNames.h>
Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (135528 => 135529)
--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -35,7 +35,6 @@
#include "CSSValueKeywords.h"
#include "Document.h"
#include "DocumentFragment.h"
-#include "EditingText.h"
#include "Element.h"
#include "EventNames.h"
#include "Frame.h"
@@ -52,6 +51,7 @@
#include "SimplifyMarkupCommand.h"
#include "SmartReplace.h"
#include "StylePropertySet.h"
+#include "Text.h"
#include "TextIterator.h"
#include "htmlediting.h"
#include "markup.h"
Modified: trunk/Source/WebCore/editing/htmlediting.cpp (135528 => 135529)
--- trunk/Source/WebCore/editing/htmlediting.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -28,7 +28,6 @@
#include "AXObjectCache.h"
#include "Document.h"
-#include "EditingText.h"
#include "Editor.h"
#include "Frame.h"
#include "HTMLBRElement.h"
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (135528 => 135529)
--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2012-11-22 17:34:36 UTC (rev 135529)
@@ -31,7 +31,6 @@
#import "CachedResourceLoader.h"
#import "DocumentFragment.h"
#import "DOMRangeInternal.h"
-#import "EditingText.h"
#import "Editor.h"
#import "EditorClient.h"
#import "Font.h"
@@ -47,6 +46,7 @@
#import "RenderBlock.h"
#import "RuntimeApplicationChecks.h"
#import "Sound.h"
+#import "Text.h"
#import "TypingCommand.h"
#import "htmlediting.h"
#import "WebNSAttributedStringExtras.h"
Modified: trunk/Source/WebCore/page/Frame.cpp (135528 => 135529)
--- trunk/Source/WebCore/page/Frame.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/page/Frame.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -40,7 +40,6 @@
#include "DOMWindow.h"
#include "CachedResourceLoader.h"
#include "DocumentType.h"
-#include "EditingText.h"
#include "EditorClient.h"
#include "EventNames.h"
#include "FloatQuad.h"
Modified: trunk/Source/WebCore/svg/SVGTRefElement.cpp (135528 => 135529)
--- trunk/Source/WebCore/svg/SVGTRefElement.cpp 2012-11-22 17:30:59 UTC (rev 135528)
+++ trunk/Source/WebCore/svg/SVGTRefElement.cpp 2012-11-22 17:34:36 UTC (rev 135529)
@@ -138,7 +138,7 @@
}
private:
SVGShadowText(Document* document, const String& data)
- : Text(document, data)
+ : Text(document, data, CreateText)
{
setHasCustomCallbacks();
}
