diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/css/CSSFunctionValue.cpp | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/css/CSSFunctionValue.cpp')
| -rw-r--r-- | WebCore/css/CSSFunctionValue.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/WebCore/css/CSSFunctionValue.cpp b/WebCore/css/CSSFunctionValue.cpp index 0fc260d..70e8174 100644 --- a/WebCore/css/CSSFunctionValue.cpp +++ b/WebCore/css/CSSFunctionValue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Apple Inc. All Rights Reserved. + * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,15 +25,17 @@ #include "config.h" #include "CSSFunctionValue.h" + #include "CSSValueList.h" +#include <wtf/PassOwnPtr.h> namespace WebCore { CSSFunctionValue::CSSFunctionValue(CSSParserFunction* function) + : m_name(function->name) { - m_name = function->name; if (function->args) - m_args = CSSValueList::createFromParserValueList(function->args); + m_args = CSSValueList::createFromParserValueList(function->args.get()); } CSSFunctionValue::~CSSFunctionValue() @@ -58,7 +60,8 @@ CSSParserValue CSSFunctionValue::parserValue() const val.function = new CSSParserFunction; val.function->name.characters = const_cast<UChar*>(m_name.characters()); val.function->name.length = m_name.length(); - val.function->args = m_args ? m_args->createParserValueList() : 0; + if (m_args) + val.function->args = m_args->createParserValueList(); return val; } |