| Index: third_party/WebKit/Source/core/events/EventTarget.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/EventTarget.cpp b/third_party/WebKit/Source/core/events/EventTarget.cpp
|
| index 21ee9c24b355530483f32b3a0e7c5fa8b4407f75..a71150749ef89ec1b135ece4bada79f7624da6c8 100644
|
| --- a/third_party/WebKit/Source/core/events/EventTarget.cpp
|
| +++ b/third_party/WebKit/Source/core/events/EventTarget.cpp
|
| @@ -46,9 +46,11 @@
|
| #include "core/inspector/ConsoleMessage.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "platform/EventDispatchForbiddenScope.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/StdLibExtras.h"
|
| #include "wtf/Threading.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| using namespace WTF;
|
|
|
| @@ -107,7 +109,7 @@ void reportBlockedEvent(ExecutionContext* context, const Event* event, Registere
|
| event->type().getString().utf8().data(), lround(delayedSeconds * 1000));
|
|
|
| v8::Local<v8::Function> function = eventListenerEffectiveFunction(v8Listener->isolate(), handler);
|
| - OwnPtr<SourceLocation> location = SourceLocation::fromFunction(function);
|
| + std::unique_ptr<SourceLocation> location = SourceLocation::fromFunction(function);
|
| ConsoleMessage* message = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, messageText, std::move(location));
|
| context->addConsoleMessage(message);
|
| registeredListener->setBlockedEventWarningEmitted();
|
| @@ -552,7 +554,7 @@ bool EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventList
|
| size_t i = 0;
|
| size_t size = entry.size();
|
| if (!d->firingEventIterators)
|
| - d->firingEventIterators = adoptPtr(new FiringEventIteratorVector);
|
| + d->firingEventIterators = wrapUnique(new FiringEventIteratorVector);
|
| d->firingEventIterators->append(FiringEventIterator(event->type(), i, size));
|
|
|
| double blockedEventThreshold = blockedEventsWarningThreshold(context, event);
|
|
|