diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/css/WebKitCSSMixFunctionValue.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/css/WebKitCSSMixFunctionValue.cpp')
| -rw-r--r-- | Source/WebCore/css/WebKitCSSMixFunctionValue.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/WebCore/css/WebKitCSSMixFunctionValue.cpp b/Source/WebCore/css/WebKitCSSMixFunctionValue.cpp index 3af687e76..0f51ffd83 100644 --- a/Source/WebCore/css/WebKitCSSMixFunctionValue.cpp +++ b/Source/WebCore/css/WebKitCSSMixFunctionValue.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. + * Copyright (C) 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +31,6 @@ #include "config.h" #include "WebKitCSSMixFunctionValue.h" -#include "WebCoreMemoryInstrumentation.h" - #if ENABLE(CSS_SHADERS) namespace WebCore { @@ -48,7 +47,7 @@ WebKitCSSMixFunctionValue::WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionV String WebKitCSSMixFunctionValue::customCssText() const { - return "mix(" + CSSValueList::customCssText() + ")"; + return "mix(" + CSSValueList::customCssText() + ')'; } PassRefPtr<WebKitCSSMixFunctionValue> WebKitCSSMixFunctionValue::cloneForCSSOM() const @@ -56,10 +55,9 @@ PassRefPtr<WebKitCSSMixFunctionValue> WebKitCSSMixFunctionValue::cloneForCSSOM() return adoptRef(new WebKitCSSMixFunctionValue(*this)); } -void WebKitCSSMixFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool WebKitCSSMixFunctionValue::equals(const WebKitCSSMixFunctionValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo); + return CSSValueList::equals(other); } } // namespace WebCore |