Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (90642 => 90643)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-08 17:54:05 UTC (rev 90643)
@@ -1,3 +1,19 @@
+2011-07-08 Chang Shu <[email protected]>
+
+ Rename "makeSecure" to "fill" and remove the support for displaying last character
+ to avoid layering violatation.
+ https://bugs.webkit.org/show_bug.cgi?id=59114
+
+ Reviewed by Alexey Proskuryakov.
+
+ * _javascript_Core.exp:
+ * _javascript_Core.order:
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::fill):
+ * wtf/text/StringImpl.h:
+ * wtf/text/WTFString.h:
+ (WTF::String::fill):
+
2011-07-08 Benjamin Poulain <[email protected]>
[WK2] Do not forward touch events to the web process when it does not need them
Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (90642 => 90643)
--- trunk/Source/_javascript_Core/_javascript_Core.exp 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp 2011-07-08 17:54:05 UTC (rev 90643)
@@ -368,7 +368,7 @@
__ZN3WTF10StringImpl6createEPKc
__ZN3WTF10StringImpl6createEPKcj
__ZN3WTF10StringImpl6createEPKtj
-__ZN3WTF10StringImpl6secureEtNS0_21LastCharacterBehaviorE
+__ZN3WTF10StringImpl4fillEt
__ZN3WTF10StringImpl7replaceEPS0_S1_
__ZN3WTF10StringImpl7replaceEjjPS0_
__ZN3WTF10StringImpl7replaceEtPS0_
Modified: trunk/Source/_javascript_Core/_javascript_Core.order (90642 => 90643)
--- trunk/Source/_javascript_Core/_javascript_Core.order 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/_javascript_Core.order 2011-07-08 17:54:05 UTC (rev 90643)
@@ -1480,7 +1480,7 @@
__ZN3JSCL26stringProtoFuncLastIndexOfEPNS_9ExecStateE
__ZNK3JSC7JSValue20toIntegerPreserveNaNEPNS_9ExecStateE
__ZN3WTFeqERKNS_7CStringES2_
-__ZN3WTF10StringImpl6secureEtNS0_21LastCharacterBehaviorE
+__ZN3WTF10StringImpl4fillEt
__ZN3WTF22charactersToUIntStrictEPKtmPbi
__ZNK3WTF6String5upperEv
__ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRNS_7UStringERNS_7JSValueE
Modified: trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp (90642 => 90643)
--- trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/wtf/text/StringImpl.cpp 2011-07-08 17:54:05 UTC (rev 90643)
@@ -270,17 +270,15 @@
return newImpl.release();
}
-PassRefPtr<StringImpl> StringImpl::secure(UChar character, LastCharacterBehavior behavior)
+PassRefPtr<StringImpl> StringImpl::fill(UChar character)
{
if (!m_length)
return this;
UChar* data;
RefPtr<StringImpl> newImpl = createUninitialized(m_length, data);
- unsigned lastCharacterIndex = m_length - 1;
- for (unsigned i = 0; i < lastCharacterIndex; ++i)
+ for (unsigned i = 0; i < m_length; ++i)
data[i] = character;
- data[lastCharacterIndex] = (behavior == ObscureLastCharacter) ? character : m_data[lastCharacterIndex];
return newImpl.release();
}
Modified: trunk/Source/_javascript_Core/wtf/text/StringImpl.h (90642 => 90643)
--- trunk/Source/_javascript_Core/wtf/text/StringImpl.h 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/wtf/text/StringImpl.h 2011-07-08 17:54:05 UTC (rev 90643)
@@ -284,9 +284,7 @@
PassRefPtr<StringImpl> lower();
PassRefPtr<StringImpl> upper();
- enum LastCharacterBehavior { ObscureLastCharacter, DisplayLastCharacter };
-
- PassRefPtr<StringImpl> secure(UChar, LastCharacterBehavior = ObscureLastCharacter);
+ PassRefPtr<StringImpl> fill(UChar);
PassRefPtr<StringImpl> foldCase();
PassRefPtr<StringImpl> stripWhiteSpace();
Modified: trunk/Source/_javascript_Core/wtf/text/WTFString.h (90642 => 90643)
--- trunk/Source/_javascript_Core/wtf/text/WTFString.h 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/_javascript_Core/wtf/text/WTFString.h 2011-07-08 17:54:05 UTC (rev 90643)
@@ -219,7 +219,7 @@
void makeLower() { if (m_impl) m_impl = m_impl->lower(); }
void makeUpper() { if (m_impl) m_impl = m_impl->upper(); }
- void makeSecure(UChar aChar) { if (m_impl) m_impl = m_impl->secure(aChar); }
+ void fill(UChar c) { if (m_impl) m_impl = m_impl->fill(c); }
WTF_EXPORT_PRIVATE void truncate(unsigned len);
WTF_EXPORT_PRIVATE void remove(unsigned pos, int len = 1);
Modified: trunk/Source/WebCore/ChangeLog (90642 => 90643)
--- trunk/Source/WebCore/ChangeLog 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/WebCore/ChangeLog 2011-07-08 17:54:05 UTC (rev 90643)
@@ -1,3 +1,18 @@
+2011-07-08 Chang Shu <[email protected]>
+
+ Update calling sites after function renamed.
+ https://bugs.webkit.org/show_bug.cgi?id=59114
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests, just refactoring.
+
+ * editing/visible_units.cpp:
+ (WebCore::previousBoundary):
+ (WebCore::nextBoundary):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::setTextInternal):
+
2011-07-08 Mihnea Ovidenie <[email protected]>
[CSSRegions]Parse content: -webkit-from-flow
Modified: trunk/Source/WebCore/editing/visible_units.cpp (90642 => 90643)
--- trunk/Source/WebCore/editing/visible_units.cpp 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/WebCore/editing/visible_units.cpp 2011-07-08 17:54:05 UTC (rev 90643)
@@ -103,7 +103,7 @@
else {
// Treat bullets used in the text security mode as regular characters when looking for boundaries
String iteratorString(it.characters(), it.length());
- iteratorString = iteratorString.impl()->secure('x');
+ iteratorString.fill('x');
string.prepend(iteratorString.characters(), iteratorString.length());
}
next = searchFunction(string.data(), string.size(), string.size() - suffixLength, MayHaveMoreContext, needMoreContext);
@@ -178,7 +178,7 @@
else {
// Treat bullets used in the text security mode as regular characters when looking for boundaries
String iteratorString(it.characters(), it.length());
- iteratorString = iteratorString.impl()->secure('x');
+ iteratorString.fill('x');
string.append(iteratorString.characters(), iteratorString.length());
}
next = searchFunction(string.data(), string.size(), prefixLength, MayHaveMoreContext, needMoreContext);
Modified: trunk/Source/WebCore/rendering/RenderText.cpp (90642 => 90643)
--- trunk/Source/WebCore/rendering/RenderText.cpp 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2011-07-08 17:54:05 UTC (rev 90643)
@@ -1170,13 +1170,13 @@
case TSNONE:
break;
case TSCIRCLE:
- m_text.makeSecure(whiteBullet);
+ m_text.fill(whiteBullet);
break;
case TSDISC:
- m_text.makeSecure(bullet);
+ m_text.fill(bullet);
break;
case TSSQUARE:
- m_text.makeSecure(blackSquare);
+ m_text.fill(blackSquare);
}
}
Modified: trunk/Source/WebKit/win/ChangeLog (90642 => 90643)
--- trunk/Source/WebKit/win/ChangeLog 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/WebKit/win/ChangeLog 2011-07-08 17:54:05 UTC (rev 90643)
@@ -1,3 +1,13 @@
+2011-07-08 Chang Shu <[email protected]>
+
+ Update calling sites after function renamed.
+ https://bugs.webkit.org/show_bug.cgi?id=59114
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitGraphics.cpp:
+ (WebDrawText):
+
2011-06-30 Anders Carlsson <[email protected]>
Reviewed by Dan Bernstein.
Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (90642 => 90643)
--- trunk/Source/WebKit/win/WebKitGraphics.cpp 2011-07-08 17:29:10 UTC (rev 90642)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp 2011-07-08 17:54:05 UTC (rev 90643)
@@ -104,7 +104,7 @@
GraphicsContext context(info->cgContext);
String drawString(info->text, info->length);
if (info->drawAsPassword)
- drawString = drawString.impl()->secure(WTF::Unicode::bullet);
+ drawString.fill(WTF::Unicode::bullet);
context.save();
