From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebCore/css/CSSTimingFunctionValue.cpp | 32 +++++++++------------------ 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'Source/WebCore/css/CSSTimingFunctionValue.cpp') 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 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 -- cgit v1.2.1