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

Side by Side Diff: third_party/WebKit/Source/core/dom/Fullscreen.cpp

Issue 1858583002: Simplify LifecycleNotifier and Observer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more removals Created 4 years, 8 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 return lifecycleContext(); 186 return lifecycleContext();
187 } 187 }
188 188
189 void Fullscreen::documentWasDetached() 189 void Fullscreen::documentWasDetached()
190 { 190 {
191 m_eventQueue.clear(); 191 m_eventQueue.clear();
192 192
193 if (m_fullScreenLayoutObject) 193 if (m_fullScreenLayoutObject)
194 m_fullScreenLayoutObject->destroy(); 194 m_fullScreenLayoutObject->destroy();
195 195
196 #if ENABLE(OILPAN)
197 m_fullScreenElement = nullptr; 196 m_fullScreenElement = nullptr;
198 m_fullScreenElementStack.clear(); 197 m_fullScreenElementStack.clear();
199 #endif
200 198
201 } 199 }
202 200
203 #if !ENABLE(OILPAN)
204 void Fullscreen::documentWasDisposed()
205 {
206 // NOTE: the context dispose phase is not supported in oilpan. Please
207 // consider using the detach phase instead.
208 m_fullScreenElement = nullptr;
209 m_fullScreenElementStack.clear();
210 }
211 #endif
212
213 void Fullscreen::requestFullscreen(Element& element, RequestType requestType) 201 void Fullscreen::requestFullscreen(Element& element, RequestType requestType)
214 { 202 {
215 if (document()->isSecureContext()) { 203 if (document()->isSecureContext()) {
216 UseCounter::count(document(), UseCounter::FullscreenSecureOrigin); 204 UseCounter::count(document(), UseCounter::FullscreenSecureOrigin);
217 } else { 205 } else {
218 UseCounter::count(document(), UseCounter::FullscreenInsecureOrigin); 206 UseCounter::count(document(), UseCounter::FullscreenInsecureOrigin);
219 OriginsUsingFeatures::countAnyWorld(*document(), OriginsUsingFeatures::F eature::FullscreenInsecureOrigin); 207 OriginsUsingFeatures::countAnyWorld(*document(), OriginsUsingFeatures::F eature::FullscreenInsecureOrigin);
220 } 208 }
221 209
222 // Ignore this request if the document is not in a live frame. 210 // Ignore this request if the document is not in a live frame.
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 #if ENABLE(OILPAN) 613 #if ENABLE(OILPAN)
626 visitor->trace(m_fullScreenElement); 614 visitor->trace(m_fullScreenElement);
627 visitor->trace(m_fullScreenElementStack); 615 visitor->trace(m_fullScreenElementStack);
628 visitor->trace(m_eventQueue); 616 visitor->trace(m_eventQueue);
629 #endif 617 #endif
630 Supplement<Document>::trace(visitor); 618 Supplement<Document>::trace(visitor);
631 DocumentLifecycleObserver::trace(visitor); 619 DocumentLifecycleObserver::trace(visitor);
632 } 620 }
633 621
634 } // namespace blink 622 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698