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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp b/third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp
index 2603c72878d70577d1610c1e0b69d5bb0cc1e390..8d17b745d9dea3b4807d8f19794e8c6d3c80933a 100644
--- a/third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerEventQueue.cpp
@@ -33,9 +33,9 @@
namespace blink {
-PassOwnPtrWillBeRawPtr<WorkerEventQueue> WorkerEventQueue::create(ExecutionContext* context)
+RawPtr<WorkerEventQueue> WorkerEventQueue::create(ExecutionContext* context)
{
- return adoptPtrWillBeNoop(new WorkerEventQueue(context));
+ return new WorkerEventQueue(context);
}
WorkerEventQueue::WorkerEventQueue(ExecutionContext* context)
@@ -60,7 +60,7 @@ DEFINE_TRACE(WorkerEventQueue)
class WorkerEventQueue::EventDispatcherTask : public ExecutionContextTask {
public:
- static PassOwnPtr<EventDispatcherTask> create(PassRefPtrWillBeRawPtr<Event> event, WorkerEventQueue* eventQueue)
+ static PassOwnPtr<EventDispatcherTask> create(RawPtr<Event> event, WorkerEventQueue* eventQueue)
{
return adoptPtr(new EventDispatcherTask(event, eventQueue));
}
@@ -71,13 +71,13 @@ public:
m_eventQueue->removeEvent(m_event.get());
}
- void dispatchEvent(ExecutionContext*, PassRefPtrWillBeRawPtr<Event> prpEvent)
+ void dispatchEvent(ExecutionContext*, RawPtr<Event> prpEvent)
{
- // Stash the event on the stack in a RefPtrWillBeRawPtr; trying to do this
+ // Stash the event on the stack in a RawPtr; trying to do this
// in a single line causes an optimization bug with MSVC. MSVC generates code
- // that passes the event arg (forcing PassRefPtrWillBeRawPtr to be released)
+ // that passes the event arg (forcing RawPtr to be released)
// before the target is queried.
- RefPtrWillBeRawPtr<Event> event = prpEvent;
+ RawPtr<Event> event = prpEvent;
event->target()->dispatchEvent(event);
}
@@ -97,15 +97,15 @@ public:
}
private:
- EventDispatcherTask(PassRefPtrWillBeRawPtr<Event> event, WorkerEventQueue* eventQueue)
+ EventDispatcherTask(RawPtr<Event> event, WorkerEventQueue* eventQueue)
: m_event(event)
, m_eventQueue(eventQueue)
, m_isCancelled(false)
{
}
- RefPtrWillBePersistent<Event> m_event;
- RawPtrWillBePersistent<WorkerEventQueue> m_eventQueue;
+ Persistent<Event> m_event;
+ Persistent<WorkerEventQueue> m_eventQueue;
bool m_isCancelled;
};
@@ -115,11 +115,11 @@ void WorkerEventQueue::removeEvent(Event* event)
m_eventTaskMap.remove(event);
}
-bool WorkerEventQueue::enqueueEvent(PassRefPtrWillBeRawPtr<Event> prpEvent)
+bool WorkerEventQueue::enqueueEvent(RawPtr<Event> prpEvent)
{
if (m_isClosed)
return false;
- RefPtrWillBeRawPtr<Event> event = prpEvent;
+ RawPtr<Event> event = prpEvent;
InspectorInstrumentation::didEnqueueEvent(event->target(), event.get());
OwnPtr<EventDispatcherTask> task = EventDispatcherTask::create(event, this);
m_eventTaskMap.add(event.release(), task.get());
« no previous file with comments | « third_party/WebKit/Source/core/workers/WorkerEventQueue.h ('k') | third_party/WebKit/Source/core/workers/WorkerGlobalScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698