<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169731] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169731">169731</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-09 17:22:23 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve CSSPrimitiveValue::customCSSText for ARMv7
https://bugs.webkit.org/show_bug.cgi?id=133597
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-06-09
Reviewed by Andreas Kling.
Source/WebCore:
On imgur, some script is updating some layout on timers and on scroll.
It looks like CSSPrimitiveValue::customCSSText() is a little constrained
by the instruction cache on ARMv7. This patch improve the situation a bit.
First, the creation of the string itself is changed to go from two allocation to one.
Previously, we would allocate a StringBuffer and adopt it. Now we allocate a StringImpl
directly with the inline buffer.
The second issue is that the compiler was generating a real copy constructor for every
assignment of the "text" variable (likely because the variable span is so large).
This was solved by moving the string creating into a separate function (to fix the span)
and being careful with passing PassRef<StringImpl> around.
Then there was the problem that the compiler was a little too aggressive with inlining
which caused each "case" to repeat the same prologue and epilogue before formatValue().
This was solved by adding formatNumberValue() with NEVER_INLINE to have the prologue/epilogue
in a single place.
On older device, that's about 3% improvement on style access. On modern ARM64/x86_64
there is no noticeable difference.
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::formatNumberValue):
(WebCore::CSSPrimitiveValue::formatNumberForcustomCSSText):
(WebCore::CSSPrimitiveValue::customCSSText):
(WebCore::formatNumber): Deleted.
* css/CSSPrimitiveValue.h:
Source/WTF:
* wtf/RefPtr.h:
(WTF::RefPtr<T>::RefPtr):
* wtf/text/WTFString.h:
(WTF::String::String):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRefPtrh">trunk/Source/WTF/wtf/RefPtr.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WTF/ChangeLog 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-09 Benjamin Poulain <bpoulain@apple.com>
+
+ Improve CSSPrimitiveValue::customCSSText for ARMv7
+ https://bugs.webkit.org/show_bug.cgi?id=133597
+
+ Reviewed by Andreas Kling.
+
+ * wtf/RefPtr.h:
+ (WTF::RefPtr<T>::RefPtr):
+ * wtf/text/WTFString.h:
+ (WTF::String::String):
+
</ins><span class="cx"> 2014-06-05 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Align srcset parser with recent spec changes
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefPtr.h (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefPtr.h 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WTF/wtf/RefPtr.h 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> // See comments in PassRefPtr.h for an explanation of why this takes a const reference.
</span><span class="cx"> template<typename U> RefPtr(const PassRefPtr<U>&);
</span><span class="cx">
</span><del>- template<typename U> RefPtr(PassRef<U>);
</del><ins>+ template<typename U> RefPtr(PassRef<U>&&);
</ins><span class="cx">
</span><span class="cx"> // Hash table deleted values, which are only constructed and never copied or destroyed.
</span><span class="cx"> RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T> template<typename U> inline RefPtr<T>::RefPtr(PassRef<U> reference)
</del><ins>+ template<typename T> template<typename U> inline RefPtr<T>::RefPtr(PassRef<U>&& reference)
</ins><span class="cx"> : m_ptr(&reference.leakRef())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> String(StringImpl& impl) : m_impl(&impl) { }
</span><span class="cx"> String(StringImpl* impl) : m_impl(impl) { }
</span><span class="cx"> String(PassRefPtr<StringImpl> impl) : m_impl(impl) { }
</span><del>- String(PassRef<StringImpl> impl) : m_impl(std::move(impl)) { }
</del><ins>+ String(PassRef<StringImpl>&& impl) : m_impl(std::forward<PassRef<StringImpl>>(impl)) { }
</ins><span class="cx"> String(RefPtr<StringImpl>&& impl) : m_impl(impl) { }
</span><span class="cx">
</span><span class="cx"> // Construct a string from a constant string literal.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-06-09 Benjamin Poulain <bpoulain@apple.com>
+
+ Improve CSSPrimitiveValue::customCSSText for ARMv7
+ https://bugs.webkit.org/show_bug.cgi?id=133597
+
+ Reviewed by Andreas Kling.
+
+ On imgur, some script is updating some layout on timers and on scroll.
+
+ It looks like CSSPrimitiveValue::customCSSText() is a little constrained
+ by the instruction cache on ARMv7. This patch improve the situation a bit.
+
+ First, the creation of the string itself is changed to go from two allocation to one.
+ Previously, we would allocate a StringBuffer and adopt it. Now we allocate a StringImpl
+ directly with the inline buffer.
+
+ The second issue is that the compiler was generating a real copy constructor for every
+ assignment of the "text" variable (likely because the variable span is so large).
+ This was solved by moving the string creating into a separate function (to fix the span)
+ and being careful with passing PassRef<StringImpl> around.
+
+ Then there was the problem that the compiler was a little too aggressive with inlining
+ which caused each "case" to repeat the same prologue and epilogue before formatValue().
+ This was solved by adding formatNumberValue() with NEVER_INLINE to have the prologue/epilogue
+ in a single place.
+
+ On older device, that's about 3% improvement on style access. On modern ARM64/x86_64
+ there is no noticeable difference.
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::formatNumberValue):
+ (WebCore::CSSPrimitiveValue::formatNumberForcustomCSSText):
+ (WebCore::CSSPrimitiveValue::customCSSText):
+ (WebCore::formatNumber): Deleted.
+ * css/CSSPrimitiveValue.h:
+
</ins><span class="cx"> 2014-06-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS WebGL] Fix EXT_shader_texture_lod.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -921,279 +921,243 @@
</span><span class="cx"> return m_value.pair;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String formatNumber(double number, const char* suffix, unsigned suffixLength)
</del><ins>+NEVER_INLINE PassRef<StringImpl> CSSPrimitiveValue::formatNumberValue(const char* suffix, unsigned suffixLength) const
</ins><span class="cx"> {
</span><del>- DecimalNumber decimal(number);
</del><ins>+ DecimalNumber decimal(m_value.num);
</ins><span class="cx">
</span><del>- StringBuffer<LChar> buffer(decimal.bufferLengthForStringDecimal() + suffixLength);
- unsigned length = decimal.toStringDecimal(buffer.characters(), buffer.length());
- ASSERT(length + suffixLength == buffer.length());
</del><ins>+ unsigned bufferLength = decimal.bufferLengthForStringDecimal() + suffixLength;
+ LChar* buffer;
+ PassRef<StringImpl> string = StringImpl::createUninitialized(bufferLength, buffer);
</ins><span class="cx">
</span><ins>+ unsigned length = decimal.toStringDecimal(buffer, bufferLength);
+ ASSERT(length == string.length());
+
</ins><span class="cx"> for (unsigned i = 0; i < suffixLength; ++i)
</span><span class="cx"> buffer[length + i] = static_cast<LChar>(suffix[i]);
</span><span class="cx">
</span><del>- return String::adopt(buffer);
</del><ins>+ return std::move(string);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <unsigned characterCount>
</span><del>-ALWAYS_INLINE static String formatNumber(double number, const char (&characters)[characterCount])
</del><ins>+ALWAYS_INLINE PassRef<StringImpl> CSSPrimitiveValue::formatNumberValue(const char (&characters)[characterCount]) const
</ins><span class="cx"> {
</span><del>- return formatNumber(number, characters, characterCount - 1);
</del><ins>+ return std::move(formatNumberValue(characters, characterCount - 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String CSSPrimitiveValue::customCSSText() const
</del><ins>+ALWAYS_INLINE String CSSPrimitiveValue::formatNumberForcustomCSSText() const
</ins><span class="cx"> {
</span><del>- // FIXME: return the original value instead of a generated one (e.g. color
- // name if it was specified) - check what spec says about this
-
- if (m_hasCachedCSSText) {
- ASSERT(cssTextCache().contains(this));
- return cssTextCache().get(this);
- }
-
- String text;
</del><span class="cx"> switch (m_primitiveUnitType) {
</span><del>- case CSS_UNKNOWN:
- // FIXME
- break;
- case CSS_NUMBER:
- case CSS_PARSER_INTEGER:
- text = formatNumber(m_value.num, "");
- break;
- case CSS_PERCENTAGE:
- text = formatNumber(m_value.num, "%");
- break;
- case CSS_EMS:
- text = formatNumber(m_value.num, "em");
- break;
- case CSS_EXS:
- text = formatNumber(m_value.num, "ex");
- break;
- case CSS_REMS:
- text = formatNumber(m_value.num, "rem");
- break;
- case CSS_CHS:
- text = formatNumber(m_value.num, "ch");
- break;
- case CSS_PX:
- text = formatNumber(m_value.num, "px");
- break;
- case CSS_CM:
- text = formatNumber(m_value.num, "cm");
- break;
</del><ins>+ case CSS_UNKNOWN:
+ return String();
+ case CSS_NUMBER:
+ case CSS_PARSER_INTEGER:
+ return formatNumberValue("");
+ case CSS_PERCENTAGE:
+ return formatNumberValue("%");
+ case CSS_EMS:
+ return formatNumberValue("em");
+ case CSS_EXS:
+ return formatNumberValue("ex");
+ case CSS_REMS:
+ return formatNumberValue("rem");
+ case CSS_CHS:
+ return formatNumberValue("ch");
+ case CSS_PX:
+ return formatNumberValue("px");
+ case CSS_CM:
+ return formatNumberValue("cm");
</ins><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
</span><del>- case CSS_DPPX:
- text = formatNumber(m_value.num, "dppx");
- break;
- case CSS_DPI:
- text = formatNumber(m_value.num, "dpi");
- break;
- case CSS_DPCM:
- text = formatNumber(m_value.num, "dpcm");
- break;
</del><ins>+ case CSS_DPPX:
+ return formatNumberValue("dppx");
+ case CSS_DPI:
+ return formatNumberValue("dpi");
+ case CSS_DPCM:
+ return formatNumberValue("dpcm");
</ins><span class="cx"> #endif
</span><del>- case CSS_MM:
- text = formatNumber(m_value.num, "mm");
- break;
- case CSS_IN:
- text = formatNumber(m_value.num, "in");
- break;
- case CSS_PT:
- text = formatNumber(m_value.num, "pt");
- break;
- case CSS_PC:
- text = formatNumber(m_value.num, "pc");
- break;
- case CSS_DEG:
- text = formatNumber(m_value.num, "deg");
- break;
- case CSS_RAD:
- text = formatNumber(m_value.num, "rad");
- break;
- case CSS_GRAD:
- text = formatNumber(m_value.num, "grad");
- break;
- case CSS_MS:
- text = formatNumber(m_value.num, "ms");
- break;
- case CSS_S:
- text = formatNumber(m_value.num, "s");
- break;
- case CSS_HZ:
- text = formatNumber(m_value.num, "hz");
- break;
- case CSS_KHZ:
- text = formatNumber(m_value.num, "khz");
- break;
- case CSS_TURN:
- text = formatNumber(m_value.num, "turn");
- break;
- case CSS_FR:
- text = formatNumber(m_value.num, "fr");
- break;
- case CSS_DIMENSION:
- // FIXME: We currently don't handle CSS_DIMENSION properly as we don't store
- // the actual dimension, just the numeric value as a string.
- break;
- case CSS_STRING:
- text = quoteCSSStringIfNeeded(m_value.string);
- break;
- case CSS_URI:
- text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ')';
- break;
- case CSS_VALUE_ID:
- text = valueName(m_value.valueID);
- break;
- case CSS_PROPERTY_ID:
- text = propertyName(m_value.propertyID);
- break;
- case CSS_ATTR: {
- StringBuilder result;
- result.reserveCapacity(6 + m_value.string->length());
- result.appendLiteral("attr(");
- result.append(m_value.string);
- result.append(')');
</del><ins>+ case CSS_MM:
+ return formatNumberValue("mm");
+ case CSS_IN:
+ return formatNumberValue("in");
+ case CSS_PT:
+ return formatNumberValue("pt");
+ case CSS_PC:
+ return formatNumberValue("pc");
+ case CSS_DEG:
+ return formatNumberValue("deg");
+ case CSS_RAD:
+ return formatNumberValue("rad");
+ case CSS_GRAD:
+ return formatNumberValue("grad");
+ case CSS_MS:
+ return formatNumberValue("ms");
+ case CSS_S:
+ return formatNumberValue("s");
+ case CSS_HZ:
+ return formatNumberValue("hz");
+ case CSS_KHZ:
+ return formatNumberValue("khz");
+ case CSS_TURN:
+ return formatNumberValue("turn");
+ case CSS_FR:
+ return formatNumberValue("fr");
+ case CSS_DIMENSION:
+ // FIXME: We currently don't handle CSS_DIMENSION properly as we don't store
+ // the actual dimension, just the numeric value as a string.
+ case CSS_STRING:
+ return quoteCSSStringIfNeeded(m_value.string);
+ case CSS_URI:
+ return "url(" + quoteCSSURLIfNeeded(m_value.string) + ')';
+ case CSS_VALUE_ID:
+ return valueName(m_value.valueID);
+ case CSS_PROPERTY_ID:
+ return propertyName(m_value.propertyID);
+ case CSS_ATTR: {
+ StringBuilder result;
+ result.reserveCapacity(6 + m_value.string->length());
+ result.appendLiteral("attr(");
+ result.append(m_value.string);
+ result.append(')');
</ins><span class="cx">
</span><del>- text = result.toString();
- break;
</del><ins>+ return result.toString();
+ }
+ case CSS_COUNTER_NAME:
+ return "counter(" + String(m_value.string) + ')';
+ case CSS_COUNTER: {
+ StringBuilder result;
+ String separator = m_value.counter->separator();
+ if (separator.isEmpty())
+ result.appendLiteral("counter(");
+ else
+ result.appendLiteral("counters(");
+
+ result.append(m_value.counter->identifier());
+ if (!separator.isEmpty()) {
+ result.appendLiteral(", ");
+ result.append(quoteCSSStringIfNeeded(separator));
</ins><span class="cx"> }
</span><del>- case CSS_COUNTER_NAME:
- text = "counter(" + String(m_value.string) + ')';
- break;
- case CSS_COUNTER: {
- StringBuilder result;
- String separator = m_value.counter->separator();
- if (separator.isEmpty())
- result.appendLiteral("counter(");
- else
- result.appendLiteral("counters(");
</del><ins>+ String listStyle = m_value.counter->listStyle();
+ if (!listStyle.isEmpty()) {
+ result.appendLiteral(", ");
+ result.append(listStyle);
+ }
+ result.append(')');
</ins><span class="cx">
</span><del>- result.append(m_value.counter->identifier());
- if (!separator.isEmpty()) {
- result.appendLiteral(", ");
- result.append(quoteCSSStringIfNeeded(separator));
- }
- String listStyle = m_value.counter->listStyle();
- if (!listStyle.isEmpty()) {
- result.appendLiteral(", ");
- result.append(listStyle);
- }
- result.append(')');
</del><ins>+ return result.toString();
+ }
+ case CSS_RECT:
+ return getRectValue()->cssText();
+ case CSS_QUAD:
+ return getQuadValue()->cssText();
+ case CSS_RGBCOLOR:
+ case CSS_PARSER_HEXCOLOR: {
+ RGBA32 rgbColor = m_value.rgbcolor;
+ if (m_primitiveUnitType == CSS_PARSER_HEXCOLOR)
+ Color::parseHexColor(m_value.string, rgbColor);
+ Color color(rgbColor);
</ins><span class="cx">
</span><del>- text = result.toString();
- break;
- }
- case CSS_RECT:
- text = getRectValue()->cssText();
- break;
- case CSS_QUAD:
- text = getQuadValue()->cssText();
- break;
- case CSS_RGBCOLOR:
- case CSS_PARSER_HEXCOLOR: {
- RGBA32 rgbColor = m_value.rgbcolor;
- if (m_primitiveUnitType == CSS_PARSER_HEXCOLOR)
- Color::parseHexColor(m_value.string, rgbColor);
- Color color(rgbColor);
</del><ins>+ Vector<LChar> result;
+ result.reserveInitialCapacity(32);
+ bool colorHasAlpha = color.hasAlpha();
+ if (colorHasAlpha)
+ result.append("rgba(", 5);
+ else
+ result.append("rgb(", 4);
</ins><span class="cx">
</span><del>- Vector<LChar> result;
- result.reserveInitialCapacity(32);
- bool colorHasAlpha = color.hasAlpha();
- if (colorHasAlpha)
- result.append("rgba(", 5);
- else
- result.append("rgb(", 4);
</del><ins>+ appendNumber(result, static_cast<unsigned char>(color.red()));
+ result.append(", ", 2);
</ins><span class="cx">
</span><del>- appendNumber(result, static_cast<unsigned char>(color.red()));
- result.append(", ", 2);
</del><ins>+ appendNumber(result, static_cast<unsigned char>(color.green()));
+ result.append(", ", 2);
</ins><span class="cx">
</span><del>- appendNumber(result, static_cast<unsigned char>(color.green()));
</del><ins>+ appendNumber(result, static_cast<unsigned char>(color.blue()));
+ if (colorHasAlpha) {
</ins><span class="cx"> result.append(", ", 2);
</span><span class="cx">
</span><del>- appendNumber(result, static_cast<unsigned char>(color.blue()));
- if (colorHasAlpha) {
- result.append(", ", 2);
</del><ins>+ NumberToStringBuffer buffer;
+ const char* alphaString = numberToFixedPrecisionString(color.alpha() / 255.0f, 6, buffer, true);
+ result.append(alphaString, strlen(alphaString));
+ }
</ins><span class="cx">
</span><del>- NumberToStringBuffer buffer;
- const char* alphaString = numberToFixedPrecisionString(color.alpha() / 255.0f, 6, buffer, true);
- result.append(alphaString, strlen(alphaString));
</del><ins>+ result.append(')');
+ return String::adopt(result);
+ }
+ case CSS_PAIR:
+ return getPairValue()->cssText();
+#if ENABLE(DASHBOARD_SUPPORT)
+ case CSS_DASHBOARD_REGION: {
+ StringBuilder result;
+ for (DashboardRegion* region = getDashboardRegionValue(); region; region = region->m_next.get()) {
+ if (!result.isEmpty())
+ result.append(' ');
+ result.appendLiteral("dashboard-region(");
+ result.append(region->m_label);
+ if (region->m_isCircle)
+ result.appendLiteral(" circle");
+ else if (region->m_isRectangle)
+ result.appendLiteral(" rectangle");
+ else
+ break;
+ if (region->top()->m_primitiveUnitType == CSS_VALUE_ID && region->top()->getValueID() == CSSValueInvalid) {
+ ASSERT(region->right()->m_primitiveUnitType == CSS_VALUE_ID);
+ ASSERT(region->bottom()->m_primitiveUnitType == CSS_VALUE_ID);
+ ASSERT(region->left()->m_primitiveUnitType == CSS_VALUE_ID);
+ ASSERT(region->right()->getValueID() == CSSValueInvalid);
+ ASSERT(region->bottom()->getValueID() == CSSValueInvalid);
+ ASSERT(region->left()->getValueID() == CSSValueInvalid);
+ } else {
+ result.append(' ');
+ result.append(region->top()->cssText());
+ result.append(' ');
+ result.append(region->right()->cssText());
+ result.append(' ');
+ result.append(region->bottom()->cssText());
+ result.append(' ');
+ result.append(region->left()->cssText());
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> result.append(')');
</span><del>- text = String::adopt(result);
- break;
</del><span class="cx"> }
</span><del>- case CSS_PAIR:
- text = getPairValue()->cssText();
- break;
-#if ENABLE(DASHBOARD_SUPPORT)
- case CSS_DASHBOARD_REGION: {
- StringBuilder result;
- for (DashboardRegion* region = getDashboardRegionValue(); region; region = region->m_next.get()) {
- if (!result.isEmpty())
- result.append(' ');
- result.appendLiteral("dashboard-region(");
- result.append(region->m_label);
- if (region->m_isCircle)
- result.appendLiteral(" circle");
- else if (region->m_isRectangle)
- result.appendLiteral(" rectangle");
- else
- break;
- if (region->top()->m_primitiveUnitType == CSS_VALUE_ID && region->top()->getValueID() == CSSValueInvalid) {
- ASSERT(region->right()->m_primitiveUnitType == CSS_VALUE_ID);
- ASSERT(region->bottom()->m_primitiveUnitType == CSS_VALUE_ID);
- ASSERT(region->left()->m_primitiveUnitType == CSS_VALUE_ID);
- ASSERT(region->right()->getValueID() == CSSValueInvalid);
- ASSERT(region->bottom()->getValueID() == CSSValueInvalid);
- ASSERT(region->left()->getValueID() == CSSValueInvalid);
- } else {
- result.append(' ');
- result.append(region->top()->cssText());
- result.append(' ');
- result.append(region->right()->cssText());
- result.append(' ');
- result.append(region->bottom()->cssText());
- result.append(' ');
- result.append(region->left()->cssText());
- }
- result.append(')');
- }
- text = result.toString();
- break;
- }
</del><ins>+ return result.toString();
+ }
</ins><span class="cx"> #endif
</span><del>- case CSS_PARSER_OPERATOR: {
- char c = static_cast<char>(m_value.parserOperator);
- text = String(&c, 1U);
- break;
- }
- case CSS_PARSER_IDENTIFIER:
- text = quoteCSSStringIfNeeded(m_value.string);
- break;
- case CSS_CALC:
- text = m_value.calc->cssText();
- break;
- case CSS_SHAPE:
- text = m_value.shape->cssText();
- break;
- case CSS_VW:
- text = formatNumber(m_value.num, "vw");
- break;
- case CSS_VH:
- text = formatNumber(m_value.num, "vh");
- break;
- case CSS_VMIN:
- text = formatNumber(m_value.num, "vmin");
- break;
- case CSS_VMAX:
- text = formatNumber(m_value.num, "vmax");
- break;
</del><ins>+ case CSS_PARSER_OPERATOR: {
+ char c = static_cast<char>(m_value.parserOperator);
+ return String(&c, 1U);
</ins><span class="cx"> }
</span><ins>+ case CSS_PARSER_IDENTIFIER:
+ return quoteCSSStringIfNeeded(m_value.string);
+ case CSS_CALC:
+ return m_value.calc->cssText();
+ case CSS_SHAPE:
+ return m_value.shape->cssText();
+ case CSS_VW:
+ return formatNumberValue("vw");
+ case CSS_VH:
+ return formatNumberValue("vh");
+ case CSS_VMIN:
+ return formatNumberValue("vmin");
+ case CSS_VMAX:
+ return formatNumberValue("vmax");
+ }
+ return String();
+}
</ins><span class="cx">
</span><del>- ASSERT(!cssTextCache().contains(this));
- cssTextCache().set(this, text);
</del><ins>+String CSSPrimitiveValue::customCSSText() const
+{
+ // FIXME: return the original value instead of a generated one (e.g. color
+ // name if it was specified) - check what spec says about this
+
+ CSSTextCache& cssTextCache = WebCore::cssTextCache();
+
+ if (m_hasCachedCSSText) {
+ ASSERT(cssTextCache.contains(this));
+ return cssTextCache.get(this);
+ }
+
+ String text = formatNumberForcustomCSSText();
+
+ ASSERT(!cssTextCache.contains(this));
</ins><span class="cx"> m_hasCachedCSSText = true;
</span><ins>+ cssTextCache.set(this, text);
</ins><span class="cx"> return text;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (169730 => 169731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2014-06-09 23:32:31 UTC (rev 169730)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2014-06-10 00:22:23 UTC (rev 169731)
</span><span class="lines">@@ -378,6 +378,11 @@
</span><span class="cx">
</span><span class="cx"> double computeLengthDouble(const CSSToLengthConversionData&) const;
</span><span class="cx">
</span><ins>+ ALWAYS_INLINE String formatNumberForcustomCSSText() const;
+ template <unsigned characterCount>
+ ALWAYS_INLINE PassRef<StringImpl> formatNumberValue(const char (&characters)[characterCount]) const;
+ NEVER_INLINE PassRef<StringImpl> formatNumberValue(const char* suffix, unsigned suffixLength) const;
+
</ins><span class="cx"> union {
</span><span class="cx"> CSSPropertyID propertyID;
</span><span class="cx"> CSSValueID valueID;
</span></span></pre>
</div>
</div>
</body>
</html>