Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
index 23044943e9b75913ed959e103ae345f34bb62ae2..6e9a63762a6e5e319ab95e4ad4ca7c78ba91ca00 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
@@ -45,7 +45,7 @@ static WidgetToParentMap& widgetNewParentMap() |
return map; |
} |
-typedef HeapHashSet<Member<Widget>> WidgetSet; |
+using WidgetSet = HeapHashSet<Member<Widget>>; |
static WidgetSet& widgetsPendingTemporaryRemovalFromParent() |
{ |
// Widgets in this set will not leak because it will be cleared in |
@@ -54,9 +54,9 @@ static WidgetSet& widgetsPendingTemporaryRemovalFromParent() |
return set; |
} |
-HeapHashCountedSet<Member<Node>>& SubframeLoadingDisabler::disabledSubtreeRoots() |
+SubframeLoadingDisabler::SubtreeRootSet& SubframeLoadingDisabler::disabledSubtreeRoots() |
{ |
- DEFINE_STATIC_LOCAL(HeapHashCountedSet<Member<Node>>, nodes, (new HeapHashCountedSet<Member<Node>>)); |
+ DEFINE_STATIC_LOCAL(SubtreeRootSet, nodes, (new SubtreeRootSet)); |
return nodes; |
} |