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

Side by Side Diff: Source/core/frame/DOMWindowLifecycleNotifier.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
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 INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE 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 INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE 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 #include "core/frame/DOMWindowLifecycleNotifier.h" 28 #include "core/frame/DOMWindowLifecycleNotifier.h"
29 29
30 #include "core/frame/DOMWindowLifecycleObserver.h"
31
32 namespace blink { 30 namespace blink {
33 31
34 DOMWindowLifecycleNotifier::DOMWindowLifecycleNotifier(LocalDOMWindow* context) 32 DOMWindowLifecycleNotifier::DOMWindowLifecycleNotifier(LocalDOMWindow* context)
35 : LifecycleNotifier<LocalDOMWindow>(context) 33 : LifecycleNotifier<LocalDOMWindow>(context)
36 { 34 {
37 } 35 }
38 36
39 void DOMWindowLifecycleNotifier::addObserver(DOMWindowLifecycleNotifier::Observe r* observer) 37 void DOMWindowLifecycleNotifier::addObserver(DOMWindowLifecycleNotifier::Observe r* observer)
40 { 38 {
41 if (observer->observerType() == Observer::DOMWindowLifecycleObserverType) { 39 if (observer->observerType() == Observer::DOMWindowLifecycleObserverType) {
42 RELEASE_ASSERT(m_iterating != IteratingOverDOMWindowObservers); 40 RELEASE_ASSERT(m_iterating != IteratingOverDOMWindowObservers);
43 m_windowObservers.add(static_cast<DOMWindowLifecycleObserver*>(observer) ); 41 m_windowObservers.add(static_cast<DOMWindowLifecycleObserver*>(observer) );
44 } 42 }
45 43
46 LifecycleNotifier<LocalDOMWindow>::addObserver(observer); 44 LifecycleNotifier<LocalDOMWindow>::addObserver(observer);
47 } 45 }
48 46
49 void DOMWindowLifecycleNotifier::removeObserver(DOMWindowLifecycleNotifier::Obse rver* observer) 47 void DOMWindowLifecycleNotifier::removeObserver(DOMWindowLifecycleNotifier::Obse rver* observer)
50 { 48 {
51 if (observer->observerType() == Observer::DOMWindowLifecycleObserverType) { 49 if (observer->observerType() == Observer::DOMWindowLifecycleObserverType) {
52 RELEASE_ASSERT(m_iterating != IteratingOverDOMWindowObservers); 50 RELEASE_ASSERT(m_iterating != IteratingOverDOMWindowObservers);
53 m_windowObservers.remove(static_cast<DOMWindowLifecycleObserver*>(observ er)); 51 m_windowObservers.remove(static_cast<DOMWindowLifecycleObserver*>(observ er));
54 } 52 }
55 53
56 LifecycleNotifier<LocalDOMWindow>::removeObserver(observer); 54 LifecycleNotifier<LocalDOMWindow>::removeObserver(observer);
57 } 55 }
58 56
57 PassOwnPtr<DOMWindowLifecycleNotifier> DOMWindowLifecycleNotifier::create(LocalD OMWindow* context)
58 {
59 return adoptPtr(new DOMWindowLifecycleNotifier(context));
60 }
61
59 void DOMWindowLifecycleNotifier::notifyAddEventListener(LocalDOMWindow* window, const AtomicString& eventType) 62 void DOMWindowLifecycleNotifier::notifyAddEventListener(LocalDOMWindow* window, const AtomicString& eventType)
60 { 63 {
61 TemporaryChange<IterationType> scope(m_iterating, IteratingOverDOMWindowObse rvers); 64 TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverDOMWind owObservers);
62 for (const auto& windowObserver : m_windowObservers) 65 for (const auto& windowObserver : m_windowObservers)
63 windowObserver->didAddEventListener(window, eventType); 66 windowObserver->didAddEventListener(window, eventType);
64 } 67 }
65 68
66 void DOMWindowLifecycleNotifier::notifyRemoveEventListener(LocalDOMWindow* windo w, const AtomicString& eventType) 69 void DOMWindowLifecycleNotifier::notifyRemoveEventListener(LocalDOMWindow* windo w, const AtomicString& eventType)
67 { 70 {
68 TemporaryChange<IterationType> scope(m_iterating, IteratingOverDOMWindowObse rvers); 71 TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverDOMWind owObservers);
69 for (const auto& windowObserver : m_windowObservers) 72 for (const auto& windowObserver : m_windowObservers)
70 windowObserver->didRemoveEventListener(window, eventType); 73 windowObserver->didRemoveEventListener(window, eventType);
71 } 74 }
72 75
73 void DOMWindowLifecycleNotifier::notifyRemoveAllEventListeners(LocalDOMWindow* w indow) 76 void DOMWindowLifecycleNotifier::notifyRemoveAllEventListeners(LocalDOMWindow* w indow)
74 { 77 {
75 TemporaryChange<IterationType> scope(m_iterating, IteratingOverDOMWindowObse rvers); 78 TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverDOMWind owObservers);
76 for (const auto& windowObserver : m_windowObservers) 79 for (const auto& windowObserver : m_windowObservers)
77 windowObserver->didRemoveAllEventListeners(window); 80 windowObserver->didRemoveAllEventListeners(window);
78 } 81 }
79 82
80 } // namespace blink 83 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindowLifecycleNotifier.h ('k') | Source/core/frame/DOMWindowLifecycleObserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698