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

Unified Diff: Source/core/inspector/InspectorDOMDebuggerAgent.cpp

Issue 1238083002: Oilpan: Move the EventListener hierarchy to Oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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
Index: Source/core/inspector/InspectorDOMDebuggerAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
index f1f87533978ec3492112abe42aaf1b2019fe2010..516742368dde99160699eaf6b6db9f50d7f0ee78 100644
--- a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
+++ b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
@@ -371,7 +371,7 @@ void InspectorDOMDebuggerAgent::getEventListeners(ErrorString* errorString, cons
}
listenersArray = TypeBuilder::Array<TypeBuilder::DOMDebugger::EventListener>::create();
- Vector<EventListenerInfo> eventInformation;
+ WillBeHeapVector<EventListenerInfo> eventInformation;
EventListenerInfo::getEventListeners(target, eventInformation, false);
if (eventInformation.isEmpty())
return;
@@ -388,14 +388,15 @@ void InspectorDOMDebuggerAgent::getEventListeners(ErrorString* errorString, cons
PassRefPtr<TypeBuilder::DOMDebugger::EventListener> InspectorDOMDebuggerAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, EventTarget* target, const String& objectGroupId)
{
- RefPtr<EventListener> eventListener = registeredEventListener.listener;
+ EventListener* eventListener = registeredEventListener.listener.get();
+ RefPtrWillBeRawPtr<EventListener> protect(eventListener);
String scriptId;
int lineNumber;
int columnNumber;
ExecutionContext* context = target->executionContext();
if (!context)
return nullptr;
- if (!eventListenerHandlerLocation(context, eventListener.get(), scriptId, lineNumber, columnNumber))
+ if (!eventListenerHandlerLocation(context, eventListener, scriptId, lineNumber, columnNumber))
return nullptr;
RefPtr<TypeBuilder::Debugger::Location> location = TypeBuilder::Debugger::Location::create()
@@ -407,7 +408,7 @@ PassRefPtr<TypeBuilder::DOMDebugger::EventListener> InspectorDOMDebuggerAgent::b
.setUseCapture(registeredEventListener.useCapture)
.setLocation(location);
if (!objectGroupId.isEmpty())
- value->setHandler(eventHandlerObject(context, eventListener.get(), m_injectedScriptManager, &objectGroupId));
+ value->setHandler(eventHandlerObject(context, eventListener, m_injectedScriptManager, &objectGroupId));
return value.release();
}

Powered by Google App Engine
This is Rietveld 408576698