| Index: third_party/WebKit/Source/core/events/NodeEventContext.h
|
| diff --git a/third_party/WebKit/Source/core/events/NodeEventContext.h b/third_party/WebKit/Source/core/events/NodeEventContext.h
|
| index b3588cc385db0ad05d7e044af78d69634975e52e..29bdf640b29ddcb684b6c41d9d4a1901cfd21a33 100644
|
| --- a/third_party/WebKit/Source/core/events/NodeEventContext.h
|
| +++ b/third_party/WebKit/Source/core/events/NodeEventContext.h
|
| @@ -40,15 +40,14 @@ class TouchEventContext;
|
|
|
| class CORE_EXPORT NodeEventContext {
|
| DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NodeEventContext);
|
| public:
|
| // FIXME: Use ContainerNode instead of Node.
|
| - NodeEventContext(PassRefPtrWillBeRawPtr<Node>, PassRefPtrWillBeRawPtr<EventTarget> currentTarget);
|
| + NodeEventContext(RawPtr<Node>, RawPtr<EventTarget> currentTarget);
|
| DECLARE_TRACE();
|
|
|
| Node* node() const { return m_node.get(); }
|
|
|
| - void setTreeScopeEventContext(PassRefPtrWillBeRawPtr<TreeScopeEventContext> prpTreeScopeEventContext) { m_treeScopeEventContext = prpTreeScopeEventContext; }
|
| + void setTreeScopeEventContext(RawPtr<TreeScopeEventContext> prpTreeScopeEventContext) { m_treeScopeEventContext = prpTreeScopeEventContext; }
|
| TreeScopeEventContext& treeScopeEventContext() { ASSERT(m_treeScopeEventContext); return *m_treeScopeEventContext; }
|
|
|
| EventTarget* target() const { return m_treeScopeEventContext->target(); }
|
| @@ -59,9 +58,9 @@ public:
|
| void handleLocalEvents(Event&) const;
|
|
|
| private:
|
| - RefPtrWillBeMember<Node> m_node;
|
| - RefPtrWillBeMember<EventTarget> m_currentTarget;
|
| - RefPtrWillBeMember<TreeScopeEventContext> m_treeScopeEventContext;
|
| + Member<Node> m_node;
|
| + Member<EventTarget> m_currentTarget;
|
| + Member<TreeScopeEventContext> m_treeScopeEventContext;
|
| };
|
|
|
| } // namespace blink
|
|
|