Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / serviceworkers / NavigatorServiceWorker.h

diff --git a/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h b/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
index c81d8c9..c1f7471 100644 (file)
--- a/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
+++ b/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
@@ -15,10 +15,10 @@ class Document;
 class Navigator;
 class ServiceWorkerContainer;
 
-class NavigatorServiceWorker FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorServiceWorker>, public WillBeHeapSupplement<Navigator>, DOMWindowProperty {
+class NavigatorServiceWorker FINAL : public NoBaseWillBeGarbageCollected<NavigatorServiceWorker>, public WillBeHeapSupplement<Navigator>, DOMWindowProperty {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
+    DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorServiceWorker);
 public:
-    virtual ~NavigatorServiceWorker();
     static NavigatorServiceWorker* from(Document&);
     static NavigatorServiceWorker& from(Navigator&);
     static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&);
@@ -35,7 +35,7 @@ private:
     // DOMWindowProperty override.
     virtual void willDetachGlobalObjectFromFrame() OVERRIDE;
 
-    RefPtrWillBeMember<ServiceWorkerContainer> m_serviceWorker;
+    PersistentWillBeMember<ServiceWorkerContainer> m_serviceWorker;
 };
 
 } // namespace blink