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

Side by Side Diff: Source/platform/LifecycleContextTest.cpp

Issue 1008113002: Remove LifecycleNotifier<>::m_context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « Source/core/page/PageLifecycleNotifier.cpp ('k') | Source/platform/LifecycleNotifier.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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 28
29 #include "platform/LifecycleNotifier.h" 29 #include "platform/LifecycleNotifier.h"
30 #include "platform/LifecycleObserver.h"
30 #include "platform/heap/Handle.h" 31 #include "platform/heap/Handle.h"
32
31 #include <gtest/gtest.h> 33 #include <gtest/gtest.h>
32 34
33 using namespace blink; 35 using namespace blink;
34 36
35 namespace blink { 37 namespace blink {
36 38
37 class TestingObserver; 39 class TestingObserver;
38 40
39 class DummyContext final : public NoBaseWillBeGarbageCollectedFinalized<DummyCon text>, public LifecycleNotifier<DummyContext, TestingObserver> { 41 class DummyContext final : public NoBaseWillBeGarbageCollectedFinalized<DummyCon text>, public LifecycleNotifier<DummyContext, TestingObserver> {
40 public: 42 public:
41 static PassOwnPtrWillBeRawPtr<DummyContext> create() 43 static PassOwnPtrWillBeRawPtr<DummyContext> create()
42 { 44 {
43 return adoptPtrWillBeNoop(new DummyContext()); 45 return adoptPtrWillBeNoop(new DummyContext());
44 } 46 }
45 47
46 void addObserver(TestingObserver* observer)
47 {
48 LifecycleNotifier<DummyContext, TestingObserver>::addObserver(observer);
49 }
50
51 void removeObserver(TestingObserver* observer)
52 {
53 LifecycleNotifier<DummyContext, TestingObserver>::removeObserver(observe r);
54 }
55
56 DEFINE_INLINE_TRACE() 48 DEFINE_INLINE_TRACE()
57 { 49 {
58 LifecycleNotifier<DummyContext, TestingObserver>::trace(visitor); 50 LifecycleNotifier<DummyContext, TestingObserver>::trace(visitor);
59 } 51 }
60
61 private:
62 DummyContext()
63 : LifecycleNotifier<DummyContext, TestingObserver>(this)
64 {
65 }
66 }; 52 };
67 53
68 class TestingObserver final : public NoBaseWillBeGarbageCollectedFinalized<Testi ngObserver>, public LifecycleObserver<DummyContext, TestingObserver, DummyContex t> { 54 class TestingObserver final : public NoBaseWillBeGarbageCollectedFinalized<Testi ngObserver>, public LifecycleObserver<DummyContext, TestingObserver, DummyContex t> {
69 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(TestingObserver); 55 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(TestingObserver);
70 public: 56 public:
71 static PassOwnPtrWillBeRawPtr<TestingObserver> create(DummyContext* context) 57 static PassOwnPtrWillBeRawPtr<TestingObserver> create(DummyContext* context)
72 { 58 {
73 return adoptPtrWillBeNoop(new TestingObserver(context)); 59 return adoptPtrWillBeNoop(new TestingObserver(context));
74 } 60 }
75 61
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 142
157 context->notifyContextDestroyed(); 143 context->notifyContextDestroyed();
158 EXPECT_EQ(observer->innerObserver(), nullptr); 144 EXPECT_EQ(observer->innerObserver(), nullptr);
159 context = nullptr; 145 context = nullptr;
160 Heap::collectAllGarbage(); 146 Heap::collectAllGarbage();
161 EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0)); 147 EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
162 EXPECT_TRUE(observer->contextDestroyedCalled()); 148 EXPECT_TRUE(observer->contextDestroyedCalled());
163 } 149 }
164 150
165 } // namespace blink 151 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/PageLifecycleNotifier.cpp ('k') | Source/platform/LifecycleNotifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698