Index: Source/core/frame/DOMWindow.cpp |
diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp |
index 05d1d218bd2fc9de8af4df4d5e498898b90b7531..8303f2e8eb5f2fc9663d376e52ef2cba16441857 100644 |
--- a/Source/core/frame/DOMWindow.cpp |
+++ b/Source/core/frame/DOMWindow.cpp |
@@ -124,7 +124,7 @@ public: |
{ |
} |
- PassRefPtr<MessageEvent> event() |
+ PassRefPtrWillBeRawPtr<MessageEvent> event() |
{ |
return MessageEvent::create(m_channels.release(), m_message, m_origin, String(), m_source.get()); |
@@ -422,7 +422,7 @@ EventQueue* DOMWindow::eventQueue() const |
return m_eventQueue.get(); |
} |
-void DOMWindow::enqueueWindowEvent(PassRefPtr<Event> event) |
+void DOMWindow::enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event> event) |
{ |
if (!m_eventQueue) |
return; |
@@ -430,7 +430,7 @@ void DOMWindow::enqueueWindowEvent(PassRefPtr<Event> event) |
m_eventQueue->enqueueEvent(event); |
} |
-void DOMWindow::enqueueDocumentEvent(PassRefPtr<Event> event) |
+void DOMWindow::enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event> event) |
{ |
if (!m_eventQueue) |
return; |
@@ -866,7 +866,7 @@ void DOMWindow::postMessageTimerFired(PassOwnPtr<PostMessageTimer> t) |
if (!isCurrentlyDisplayedInFrame()) |
return; |
- RefPtr<MessageEvent> event = timer->event(); |
+ RefPtrWillBeRawPtr<MessageEvent> event = timer->event(); |
// Give the embedder a chance to intercept this postMessage because this |
// DOMWindow might be a proxy for another in browsers that support |
@@ -880,7 +880,7 @@ void DOMWindow::postMessageTimerFired(PassOwnPtr<PostMessageTimer> t) |
dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->stackTrace()); |
} |
-void DOMWindow::dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtr<Event> event, PassRefPtr<ScriptCallStack> stackTrace) |
+void DOMWindow::dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtrWillBeRawPtr<Event> event, PassRefPtr<ScriptCallStack> stackTrace) |
{ |
if (intendedTargetOrigin) { |
// Check target origin now since the target document may have changed since the timer was scheduled. |
@@ -1571,7 +1571,7 @@ bool DOMWindow::removeEventListener(const AtomicString& eventType, EventListener |
void DOMWindow::dispatchLoadEvent() |
{ |
- RefPtr<Event> loadEvent(Event::create(EventTypeNames::load)); |
+ RefPtrWillBeRawPtr<Event> loadEvent(Event::create(EventTypeNames::load)); |
if (m_frame && m_frame->loader().documentLoader() && !m_frame->loader().documentLoader()->timing()->loadEventStart()) { |
// The DocumentLoader (and thus its DocumentLoadTiming) might get destroyed while dispatching |
// the event, so protect it to prevent writing the end time into freed memory. |
@@ -1593,12 +1593,12 @@ void DOMWindow::dispatchLoadEvent() |
InspectorInstrumentation::loadEventFired(frame()); |
} |
-bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget) |
+bool DOMWindow::dispatchEvent(PassRefPtrWillBeRawPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget) |
{ |
ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden()); |
RefPtr<EventTarget> protect = this; |
- RefPtr<Event> event = prpEvent; |
+ RefPtrWillBeRawPtr<Event> event = prpEvent; |
event->setTarget(prpTarget ? prpTarget : this); |
event->setCurrentTarget(this); |