diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebCore/css/CSSTimingFunctionValue.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebCore/css/CSSTimingFunctionValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSTimingFunctionValue.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/Source/WebCore/css/CSSTimingFunctionValue.cpp b/Source/WebCore/css/CSSTimingFunctionValue.cpp index 9abb19e69..e1bb1d126 100644 --- a/Source/WebCore/css/CSSTimingFunctionValue.cpp +++ b/Source/WebCore/css/CSSTimingFunctionValue.cpp @@ -26,8 +26,8 @@ #include "config.h" #include "CSSTimingFunctionValue.h" -#include "MemoryInstrumentation.h" -#include "PlatformString.h" +#include "WebCoreMemoryInstrumentation.h" +#include <wtf/text/WTFString.h> namespace WebCore { @@ -38,41 +38,31 @@ String CSSLinearTimingFunctionValue::customCssText() const void CSSLinearTimingFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); } String CSSCubicBezierTimingFunctionValue::customCssText() const { - String text("cubic-bezier("); - text += String::number(m_x1); - text += ", "; - text += String::number(m_y1); - text += ", "; - text += String::number(m_x2); - text += ", "; - text += String::number(m_y2); - text += ")"; - return text; + return "cubic-bezier(" + + String::number(m_x1) + ", " + + String::number(m_y1) + ", " + + String::number(m_x2) + ", " + + String::number(m_y2) + ")"; } void CSSCubicBezierTimingFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); } String CSSStepsTimingFunctionValue::customCssText() const { - String text("steps("); - text += String::number(m_steps); - text += ", "; - text += m_stepAtStart ? "start" : "end"; - text += ")"; - return text; + return "steps(" + String::number(m_steps) + ", " + (m_stepAtStart ? "start" : "end") + ')'; } void CSSStepsTimingFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); } } // namespace WebCore |