Commit bd7533d4 authored by Abhijeet Kandalkar's avatar Abhijeet Kandalkar Committed by Commit Bot

Replace HeapListHashSet with HeapLinkedHashSet in HitRegionManager

ListHashSet is deprecated in favor of LinkedHashSet.

HeapLinkedHashSet's invalidate iterators when the container is
modified.  This does not happen in this usage, so replacement is
simple.

Change-Id: Iea0b4d86c5991b87baf20cd37ebf154c99a8fa64
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637002Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Commit-Queue: Abhijeet Kandalkar <abhijeet@igalia.com>
Cr-Commit-Position: refs/heads/master@{#665217}
parent a51b0e4f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "third_party/blink/renderer/modules/canvas/canvas2d/hit_region_options.h" #include "third_party/blink/renderer/modules/canvas/canvas2d/hit_region_options.h"
#include "third_party/blink/renderer/platform/graphics/path.h" #include "third_party/blink/renderer/platform/graphics/path.h"
#include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/heap/handle.h"
#include "third_party/blink/renderer/platform/wtf/linked_hash_set.h"
namespace blink { namespace blink {
...@@ -36,9 +37,11 @@ class HitRegion final : public GarbageCollectedFinalized<HitRegion> { ...@@ -36,9 +37,11 @@ class HitRegion final : public GarbageCollectedFinalized<HitRegion> {
WindRule fill_rule_; WindRule fill_rule_;
}; };
class HitRegionManager final : public GarbageCollected<HitRegionManager> { class HitRegionManager final
: public GarbageCollectedFinalized<HitRegionManager> {
public: public:
HitRegionManager() = default; HitRegionManager() = default;
~HitRegionManager() {}
void AddHitRegion(HitRegion*); void AddHitRegion(HitRegion*);
...@@ -57,7 +60,7 @@ class HitRegionManager final : public GarbageCollected<HitRegionManager> { ...@@ -57,7 +60,7 @@ class HitRegionManager final : public GarbageCollected<HitRegionManager> {
void Trace(blink::Visitor*); void Trace(blink::Visitor*);
private: private:
typedef HeapListHashSet<Member<HitRegion>> HitRegionList; typedef HeapLinkedHashSet<Member<HitRegion>> HitRegionList;
typedef HitRegionList::const_reverse_iterator HitRegionIterator; typedef HitRegionList::const_reverse_iterator HitRegionIterator;
typedef HeapHashMap<String, Member<HitRegion>> HitRegionIdMap; typedef HeapHashMap<String, Member<HitRegion>> HitRegionIdMap;
typedef HeapHashMap<Member<const Element>, Member<HitRegion>> typedef HeapHashMap<Member<const Element>, Member<HitRegion>>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment