Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "core/css/MediaQueryMatcher.h" | 21 #include "core/css/MediaQueryMatcher.h" |
| 22 | 22 |
| 23 #include "core/css/MediaList.h" | 23 #include "core/css/MediaList.h" |
| 24 #include "core/css/MediaQueryEvaluator.h" | 24 #include "core/css/MediaQueryEvaluator.h" |
| 25 #include "core/css/MediaQueryList.h" | 25 #include "core/css/MediaQueryList.h" |
| 26 #include "core/css/MediaQueryListListener.h" | 26 #include "core/css/MediaQueryListListener.h" |
| 27 #include "core/css/resolver/StyleResolver.h" | 27 #include "core/css/resolver/StyleResolver.h" |
| 28 #include "core/dom/Document.h" | 28 #include "core/dom/Document.h" |
| 29 #include "core/dom/ScriptedAnimationController.h" | |
| 29 #include "core/frame/FrameView.h" | 30 #include "core/frame/FrameView.h" |
| 30 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
| 31 | 32 |
| 32 namespace WebCore { | 33 namespace WebCore { |
| 33 | 34 |
| 34 MediaQueryMatcher::MediaQueryMatcher(Document& document) | 35 MediaQueryMatcher::MediaQueryMatcher(Document& document) |
| 35 : m_document(&document) | 36 : m_document(&document) |
| 36 { | 37 { |
| 37 ASSERT(m_document); | 38 ASSERT(m_document); |
| 38 } | 39 } |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 if (!m_document) | 99 if (!m_document) |
| 99 return; | 100 return; |
| 100 m_mediaLists.remove(query); | 101 m_mediaLists.remove(query); |
| 101 } | 102 } |
| 102 | 103 |
| 103 void MediaQueryMatcher::mediaFeaturesChanged() | 104 void MediaQueryMatcher::mediaFeaturesChanged() |
| 104 { | 105 { |
| 105 if (!m_document) | 106 if (!m_document) |
| 106 return; | 107 return; |
| 107 | 108 |
| 108 WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener> > listenersToNot ify; | 109 WillBeHeapVector<RefPtrWillBeMember<MediaQueryList::Listener> > listenersToN otify; |
| 109 for (MediaQueryListSet::iterator it = m_mediaLists.begin(); it != m_mediaLis ts.end(); ++it) | 110 for (MediaQueryListSet::iterator it = m_mediaLists.begin(); it != m_mediaLis ts.end(); ++it) |
| 110 (*it)->mediaFeaturesChanged(&listenersToNotify); | 111 (*it)->mediaFeaturesChanged(&listenersToNotify); |
| 111 | 112 |
| 112 // FIXME: This should be async! We're running script inside ::layout() or :: updateRenderTree(). | |
| 113 for (size_t i = 0; i < listenersToNotify.size(); ++i) | 113 for (size_t i = 0; i < listenersToNotify.size(); ++i) |
| 114 listenersToNotify[i]->call(); | 114 m_delayedListeners.append(listenersToNotify[i]); |
| 115 | |
| 116 m_document->ensureScriptedAnimationController().scheduleAnimationIfNeeded(); | |
|
esprehn
2014/07/01 00:01:06
scheduleAnimationIfNeeded() should be private, I t
cbiesinger
2014/07/01 00:12:09
On PageAnimator? Hm... I'm not positive but I don'
| |
| 117 } | |
| 118 | |
| 119 void MediaQueryMatcher::notifyDelayedListeners() | |
| 120 { | |
| 121 WillBeHeapVector<RefPtrWillBeMember<MediaQueryList::Listener> > listeners; | |
| 122 listeners.swap(m_delayedListeners); | |
| 123 | |
| 124 for (size_t i = 0; i < listeners.size(); ++i) | |
| 125 listeners[i]->mediaQueryChanged(); | |
| 115 } | 126 } |
| 116 | 127 |
| 117 void MediaQueryMatcher::trace(Visitor* visitor) | 128 void MediaQueryMatcher::trace(Visitor* visitor) |
| 118 { | 129 { |
| 119 visitor->trace(m_document); | 130 visitor->trace(m_document); |
| 131 visitor->trace(m_delayedListeners); | |
| 120 visitor->trace(m_mediaLists); | 132 visitor->trace(m_mediaLists); |
| 121 } | 133 } |
| 122 | 134 |
| 123 } | 135 } |
| OLD | NEW |