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

Unified Diff: Source/core/events/TreeScopeEventContext.h

Issue 336463002: Oilpan: Improve Oilpan support in EventContext and EventPath. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/events/NodeEventContext.cpp ('k') | Source/core/events/TreeScopeEventContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/events/TreeScopeEventContext.h
diff --git a/Source/core/events/TreeScopeEventContext.h b/Source/core/events/TreeScopeEventContext.h
index fef6c1bb56d65035342388c95054c89e414c26a3..ea51a6a40328518ad5e07599a35ff39dd6ebf0aa 100644
--- a/Source/core/events/TreeScopeEventContext.h
+++ b/Source/core/events/TreeScopeEventContext.h
@@ -43,12 +43,13 @@ class Node;
class TouchEventContext;
class TreeScope;
-class TreeScopeEventContext : public RefCounted<TreeScopeEventContext> {
+class TreeScopeEventContext : public RefCountedWillBeGarbageCollected<TreeScopeEventContext> {
haraken 2014/06/12 05:51:43 Add FINAL.
tkent 2014/06/12 06:24:48 Done.
+ DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(TreeScopeEventContext);
public:
- static PassRefPtr<TreeScopeEventContext> create(TreeScope&);
- ~TreeScopeEventContext();
+ static PassRefPtrWillBeRawPtr<TreeScopeEventContext> create(TreeScope&);
+ void trace(Visitor*);
- TreeScope& treeScope() const { return m_treeScope; }
+ TreeScope& treeScope() const { return *m_treeScope; }
EventTarget* target() const { return m_target.get(); }
void setTarget(PassRefPtrWillBeRawPtr<EventTarget>);
@@ -75,13 +76,13 @@ private:
bool isUnreachableNode(EventTarget&);
#endif
- TreeScope& m_treeScope;
- RefPtrWillBePersistent<EventTarget> m_target;
- RefPtrWillBePersistent<EventTarget> m_relatedTarget;
- RefPtrWillBePersistent<NodeList> m_eventPath;
- RefPtrWillBePersistent<TouchEventContext> m_touchEventContext;
+ RawPtrWillBeMember<TreeScope> m_treeScope;
+ RefPtrWillBeMember<EventTarget> m_target;
+ RefPtrWillBeMember<EventTarget> m_relatedTarget;
+ RefPtrWillBeMember<NodeList> m_eventPath;
+ RefPtrWillBeMember<TouchEventContext> m_touchEventContext;
- Vector<TreeScopeEventContext*> m_children;
+ WillBeHeapVector<RawPtrWillBeMember<TreeScopeEventContext> > m_children;
int m_preOrder;
int m_postOrder;
};
@@ -90,7 +91,7 @@ private:
inline bool TreeScopeEventContext::isUnreachableNode(EventTarget& target)
{
// FIXME: Checks also for SVG elements.
- return target.toNode() && !target.toNode()->isSVGElement() && !target.toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(m_treeScope);
+ return target.toNode() && !target.toNode()->isSVGElement() && !target.toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope());
}
#endif
« no previous file with comments | « Source/core/events/NodeEventContext.cpp ('k') | Source/core/events/TreeScopeEventContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698