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

Side by Side Diff: Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Issue 552733003: Oilpan: make DOMWindowProperty a GC mixin. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Pacify GC plugin wrt LocalDOMWindow::trace() Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/serviceworkers/NavigatorServiceWorker.h" 6 #include "modules/serviceworkers/NavigatorServiceWorker.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/frame/LocalDOMWindow.h" 9 #include "core/frame/LocalDOMWindow.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
11 #include "core/frame/Navigator.h" 11 #include "core/frame/Navigator.h"
12 #include "modules/serviceworkers/ServiceWorkerContainer.h" 12 #include "modules/serviceworkers/ServiceWorkerContainer.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator) 16 NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator)
17 : DOMWindowProperty(navigator.frame()) 17 : DOMWindowProperty(navigator.frame())
18 { 18 {
19 } 19 }
20 20
21 NavigatorServiceWorker::~NavigatorServiceWorker() 21 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(NavigatorServiceWorker);
22 {
23 }
24 22
25 NavigatorServiceWorker* NavigatorServiceWorker::from(Document& document) 23 NavigatorServiceWorker* NavigatorServiceWorker::from(Document& document)
26 { 24 {
27 if (!document.frame() || !document.frame()->domWindow()) 25 if (!document.frame() || !document.frame()->domWindow())
28 return 0; 26 return 0;
29 Navigator& navigator = document.frame()->domWindow()->navigator(); 27 Navigator& navigator = document.frame()->domWindow()->navigator();
30 return &from(navigator); 28 return &from(navigator);
31 } 29 }
32 30
33 NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator) 31 NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 if (m_serviceWorker) { 69 if (m_serviceWorker) {
72 m_serviceWorker->willBeDetachedFromFrame(); 70 m_serviceWorker->willBeDetachedFromFrame();
73 m_serviceWorker = nullptr; 71 m_serviceWorker = nullptr;
74 } 72 }
75 } 73 }
76 74
77 void NavigatorServiceWorker::trace(Visitor* visitor) 75 void NavigatorServiceWorker::trace(Visitor* visitor)
78 { 76 {
79 visitor->trace(m_serviceWorker); 77 visitor->trace(m_serviceWorker);
80 WillBeHeapSupplement<Navigator>::trace(visitor); 78 WillBeHeapSupplement<Navigator>::trace(visitor);
79 DOMWindowProperty::trace(visitor);
81 } 80 }
82 81
83 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698