Clean up WebDOMEvent ownership of WebCore::Event.

Source/WebKit/chromium/src/WebDOMEvent.cpp

Index: Source/WebKit/chromium/src/WebDOMEvent.cpp
diff --git a/Source/WebKit/chromium/src/WebDOMEvent.cpp b/Source/WebKit/chromium/src/WebDOMEvent.cpp
index f72170cfa7eaba433ee127f0ee941985b5a965ec..9dfb6a0e3d918a9266132a3b7a94f804b9fe0681 100644
--- a/Source/WebKit/chromium/src/WebDOMEvent.cpp
+++ b/Source/WebKit/chromium/src/WebDOMEvent.cpp
@@ -50,165 +50,154 @@ void WebDOMEvent::reset()
 
 void WebDOMEvent::assign(const WebDOMEvent& other)
 {
-    WebDOMEventPrivate* p = const_cast<WebDOMEventPrivate*>(other.m_private);
-    if (p)
-        p->ref();
-    assign(p);
-}
-
-void WebDOMEvent::assign(WebDOMEventPrivate* p)
-{
-    // p is already ref'd for us by the caller
-    if (m_private)
-        m_private->deref();
-    m_private = p;
+    m_private = other.m_private;
 }
 
 WebDOMEvent::WebDOMEvent(const WTF::PassRefPtr<WebCore::Event>& event)
-    : m_private(static_cast<WebDOMEventPrivate*>(event.leakRef()))
+    : m_private(event)
 {
 }
 
 WebDOMEvent::operator WTF::PassRefPtr<WebCore::Event>() const
 {
-    return static_cast<WebCore::Event*>(m_private);
+    return m_private.get();
 }
 
 WebString WebDOMEvent::type() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());

[dmichael (off chromium), 2013/05/20 22:35:49]

If you think it would be better, I could add an appropriate operator for
evaluating WebPrivatePtr in a boolean expression.

[abarth-chromium, 2013/05/20 22:54:50]

IMHO, this is fine.

     return m_private->type();
 }
 
 WebNode WebDOMEvent::target() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return WebNode(m_private->target()->toNode());
 }
 
 WebNode WebDOMEvent::currentTarget() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return WebNode(m_private->currentTarget()->toNode());
 }
 
 WebDOMEvent::PhaseType WebDOMEvent::eventPhase() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return static_cast<WebDOMEvent::PhaseType>(m_private->eventPhase());
 }
 
 bool WebDOMEvent::bubbles() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->bubbles();
 }
 
 bool WebDOMEvent::cancelable() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->cancelable();
 }
 
 bool WebDOMEvent::isUIEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isUIEvent();
 }
 
 bool WebDOMEvent::isMouseEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isMouseEvent();
 }
 
 bool WebDOMEvent::isKeyboardEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isKeyboardEvent();
 }
 
 bool WebDOMEvent::isMutationEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(WebCore::eventNames().interfaceForMutationEvent);
 }
 
 bool WebDOMEvent::isTextEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForTextEvent);
 }
 
 bool WebDOMEvent::isCompositionEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForCompositionEvent);
 }
 
 bool WebDOMEvent::isDragEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isDragEvent();
 }
 
 bool WebDOMEvent::isClipboardEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isClipboardEvent();
 }
 
 bool WebDOMEvent::isMessageEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForMessageEvent);
 }
 
 bool WebDOMEvent::isWheelEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForWheelEvent);
 }
 
 bool WebDOMEvent::isBeforeTextInsertedEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->isBeforeTextInsertedEvent();
 }
 
 bool WebDOMEvent::isOverflowEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForOverflowEvent);
 }
 
 bool WebDOMEvent::isPageTransitionEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForPageTransitionEvent);
 }
 
 bool WebDOMEvent::isPopStateEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForPopStateEvent);
 }
 
 bool WebDOMEvent::isProgressEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForProgressEvent);
 }
 
 bool WebDOMEvent::isXMLHttpRequestProgressEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForXMLHttpRequestProgressEvent);
 }
 
 bool WebDOMEvent::isBeforeLoadEvent() const
 {
-    ASSERT(m_private);
+    ASSERT(m_private.get());
     return m_private->hasInterface(eventNames().interfaceForBeforeLoadEvent);
 }