OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple 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 #include "config.h" | 26 #include "config.h" |
27 #include "core/page/NetworkStateNotifier.h" | 27 #include "core/page/NetworkStateNotifier.h" |
28 | 28 |
| 29 #include "core/dom/CrossThreadTask.h" |
29 #include "core/dom/ExecutionContext.h" | 30 #include "core/dom/ExecutionContext.h" |
30 #include "core/page/Page.h" | 31 #include "core/page/Page.h" |
31 #include "wtf/Assertions.h" | 32 #include "wtf/Assertions.h" |
32 #include "wtf/Functional.h" | 33 #include "wtf/Functional.h" |
33 #include "wtf/MainThread.h" | 34 #include "wtf/MainThread.h" |
34 #include "wtf/StdLibExtras.h" | 35 #include "wtf/StdLibExtras.h" |
35 #include "wtf/Threading.h" | 36 #include "wtf/Threading.h" |
36 | 37 |
37 namespace WebCore { | 38 namespace WebCore { |
38 | 39 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 { | 71 { |
71 ASSERT(isMainThread()); | 72 ASSERT(isMainThread()); |
72 | 73 |
73 MutexLocker locker(m_mutex); | 74 MutexLocker locker(m_mutex); |
74 if (m_type == type) | 75 if (m_type == type) |
75 return; | 76 return; |
76 m_type = type; | 77 m_type = type; |
77 | 78 |
78 for (ObserverListMap::iterator it = m_observers.begin(); it != m_observers.e
nd(); ++it) { | 79 for (ObserverListMap::iterator it = m_observers.begin(); it != m_observers.e
nd(); ++it) { |
79 ExecutionContext* context = it->key; | 80 ExecutionContext* context = it->key; |
80 context->postTask(bind(&NetworkStateNotifier::notifyObserversOnContext,
this, context, type)); | 81 context->postTask(createCrossThreadTask(&NetworkStateNotifier::notifyObs
erversOnContext, this, AllowCrossThreadAccess(context), type)); |
81 } | 82 } |
82 } | 83 } |
83 | 84 |
84 void NetworkStateNotifier::addObserver(NetworkStateObserver* observer, Execution
Context* context) | 85 void NetworkStateNotifier::addObserver(NetworkStateObserver* observer, Execution
Context* context) |
85 { | 86 { |
86 ASSERT(context->isContextThread()); | 87 ASSERT(context->isContextThread()); |
87 ASSERT(observer); | 88 ASSERT(observer); |
88 | 89 |
89 MutexLocker locker(m_mutex); | 90 MutexLocker locker(m_mutex); |
90 ObserverListMap::AddResult result = m_observers.add(context, nullptr); | 91 ObserverListMap::AddResult result = m_observers.add(context, nullptr); |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 | 172 |
172 list->zeroedObservers.clear(); | 173 list->zeroedObservers.clear(); |
173 | 174 |
174 if (list->observers.isEmpty()) { | 175 if (list->observers.isEmpty()) { |
175 MutexLocker locker(m_mutex); | 176 MutexLocker locker(m_mutex); |
176 m_observers.remove(context); // deletes list | 177 m_observers.remove(context); // deletes list |
177 } | 178 } |
178 } | 179 } |
179 | 180 |
180 } // namespace WebCore | 181 } // namespace WebCore |
OLD | NEW |