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

Side by Side Diff: Source/core/dom/SimpleLifecycleNotifier.cpp

Issue 18777003: Extract simpler classes for observing context lifecycle and observe Page lifecycle inNavigatorVibra… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use SimpleLifecycleObserver in addObserver / removeObserver. Created 7 years, 5 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 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2013 Google Inc. All Rights Reserved.
3 * 4 *
4 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
6 * are met: 7 * are met:
7 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
12 * 13 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (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. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 25 *
25 */ 26 */
26 27
27 #include "config.h" 28 #include "config.h"
28 #include "core/dom/ContextLifecycleObserver.h" 29 #include "core/dom/SimpleLifecycleNotifier.h"
29
30 #include "core/dom/ScriptExecutionContext.h"
31 30
32 namespace WebCore { 31 namespace WebCore {
33 32
34 ContextLifecycleObserver::ContextLifecycleObserver(ScriptExecutionContext* scrip tExecutionContext, Type type) 33 SimpleLifecycleNotifier::SimpleLifecycleNotifier(SimpleLifecycleContext* context )
35 : m_scriptExecutionContext(0) 34 : m_context(context)
35 , m_inDestructor(false)
36 , m_iterating(IteratingNone)
36 { 37 {
37 observeContext(scriptExecutionContext, type);
38 } 38 }
39 39
40 ContextLifecycleObserver::~ContextLifecycleObserver() 40 SimpleLifecycleNotifier::~SimpleLifecycleNotifier()
41 { 41 {
42 if (m_scriptExecutionContext) 42 m_inDestructor = true;
43 observeContext(0, GenericType); 43 for (SimpleObserverSet::iterator it = m_observers.begin(); it != m_observers .end(); it = m_observers.begin()) {
44 } 44 SimpleLifecycleObserver* observer = *it;
45 45 m_observers.remove(observer);
46 void ContextLifecycleObserver::observeContext(ScriptExecutionContext* scriptExec utionContext, Type as) 46 ASSERT(observer->simpleLifecycleContext() == m_context);
47 { 47 observer->contextDestroyed();
48 if (m_scriptExecutionContext) {
49 ASSERT(m_scriptExecutionContext->isContextThread());
50 m_scriptExecutionContext->wasUnobservedBy(this, as);
51 }
52
53 m_scriptExecutionContext = scriptExecutionContext;
54
55 if (m_scriptExecutionContext) {
56 ASSERT(m_scriptExecutionContext->isContextThread());
57 m_scriptExecutionContext->wasObservedBy(this, as);
58 } 48 }
59 } 49 }
60 50
61 void ContextLifecycleObserver::contextDestroyed() 51 void SimpleLifecycleNotifier::addObserver(SimpleLifecycleObserver* observer, Sim pleLifecycleObserver::Type type)
62 { 52 {
63 m_scriptExecutionContext = 0; 53 RELEASE_ASSERT(!m_inDestructor);
54 m_observers.add(observer);
55 }
56
57 void SimpleLifecycleNotifier::removeObserver(SimpleLifecycleObserver* observer, SimpleLifecycleObserver::Type type)
58 {
59 RELEASE_ASSERT(!m_inDestructor);
60 m_observers.remove(observer);
61 }
62
63 SimpleLifecycleContext* SimpleLifecycleNotifier::context()
64 {
65 return m_context;
64 } 66 }
65 67
66 } // namespace WebCore 68 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698