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

Unified Diff: Source/core/html/HTMLFrameOwnerElement.h

Issue 23983034: [oilpan] Handlify Node raw pointers in html/ and subclasses of dom/LiveNodeList. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLFormControlsCollection.cpp ('k') | Source/core/html/HTMLNameCollection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLFrameOwnerElement.h
diff --git a/Source/core/html/HTMLFrameOwnerElement.h b/Source/core/html/HTMLFrameOwnerElement.h
index 17fb797adbc6f197aee5af03e8aae248a6c18069..8c68dc0832bf2c36fbe342111b6b961d67bfd42f 100644
--- a/Source/core/html/HTMLFrameOwnerElement.h
+++ b/Source/core/html/HTMLFrameOwnerElement.h
@@ -81,8 +81,9 @@ inline Result<HTMLFrameOwnerElement> toFrameOwnerElement(const Handle<Node>& nod
}
class SubframeLoadingDisabler {
+ DISALLOW_ALLOCATION()
public:
- explicit SubframeLoadingDisabler(Node* root)
+ explicit SubframeLoadingDisabler(const Handle<Node>& root)
: m_root(root)
{
disabledSubtreeRoots().add(m_root);
@@ -95,7 +96,8 @@ public:
static bool canLoadFrame(const Handle<HTMLFrameOwnerElement>& owner)
{
- for (Node* node = owner.raw(); node; node = node->parentOrShadowHostNode().handle().raw()) {
+ for (Handle<Node> node = owner; node; node = node->parentOrShadowHostNode()) {
+ HandleScope scope;
if (disabledSubtreeRoots().contains(node))
return false;
}
@@ -103,13 +105,14 @@ public:
}
private:
- static HashSet<Node*>& disabledSubtreeRoots()
+ static HashSet<Member<Node> >& disabledSubtreeRoots()
{
- DEFINE_STATIC_LOCAL(HashSet<Node*>, nodes, ());
+ // All nodes in the collection are traced individually (via m_root).
haraken 2013/09/12 20:08:14 This observation looks correct, but it's a bit fra
+ DEFINE_STATIC_LOCAL(HashSet<Member<Node> >, nodes, ());
return nodes;
}
- Node* m_root;
+ Handle<Node> m_root;
};
} // namespace WebCore
« no previous file with comments | « Source/core/html/HTMLFormControlsCollection.cpp ('k') | Source/core/html/HTMLNameCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698