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

Side by Side Diff: Source/core/page/PageLifecycleObserver.cpp

Issue 901663005: Revert r189385 "Remove LifecycleContext" and r189391, r189530, r189456 that block it (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All Rights Reserved. 2 * Copyright (C) 2013 Google Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/page/PageLifecycleObserver.h" 28 #include "core/page/PageLifecycleObserver.h"
29 29
30 #include "core/page/Page.h" 30 #include "core/page/Page.h"
31 #include "core/page/PageLifecycleNotifier.h"
32 31
33 namespace blink { 32 namespace blink {
34 33
35 template<> void observeContext(Page* context, LifecycleObserver<Page>* observer) 34 template<> void observerContext(Page* context, LifecycleObserver<Page>* observer )
36 { 35 {
37 context->addObserver(observer); 36 context->wasObservedBy(observer);
38 } 37 }
39 38
40 template<> void unobserveContext(Page* context, LifecycleObserver<Page>* observe r) 39 template<> void unobserverContext(Page* context, LifecycleObserver<Page>* observ er)
41 { 40 {
42 context->removeObserver(observer); 41 context->wasUnobservedBy(observer);
43 } 42 }
44 43
45 PageLifecycleObserver::PageLifecycleObserver(Page* page) 44 PageLifecycleObserver::PageLifecycleObserver(Page* page)
46 : LifecycleObserver<Page>(page, PageLifecycleObserverType) 45 : LifecycleObserver<Page>(page, PageLifecycleObserverType)
47 { 46 {
48 } 47 }
49 48
50 PageLifecycleObserver::~PageLifecycleObserver() 49 PageLifecycleObserver::~PageLifecycleObserver()
51 { 50 {
52 } 51 }
53 52
54 Page* PageLifecycleObserver::page() const 53 Page* PageLifecycleObserver::page() const
55 { 54 {
56 return static_cast<Page*>(lifecycleContext()); 55 return static_cast<Page*>(lifecycleContext());
57 } 56 }
58 57
59 } // namespace blink 58 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/PageLifecycleObserver.h ('k') | Source/modules/serviceworkers/ServiceWorkerGlobalScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698