| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 21 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR |
| 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |
| 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 * SUCH DAMAGE. | 27 * SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/css/WebKitCSSMixFunctionValue.h" | 31 #include "core/css/CSSMixFunctionValue.h" |
| 32 | 32 |
| 33 #include "core/dom/WebCoreMemoryInstrumentation.h" | 33 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 34 | 34 |
| 35 namespace WebCore { | 35 namespace WebCore { |
| 36 | 36 |
| 37 WebKitCSSMixFunctionValue::WebKitCSSMixFunctionValue() | 37 CSSMixFunctionValue::CSSMixFunctionValue() |
| 38 : CSSValueList(WebKitCSSMixFunctionValueClass, SpaceSeparator) | 38 : CSSValueList(CSSMixFunctionValueClass, SpaceSeparator) |
| 39 { | 39 { |
| 40 } | 40 } |
| 41 | 41 |
| 42 WebKitCSSMixFunctionValue::WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionV
alue& cloneFrom) | 42 CSSMixFunctionValue::CSSMixFunctionValue(const CSSMixFunctionValue& cloneFrom) |
| 43 : CSSValueList(cloneFrom) | 43 : CSSValueList(cloneFrom) |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 String WebKitCSSMixFunctionValue::customCssText() const | 47 String CSSMixFunctionValue::customCssText() const |
| 48 { | 48 { |
| 49 return "mix(" + CSSValueList::customCssText() + ")"; | 49 return "mix(" + CSSValueList::customCssText() + ")"; |
| 50 } | 50 } |
| 51 | 51 |
| 52 PassRefPtr<WebKitCSSMixFunctionValue> WebKitCSSMixFunctionValue::cloneForCSSOM()
const | 52 PassRefPtr<CSSMixFunctionValue> CSSMixFunctionValue::cloneForCSSOM() const |
| 53 { | 53 { |
| 54 return adoptRef(new WebKitCSSMixFunctionValue(*this)); | 54 return adoptRef(new CSSMixFunctionValue(*this)); |
| 55 } | 55 } |
| 56 | 56 |
| 57 bool WebKitCSSMixFunctionValue::equals(const WebKitCSSMixFunctionValue& other) c
onst | 57 bool CSSMixFunctionValue::equals(const CSSMixFunctionValue& other) const |
| 58 { | 58 { |
| 59 return CSSValueList::equals(other); | 59 return CSSValueList::equals(other); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void WebKitCSSMixFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* me
moryObjectInfo) const | 62 void CSSMixFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryOb
jectInfo) const |
| 63 { | 63 { |
| 64 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); | 64 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); |
| 65 CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo); | 65 CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace WebCore | 68 } // namespace WebCore |
| 69 | 69 |
| OLD | NEW |