[Oilpan] Apply RefCountedGarbageCollectedEventTarget on AbstractWorker

Source/modules/serviceworkers/ServiceWorkerContainer.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
 #include "modules/ModulesExport.h"
 #include "modules/serviceworkers/RegistrationOptions.h"
 #include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"

[sof, 2015/08/14 06:17:55]

nit: wtf/ includes in header files involved in this CL can be trimmed a bit.

[peria, 2015/08/14 07:36:14]

Done.
I may still have some #include which can be removed, though.

 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class ExecutionContext;
 class WebServiceWorker;
 class WebServiceWorkerProvider;
 class WebServiceWorkerRegistration;
 
 class MODULES_EXPORT ServiceWorkerContainer final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerContainer>
     , public ContextLifecycleObserver
     , public WebServiceWorkerProviderClient {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(ServiceWorkerContainer);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerContainer);
 public:
     static ServiceWorkerContainer* create(ExecutionContext*);
     ~ServiceWorkerContainer();
 
     void willBeDetachedFromFrame();
 
     DECLARE_VIRTUAL_TRACE();
 
-    PassRefPtrWillBeRawPtr<ServiceWorker> controller() { return m_controller.get(); }
+    ServiceWorker* controller() { return m_controller; }
     ScriptPromise ready(ScriptState*);
     WebServiceWorkerProvider* provider() { return m_provider; }
 
     ScriptPromise registerServiceWorker(ScriptState*, const String& pattern, const RegistrationOptions&);
     ScriptPromise getRegistration(ScriptState*, const String& documentURL);
     ScriptPromise getRegistrations(ScriptState*);
 
     // WebServiceWorkerProviderClient overrides.
     void setController(WebServiceWorker*, bool shouldNotifyControllerChange) override;
     void dispatchMessageEvent(WebServiceWorker*, const WebString& message, const WebMessagePortChannelArray&) override;
 
     // EventTarget overrides.
     ExecutionContext* executionContext() const override { return ContextLifecycleObserver::executionContext(); }
     const AtomicString& interfaceName() const override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(controllerchange);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
 
 private:
     explicit ServiceWorkerContainer(ExecutionContext*);
 
     class GetRegistrationForReadyCallback;
     typedef ScriptPromiseProperty<Member<ServiceWorkerContainer>, Member<ServiceWorkerRegistration>, Member<ServiceWorkerRegistration>> ReadyProperty;
     ReadyProperty* createReadyProperty();
 
     WebServiceWorkerProvider* m_provider;
-    RefPtrWillBeMember<ServiceWorker> m_controller;
+    Member<ServiceWorker> m_controller;
     Member<ReadyProperty> m_ready;
 };
 
 } // namespace blink
 
 #endif // ServiceWorkerContainer_h