diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp')
| -rw-r--r-- | Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp index f6e3db39b..93d4e4538 100644 --- a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp +++ b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp @@ -32,6 +32,7 @@ #include "StyledElement.h" #include "UndoManager.h" #include "WebCoreMemoryInstrumentation.h" +#include <wtf/MemoryInstrumentationHashMap.h> using namespace std; @@ -173,8 +174,7 @@ void PropertySetCSSStyleDeclaration::reportMemoryUsage(MemoryObjectInfo* memoryO { MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addMember(m_propertySet); - if (m_cssomCSSValueClones) - info.addInstrumentedMapEntries(*m_cssomCSSValueClones); + info.addMember(m_cssomCSSValueClones); } unsigned PropertySetCSSStyleDeclaration::length() const @@ -346,7 +346,7 @@ CSSValue* PropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM(CSSValue* intern if (!m_cssomCSSValueClones) m_cssomCSSValueClones = adoptPtr(new HashMap<CSSValue*, RefPtr<CSSValue> >); - RefPtr<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, RefPtr<CSSValue>()).iterator->second; + RefPtr<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, RefPtr<CSSValue>()).iterator->value; if (!clonedValue) clonedValue = internalValue->cloneForCSSOM(); return clonedValue.get(); |