Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 { | 197 { |
| 198 // NOTE: the context dispose phase is not supported in oilpan. Please | 198 // NOTE: the context dispose phase is not supported in oilpan. Please |
| 199 // consider using the detach phase instead. | 199 // consider using the detach phase instead. |
| 200 m_fullScreenElement = nullptr; | 200 m_fullScreenElement = nullptr; |
| 201 m_fullScreenElementStack.clear(); | 201 m_fullScreenElementStack.clear(); |
| 202 } | 202 } |
| 203 #endif | 203 #endif |
| 204 | 204 |
| 205 void Fullscreen::requestFullscreen(Element& element, RequestType requestType) | 205 void Fullscreen::requestFullscreen(Element& element, RequestType requestType) |
| 206 { | 206 { |
| 207 // It is required by isPrivilegedContext() but isn't | |
| 208 // actually used. This could be used later if a warning is shown in the | |
|
philipj_slow
2015/05/01 22:36:58
The countDeprecation is the console warning, is th
jww
2015/05/05 21:29:53
I think that's an accurate description of where it
philipj_slow
2015/05/06 07:43:55
The fullscreen element ready check is only used in
| |
| 209 // developer console. | |
| 210 String errorMessage; | |
| 211 if (document()->isPrivilegedContext(errorMessage)) | |
| 212 UseCounter::count(document(), UseCounter::FullscreenSecureOrigin); | |
| 213 else | |
| 214 UseCounter::countDeprecation(document(), UseCounter::FullscreenInsecureO rigin); | |
| 215 | |
| 207 // Ignore this request if the document is not in a live frame. | 216 // Ignore this request if the document is not in a live frame. |
| 208 if (!document()->isActive()) | 217 if (!document()->isActive()) |
| 209 return; | 218 return; |
| 210 | 219 |
| 211 // If |element| is on top of |doc|'s fullscreen element stack, terminate the se substeps. | 220 // If |element| is on top of |doc|'s fullscreen element stack, terminate the se substeps. |
| 212 if (&element == fullscreenElement()) | 221 if (&element == fullscreenElement()) |
| 213 return; | 222 return; |
| 214 | 223 |
| 215 do { | 224 do { |
| 216 // 1. If any of the following conditions are true, terminate these steps and queue a task to fire | 225 // 1. If any of the following conditions are true, terminate these steps and queue a task to fire |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 606 DEFINE_TRACE(Fullscreen) | 615 DEFINE_TRACE(Fullscreen) |
| 607 { | 616 { |
| 608 visitor->trace(m_fullScreenElement); | 617 visitor->trace(m_fullScreenElement); |
| 609 visitor->trace(m_fullScreenElementStack); | 618 visitor->trace(m_fullScreenElementStack); |
| 610 visitor->trace(m_eventQueue); | 619 visitor->trace(m_eventQueue); |
| 611 WillBeHeapSupplement<Document>::trace(visitor); | 620 WillBeHeapSupplement<Document>::trace(visitor); |
| 612 DocumentLifecycleObserver::trace(visitor); | 621 DocumentLifecycleObserver::trace(visitor); |
| 613 } | 622 } |
| 614 | 623 |
| 615 } // namespace blink | 624 } // namespace blink |
| OLD | NEW |