Diff
Modified: trunk/Source/WTF/ChangeLog (163288 => 163289)
--- trunk/Source/WTF/ChangeLog 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WTF/ChangeLog 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1,3 +1,17 @@
+2014-02-02 Darin Adler <[email protected]>
+
+ Obey "delete this" comments, including deleting String::characters and friends
+ https://bugs.webkit.org/show_bug.cgi?id=126865
+
+ Reviewed by Andreas Kling.
+
+ * wtf/text/AtomicString.h: Deleted the characters function.
+ * wtf/text/StringBuilder.h: Deleted the characters function, leaving behind the
+ deprecatedCharacters function.
+ * wtf/text/StringImpl.h: Ditto.
+ * wtf/text/WTFString.h: Ditto. Also added a constructor that takes a StringImpl&,
+ helpful for later string refactoring.
+
2014-02-02 Dan Bernstein <[email protected]>
Stop using PLATFORM(MAC) in WTF except where it means “OS X but not iOS”
Modified: trunk/Source/WTF/wtf/text/AtomicString.h (163288 => 163289)
--- trunk/Source/WTF/wtf/text/AtomicString.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -93,7 +93,6 @@
AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl *>(m_string.impl()); }
bool is8Bit() const { return m_string.is8Bit(); }
- const UChar* characters() const { return m_string.deprecatedCharacters(); } // FIXME: Delete this.
const LChar* characters8() const { return m_string.characters8(); }
const UChar* characters16() const { return m_string.characters16(); }
unsigned length() const { return m_string.length(); }
Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (163288 => 163289)
--- trunk/Source/WTF/wtf/text/StringBuilder.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -248,7 +248,6 @@
return m_buffer->characters16();
}
- const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
const UChar* deprecatedCharacters() const
{
if (!m_length)
Modified: trunk/Source/WTF/wtf/text/StringImpl.h (163288 => 163289)
--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -452,7 +452,6 @@
ALWAYS_INLINE const LChar* characters8() const { ASSERT(is8Bit()); return m_data8; }
ALWAYS_INLINE const UChar* characters16() const { ASSERT(!is8Bit()); return m_data16; }
- const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
ALWAYS_INLINE const UChar* deprecatedCharacters() const
{
if (!is8Bit())
Modified: trunk/Source/WTF/wtf/text/WTFString.h (163288 => 163289)
--- trunk/Source/WTF/wtf/text/WTFString.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -112,6 +112,7 @@
WTF_EXPORT_STRING_API String(const char* characters);
// Construct a string referencing an existing StringImpl.
+ String(StringImpl& impl) : m_impl(&impl) { }
String(StringImpl* impl) : m_impl(impl) { }
String(PassRefPtr<StringImpl> impl) : m_impl(impl) { }
String(PassRef<StringImpl> impl) : m_impl(std::move(impl)) { }
@@ -156,7 +157,6 @@
return m_impl->length();
}
- const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
const UChar* deprecatedCharacters() const
{
if (!m_impl)
Modified: trunk/Source/WebCore/CMakeLists.txt (163288 => 163289)
--- trunk/Source/WebCore/CMakeLists.txt 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1423,7 +1423,6 @@
html/HTMLOutputElement.cpp
html/HTMLParagraphElement.cpp
html/HTMLParamElement.cpp
- html/HTMLParserErrorCodes.cpp
html/HTMLPlugInElement.cpp
html/HTMLPlugInImageElement.cpp
html/HTMLPreElement.cpp
Modified: trunk/Source/WebCore/ChangeLog (163288 => 163289)
--- trunk/Source/WebCore/ChangeLog 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1,3 +1,23 @@
+2014-02-02 Darin Adler <[email protected]>
+
+ Obey "delete this" comments, including deleting String::characters and friends
+ https://bugs.webkit.org/show_bug.cgi?id=126865
+
+ Reviewed by Andreas Kling.
+
+ * CMakeLists.txt: Deleted HTMLParserErrorCodes.cpp.
+ * GNUmakefile.list.am: Deleted HTMLParserErrorCodes.cpp/h, and HTMLParserQuirks.h.
+ * WebCore.vcxproj/WebCore.vcxproj: Deleted HTMLParserErrorCodes.cpp/h.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+ * html/HTMLParserErrorCodes.cpp: Removed.
+ * html/HTMLParserErrorCodes.h: Removed.
+ * html/HTMLParserQuirks.h: Removed.
+
+ * rendering/RenderText.h: Deleted the characters function, leaving behind the
+ deprecatedCharacters function.
+
2014-02-02 Brady Eidson <[email protected]>
IDB: Cannot open new databases with the default version
Modified: trunk/Source/WebCore/GNUmakefile.list.am (163288 => 163289)
--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-03 07:52:38 UTC (rev 163289)
@@ -3468,9 +3468,6 @@
Source/WebCore/html/HTMLParagraphElement.h \
Source/WebCore/html/HTMLParamElement.cpp \
Source/WebCore/html/HTMLParamElement.h \
- Source/WebCore/html/HTMLParserErrorCodes.cpp \
- Source/WebCore/html/HTMLParserErrorCodes.h \
- Source/WebCore/html/HTMLParserQuirks.h \
Source/WebCore/html/HTMLPlugInElement.cpp \
Source/WebCore/html/HTMLPlugInElement.h \
Source/WebCore/html/HTMLPlugInImageElement.cpp \
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163288 => 163289)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-03 07:52:38 UTC (rev 163289)
@@ -15267,7 +15267,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\html\HTMLParserErrorCodes.cpp" />
<ClCompile Include="..\html\HTMLPlugInElement.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -20384,7 +20383,6 @@
<ClInclude Include="..\html\HTMLOutputElement.h" />
<ClInclude Include="..\html\HTMLParagraphElement.h" />
<ClInclude Include="..\html\HTMLParamElement.h" />
- <ClInclude Include="..\html\HTMLParserErrorCodes.h" />
<ClInclude Include="..\html\HTMLPlugInElement.h" />
<ClInclude Include="..\html\HTMLPlugInImageElement.h" />
<ClInclude Include="..\html\HTMLPreElement.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (163288 => 163289)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-03 07:52:38 UTC (rev 163289)
@@ -3882,9 +3882,6 @@
<ClCompile Include="..\html\HTMLParamElement.cpp">
<Filter>html</Filter>
</ClCompile>
- <ClCompile Include="..\html\HTMLParserErrorCodes.cpp">
- <Filter>html</Filter>
- </ClCompile>
<ClCompile Include="..\html\HTMLPlugInElement.cpp">
<Filter>html</Filter>
</ClCompile>
@@ -10901,9 +10898,6 @@
<ClInclude Include="..\html\HTMLParamElement.h">
<Filter>html</Filter>
</ClInclude>
- <ClInclude Include="..\html\HTMLParserErrorCodes.h">
- <Filter>html</Filter>
- </ClInclude>
<ClInclude Include="..\html\HTMLPlugInElement.h">
<Filter>html</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (163288 => 163289)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1495,7 +1495,6 @@
4496E39E1398136C003EE32A /* JSSVGAnimateMotionElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4496E39C1398136C003EE32A /* JSSVGAnimateMotionElement.h */; };
4496E3A0139813A5003EE32A /* JSSVGMPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4496E39F139813A5003EE32A /* JSSVGMPathElement.h */; };
4496E3A2139813CB003EE32A /* JSSVGMPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4496E3A1139813CB003EE32A /* JSSVGMPathElement.cpp */; };
- 449B19F50FA72ECE0015CA4A /* HTMLParserQuirks.h in Headers */ = {isa = PBXBuildFile; fileRef = 449B19F30FA72ECE0015CA4A /* HTMLParserQuirks.h */; settings = {ATTRIBUTES = (Private, ); }; };
44A20DB90F84166C00B3E1FE /* WebCoreURLResponseIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */; };
44A28AAF12DFB8BF00AE923B /* MathMLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAE12DFB8BF00AE923B /* MathMLNames.h */; };
@@ -4979,8 +4978,6 @@
BC53DA62114314BD000D817E /* DOMObjectHashTableMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53DA61114314BD000D817E /* DOMObjectHashTableMap.cpp */; };
BC5823F50C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */; };
BC5825F30C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */; };
- BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */; };
- BC588B4B0BFA723C00EE679E /* HTMLParserErrorCodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC588B4A0BFA723C00EE679E /* HTMLParserErrorCodes.cpp */; };
BC5A12DF0DC0414800C9AFAD /* CSSReflectValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5A12DD0DC0414800C9AFAD /* CSSReflectValue.cpp */; };
BC5A12E00DC0414800C9AFAD /* CSSReflectValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5A12DE0DC0414800C9AFAD /* CSSReflectValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5A86840C33676000EEA649 /* DOMSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5A86810C33676000EEA649 /* DOMSelection.cpp */; };
@@ -8361,7 +8358,6 @@
4496E39C1398136C003EE32A /* JSSVGAnimateMotionElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGAnimateMotionElement.h; sourceTree = "<group>"; };
4496E39F139813A5003EE32A /* JSSVGMPathElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGMPathElement.h; sourceTree = "<group>"; };
4496E3A1139813CB003EE32A /* JSSVGMPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGMPathElement.cpp; sourceTree = "<group>"; };
- 449B19F30FA72ECE0015CA4A /* HTMLParserQuirks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLParserQuirks.h; sourceTree = "<group>"; };
44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreURLResponseIOS.h; sourceTree = "<group>"; };
44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLElementFactory.h; sourceTree = "<group>"; };
44A28AAE12DFB8BF00AE923B /* MathMLNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLNames.h; sourceTree = "<group>"; };
@@ -12159,8 +12155,6 @@
BC53DA61114314BD000D817E /* DOMObjectHashTableMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMObjectHashTableMap.cpp; sourceTree = "<group>"; };
BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementCustom.cpp; sourceTree = "<group>"; };
BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleDeclarationCustom.cpp; sourceTree = "<group>"; };
- BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLParserErrorCodes.h; sourceTree = "<group>"; };
- BC588B4A0BFA723C00EE679E /* HTMLParserErrorCodes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParserErrorCodes.cpp; sourceTree = "<group>"; };
BC59DEF8169DEDC30016AC34 /* Settings.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Settings.in; sourceTree = "<group>"; };
BC59DEFA169DEDD80016AC34 /* make_settings.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = make_settings.pl; sourceTree = "<group>"; };
BC5A12DD0DC0414800C9AFAD /* CSSReflectValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSReflectValue.cpp; sourceTree = "<group>"; };
@@ -17300,9 +17294,6 @@
A871D44F0A127CBC00B12A68 /* HTMLParamElement.cpp */,
A871D44E0A127CBC00B12A68 /* HTMLParamElement.h */,
1AE2AB720A1CE81500B42B25 /* HTMLParamElement.idl */,
- BC588B4A0BFA723C00EE679E /* HTMLParserErrorCodes.cpp */,
- BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */,
- 449B19F30FA72ECE0015CA4A /* HTMLParserQuirks.h */,
A871D44D0A127CBC00B12A68 /* HTMLPlugInElement.cpp */,
A871D44C0A127CBC00B12A68 /* HTMLPlugInElement.h */,
4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */,
@@ -23820,11 +23811,9 @@
51D719F8181106E00016DC51 /* IndexedDB.h in Headers */,
A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */,
A871D4580A127CBC00B12A68 /* HTMLParamElement.h in Headers */,
- BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */,
B59ED23B18272679006D564C /* RenderAncestorIterator.h in Headers */,
93E2A307123E9DC0009FE12A /* HTMLParserIdioms.h in Headers */,
973F418A169B95FF0006BF60 /* HTMLParserOptions.h in Headers */,
- 449B19F50FA72ECE0015CA4A /* HTMLParserQuirks.h in Headers */,
073BE34B17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h in Headers */,
977B3871122883E900B81FF8 /* HTMLParserScheduler.h in Headers */,
A871D4560A127CBC00B12A68 /* HTMLPlugInElement.h in Headers */,
@@ -27164,7 +27153,6 @@
4AD01008127E642A0015035F /* HTMLOutputElement.cpp in Sources */,
A8EA7CB20A192B9C00A8EF5F /* HTMLParagraphElement.cpp in Sources */,
A871D4590A127CBC00B12A68 /* HTMLParamElement.cpp in Sources */,
- BC588B4B0BFA723C00EE679E /* HTMLParserErrorCodes.cpp in Sources */,
93E2A306123E9DC0009FE12A /* HTMLParserIdioms.cpp in Sources */,
973F418B169B96030006BF60 /* HTMLParserOptions.cpp in Sources */,
977B3870122883E900B81FF8 /* HTMLParserScheduler.cpp in Sources */,
Deleted: trunk/Source/WebCore/html/HTMLParserErrorCodes.cpp (163288 => 163289)
--- trunk/Source/WebCore/html/HTMLParserErrorCodes.cpp 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/html/HTMLParserErrorCodes.cpp 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-// FIXME: Delete this file.
Deleted: trunk/Source/WebCore/html/HTMLParserErrorCodes.h (163288 => 163289)
--- trunk/Source/WebCore/html/HTMLParserErrorCodes.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/html/HTMLParserErrorCodes.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// FIXME: Delete this file.
Deleted: trunk/Source/WebCore/html/HTMLParserQuirks.h (163288 => 163289)
--- trunk/Source/WebCore/html/HTMLParserQuirks.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/html/HTMLParserQuirks.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// FIXME: Delete this file.
Modified: trunk/Source/WebCore/rendering/RenderText.h (163288 => 163289)
--- trunk/Source/WebCore/rendering/RenderText.h 2014-02-03 07:31:40 UTC (rev 163288)
+++ trunk/Source/WebCore/rendering/RenderText.h 2014-02-03 07:52:38 UTC (rev 163289)
@@ -74,11 +74,10 @@
virtual VisiblePosition positionForPoint(const LayoutPoint&) override;
- bool is8Bit() const { return m_text.is8Bit(); }
+ bool is8Bit() const { return m_text.impl()->is8Bit(); }
const LChar* characters8() const { return m_text.impl()->characters8(); }
const UChar* characters16() const { return m_text.impl()->characters16(); }
- const UChar* characters() const { return deprecatedCharacters(); } // FIXME: Delete this.
- const UChar* deprecatedCharacters() const { return m_text.deprecatedCharacters(); }
+ const UChar* deprecatedCharacters() const { return m_text.impl()->deprecatedCharacters(); }
UChar characterAt(unsigned i) const { return is8Bit() ? characters8()[i] : characters16()[i]; }
UChar operator[](unsigned i) const { return characterAt(i); }
unsigned textLength() const { return m_text.impl()->length(); } // non virtual implementation of length()
