Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: Source/core/dom/ElementDataCache.cpp

Issue 273843003: [Oilpan]: Make StylePropertySet fully garbage collected. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix mac build Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, 2013 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2012, 2013 Apple Inc. 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 25 matching lines...) Expand all
36 return StringHasher::hashMemory(attributes.data(), attributes.size() * sizeo f(Attribute)); 36 return StringHasher::hashMemory(attributes.data(), attributes.size() * sizeo f(Attribute));
37 } 37 }
38 38
39 inline bool hasSameAttributes(const Vector<Attribute>& attributes, ShareableElem entData& elementData) 39 inline bool hasSameAttributes(const Vector<Attribute>& attributes, ShareableElem entData& elementData)
40 { 40 {
41 if (attributes.size() != elementData.length()) 41 if (attributes.size() != elementData.length())
42 return false; 42 return false;
43 return !memcmp(attributes.data(), elementData.m_attributeArray, attributes.s ize() * sizeof(Attribute)); 43 return !memcmp(attributes.data(), elementData.m_attributeArray, attributes.s ize() * sizeof(Attribute));
44 } 44 }
45 45
46 PassRefPtr<ShareableElementData> ElementDataCache::cachedShareableElementDataWit hAttributes(const Vector<Attribute>& attributes) 46 PassRefPtrWillBeRawPtr<ShareableElementData> ElementDataCache::cachedShareableEl ementDataWithAttributes(const Vector<Attribute>& attributes)
47 { 47 {
48 ASSERT(!attributes.isEmpty()); 48 ASSERT(!attributes.isEmpty());
49 49
50 ShareableElementDataCache::ValueType* it = m_shareableElementDataCache.add(a ttributeHash(attributes), nullptr).storedValue; 50 ShareableElementData* elementData = m_shareableElementDataCache.get(attribut eHash(attributes));
51
52 // FIXME: This prevents sharing when there's a hash collision. 51 // FIXME: This prevents sharing when there's a hash collision.
53 if (it->value && !hasSameAttributes(attributes, *it->value)) 52 if (elementData && !hasSameAttributes(attributes, *elementData))
54 return ShareableElementData::createWithAttributes(attributes); 53 return ShareableElementData::createWithAttributes(attributes);
55 54
56 if (!it->value) 55 if (!elementData)
57 it->value = ShareableElementData::createWithAttributes(attributes); 56 elementData = m_shareableElementDataCache.set(attributeHash(attributes), ShareableElementData::createWithAttributes(attributes)).storedValue->value.get( );
esprehn 2014/05/14 20:25:27 You make us do two hash lookups now instead of one
wibling-chromium 2014/05/15 13:15:18 The reason is that the createWithAttributes call m
58 57 ASSERT(elementData);
59 return it->value.get(); 58 return elementData;
60 } 59 }
61 60
62 ElementDataCache::ElementDataCache() 61 ElementDataCache::ElementDataCache()
63 { 62 {
64 } 63 }
65 64
66 ElementDataCache::~ElementDataCache() 65 ElementDataCache::~ElementDataCache()
67 { 66 {
68 } 67 }
69 68
70 } 69 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698