Diff
Modified: trunk/LayoutTests/ChangeLog (91755 => 91756)
--- trunk/LayoutTests/ChangeLog 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/LayoutTests/ChangeLog 2011-07-26 14:58:10 UTC (rev 91756)
@@ -1,3 +1,14 @@
+2011-07-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r91746.
+ http://trac.webkit.org/changeset/91746
+ https://bugs.webkit.org/show_bug.cgi?id=65180
+
+ It broke SL build (Requested by Ossy on #webkit).
+
+ * fast/forms/option-strip-unicode-spaces-expected.txt: Removed.
+ * fast/forms/option-strip-unicode-spaces.html: Removed.
+
2011-07-26 Pavel Feldman <[email protected]>
Web Inspector: Better represent custom getters in the properties pane
Deleted: trunk/LayoutTests/fast/forms/option-strip-unicode-spaces-expected.txt (91755 => 91756)
--- trunk/LayoutTests/fast/forms/option-strip-unicode-spaces-expected.txt 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/LayoutTests/fast/forms/option-strip-unicode-spaces-expected.txt 2011-07-26 14:58:10 UTC (rev 91756)
@@ -1,510 +0,0 @@
-Test for .text for OPTION element
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Insert one HTMLspace before/after/between the text
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-
-Insert multiple HTMLspaces before/after/between the text
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-
-
-Insert one nonHTMLspace before/after/between the text
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-
-Insert multiple nonHTMLspaces before/after/between the text
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-PASS option.text is expected
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/forms/option-strip-unicode-spaces.html (91755 => 91756)
--- trunk/LayoutTests/fast/forms/option-strip-unicode-spaces.html 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/LayoutTests/fast/forms/option-strip-unicode-spaces.html 2011-07-26 14:58:10 UTC (rev 91756)
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description('Test for .text for OPTION element');
-
-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#space-character
-var HTMLSpaces = [
- String.fromCharCode(0x20),
- String.fromCharCode(0x09),
- String.fromCharCode(0x0A),
- String.fromCharCode(0x0C),
- String.fromCharCode(0x0D)
-];
-
-// Unicode white spaces which are not handled as white space
-// when removing spaces on option element.
-// These are taken from Unicode PropList.txt
-var nonHTMLSpaces = [
- String.fromCharCode(0x0B),
- String.fromCharCode(0x85),
- String.fromCharCode(0xA0),
- String.fromCharCode(0x1680),
- String.fromCharCode(0x180E),
- String.fromCharCode(0x2000),
- String.fromCharCode(0x2001),
- String.fromCharCode(0x2002),
- String.fromCharCode(0x2003),
- String.fromCharCode(0x2004),
- String.fromCharCode(0x2005),
- String.fromCharCode(0x2006),
- String.fromCharCode(0x2007),
- String.fromCharCode(0x2008),
- String.fromCharCode(0x2009),
- String.fromCharCode(0x200A),
- String.fromCharCode(0x2028),
- String.fromCharCode(0x2029),
- String.fromCharCode(0x202F),
- String.fromCharCode(0x205F),
- String.fromCharCode(0x3000)
-];
-
-var parent = document.createElement('div');
-document.body.appendChild(parent);
-parent.innerHTML = '<select><option id=option></option></select>';
-
-var option = document.getElementById('option');
-
-var expected;
-
-debug('Insert one HTMLspace before/after/between the text');
-for (var i = 0; i < HTMLSpaces.length; ++i) {
- option.text = HTMLSpaces[i] + 'text' + HTMLSpaces[i] + 'text' + HTMLSpaces[i];
- expected = 'text text';
- shouldBe('option.text', 'expected');
-}
-debug('');
-
-debug('Insert multiple HTMLspaces before/after/between the text');
-for (var i = 0; i < HTMLSpaces.length; ++i) {
- for (var j = 0; j < HTMLSpaces.length; ++j) {
- option.text = HTMLSpaces[i] + HTMLSpaces[j] + 'text' + HTMLSpaces[i] + HTMLSpaces[j] + 'text' + HTMLSpaces[i] + HTMLSpaces[j];
- expected = 'text text';
- shouldBe('option.text', 'expected');
- }
-}
-debug('');
-
-debug('');
-
-debug('Insert one nonHTMLspace before/after/between the text');
-for (var i = 0; i < nonHTMLSpaces.length; ++i) {
- option.text = nonHTMLSpaces[i] + 'text' + nonHTMLSpaces[i] + 'text' + nonHTMLSpaces[i];
- expected = nonHTMLSpaces[i] + 'text' + nonHTMLSpaces[i] + 'text' + nonHTMLSpaces[i];
- shouldBe('option.text', 'expected');
-}
-debug('');
-
-debug('Insert multiple nonHTMLspaces before/after/between the text');
-for (var i = 0; i < nonHTMLSpaces.length; ++i) {
- for (var j = 0; j < nonHTMLSpaces.length; ++j) {
- option.text = nonHTMLSpaces[i] + nonHTMLSpaces[j] + 'text' + nonHTMLSpaces[i] + nonHTMLSpaces[j] + 'text' + nonHTMLSpaces[i] + nonHTMLSpaces[j];
- expected = nonHTMLSpaces[i] + nonHTMLSpaces[j] + 'text' + nonHTMLSpaces[i] + nonHTMLSpaces[j] + 'text' + nonHTMLSpaces[i] + nonHTMLSpaces[j];
- shouldBe('option.text', 'expected');
- }
-}
-debug('');
-
-
-var successfullyParsed = true;
-</script>
-
-<script src=""
-</body>
-</html>
Modified: trunk/Source/_javascript_Core/ChangeLog (91755 => 91756)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-26 14:58:10 UTC (rev 91756)
@@ -1,3 +1,18 @@
+2011-07-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r91746.
+ http://trac.webkit.org/changeset/91746
+ https://bugs.webkit.org/show_bug.cgi?id=65180
+
+ It broke SL build (Requested by Ossy on #webkit).
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::stripWhiteSpace):
+ (WTF::StringImpl::simplifyWhiteSpace):
+ * wtf/text/StringImpl.h:
+ * wtf/text/WTFString.cpp:
+ * wtf/text/WTFString.h:
+
2011-07-26 Alexis Menard <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp (91755 => 91756)
--- trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp 2011-07-26 14:58:10 UTC (rev 91756)
@@ -315,11 +315,6 @@
PassRefPtr<StringImpl> StringImpl::stripWhiteSpace()
{
- return stripWhiteSpace(isSpaceOrNewline);
-}
-
-PassRefPtr<StringImpl> StringImpl::stripWhiteSpace(IsWhiteSpaceFunctionPtr isWhiteSpace)
-{
if (!m_length)
return empty();
@@ -327,7 +322,7 @@
unsigned end = m_length - 1;
// skip white space from start
- while (start <= end && isWhiteSpace(m_data[start]))
+ while (start <= end && isSpaceOrNewline(m_data[start]))
start++;
// only white space
@@ -335,7 +330,7 @@
return empty();
// skip white space from end
- while (end && isWhiteSpace(m_data[end]))
+ while (end && isSpaceOrNewline(m_data[end]))
end--;
if (!start && end == m_length - 1)
@@ -377,11 +372,6 @@
PassRefPtr<StringImpl> StringImpl::simplifyWhiteSpace()
{
- return StringImpl::simplifyWhiteSpace(isSpaceOrNewline);
-}
-
-PassRefPtr<StringImpl> StringImpl::simplifyWhiteSpace(IsWhiteSpaceFunctionPtr isWhiteSpace)
-{
StringBuffer data(m_length);
const UChar* from = m_data;
@@ -392,12 +382,12 @@
UChar* to = data.characters();
while (true) {
- while (from != fromend && isWhiteSpace(*from)) {
+ while (from != fromend && isSpaceOrNewline(*from)) {
if (*from != ' ')
changedToSpace = true;
from++;
}
- while (from != fromend && !isWhiteSpace(*from))
+ while (from != fromend && !isSpaceOrNewline(*from))
to[outc++] = *from++;
if (from != fromend)
to[outc++] = ' ';
Modified: trunk/Source/_javascript_Core/wtf/text/StringImpl.h (91755 => 91756)
--- trunk/Source/_javascript_Core/wtf/text/StringImpl.h 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/_javascript_Core/wtf/text/StringImpl.h 2011-07-26 14:58:10 UTC (rev 91756)
@@ -61,7 +61,6 @@
typedef OwnFastMallocPtr<const UChar> SharableUChar;
typedef CrossThreadRefCounted<SharableUChar> SharedUChar;
typedef bool (*CharacterMatchFunctionPtr)(UChar);
-typedef bool (*IsWhiteSpaceFunctionPtr)(UChar);
class StringImpl : public StringImplBase {
friend struct JSC::IdentifierCStringTranslator;
@@ -289,9 +288,7 @@
PassRefPtr<StringImpl> foldCase();
PassRefPtr<StringImpl> stripWhiteSpace();
- PassRefPtr<StringImpl> stripWhiteSpace(IsWhiteSpaceFunctionPtr);
PassRefPtr<StringImpl> simplifyWhiteSpace();
- PassRefPtr<StringImpl> simplifyWhiteSpace(IsWhiteSpaceFunctionPtr);
PassRefPtr<StringImpl> removeCharacters(CharacterMatchFunctionPtr);
Modified: trunk/Source/_javascript_Core/wtf/text/WTFString.cpp (91755 => 91756)
--- trunk/Source/_javascript_Core/wtf/text/WTFString.cpp 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/_javascript_Core/wtf/text/WTFString.cpp 2011-07-26 14:58:10 UTC (rev 91756)
@@ -267,13 +267,6 @@
return m_impl->stripWhiteSpace();
}
-String String::stripWhiteSpace(IsWhiteSpaceFunctionPtr isWhiteSpace) const
-{
- if (!m_impl)
- return String();
- return m_impl->stripWhiteSpace(isWhiteSpace);
-}
-
String String::simplifyWhiteSpace() const
{
if (!m_impl)
@@ -281,13 +274,6 @@
return m_impl->simplifyWhiteSpace();
}
-String String::simplifyWhiteSpace(IsWhiteSpaceFunctionPtr isWhiteSpace) const
-{
- if (!m_impl)
- return String();
- return m_impl->simplifyWhiteSpace(isWhiteSpace);
-}
-
String String::removeCharacters(CharacterMatchFunctionPtr findMatch) const
{
if (!m_impl)
Modified: trunk/Source/_javascript_Core/wtf/text/WTFString.h (91755 => 91756)
--- trunk/Source/_javascript_Core/wtf/text/WTFString.h 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/_javascript_Core/wtf/text/WTFString.h 2011-07-26 14:58:10 UTC (rev 91756)
@@ -234,9 +234,7 @@
WTF_EXPORT_PRIVATE String upper() const;
WTF_EXPORT_PRIVATE String stripWhiteSpace() const;
- WTF_EXPORT_PRIVATE String stripWhiteSpace(IsWhiteSpaceFunctionPtr) const;
WTF_EXPORT_PRIVATE String simplifyWhiteSpace() const;
- WTF_EXPORT_PRIVATE String simplifyWhiteSpace(IsWhiteSpaceFunctionPtr) const;
WTF_EXPORT_PRIVATE String removeCharacters(CharacterMatchFunctionPtr) const;
template<bool isSpecialCharacter(UChar)> bool isAllSpecialCharacters() const;
Modified: trunk/Source/WebCore/ChangeLog (91755 => 91756)
--- trunk/Source/WebCore/ChangeLog 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/WebCore/ChangeLog 2011-07-26 14:58:10 UTC (rev 91756)
@@ -1,3 +1,14 @@
+2011-07-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r91746.
+ http://trac.webkit.org/changeset/91746
+ https://bugs.webkit.org/show_bug.cgi?id=65180
+
+ It broke SL build (Requested by Ossy on #webkit).
+
+ * dom/OptionElement.cpp:
+ (WebCore::OptionElement::normalizeText):
+
2011-07-26 Pavel Feldman <[email protected]>
Web Inspector: Better represent custom getters in the properties pane
Modified: trunk/Source/WebCore/dom/OptionElement.cpp (91755 => 91756)
--- trunk/Source/WebCore/dom/OptionElement.cpp 2011-07-26 14:55:33 UTC (rev 91755)
+++ trunk/Source/WebCore/dom/OptionElement.cpp 2011-07-26 14:58:10 UTC (rev 91756)
@@ -24,7 +24,6 @@
#include "Document.h"
#include "Element.h"
#include "HTMLNames.h"
-#include "HTMLParserIdioms.h"
#include "HTMLOptionElement.h"
#include "OptionGroupElement.h"
#include "ScriptElement.h"
@@ -98,11 +97,10 @@
String text = document->displayStringModifiedByEncoding(src);
// In WinIE, leading and trailing whitespace is ignored in options and optgroups. We match this behavior.
- text = text.stripWhiteSpace(isHTMLSpace);
+ text = text.stripWhiteSpace();
// We want to collapse our whitespace too. This will match other browsers.
- text = text.simplifyWhiteSpace(isHTMLSpace);
-
+ text = text.simplifyWhiteSpace();
return text;
}
