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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 { | 193 { |
194 // NOTE: the context dispose phase is not supported in oilpan. Please | 194 // NOTE: the context dispose phase is not supported in oilpan. Please |
195 // consider using the detach phase instead. | 195 // consider using the detach phase instead. |
196 m_fullScreenElement = nullptr; | 196 m_fullScreenElement = nullptr; |
197 m_fullScreenElementStack.clear(); | 197 m_fullScreenElementStack.clear(); |
198 } | 198 } |
199 #endif | 199 #endif |
200 | 200 |
201 void Fullscreen::requestFullscreen(Element& element, RequestType requestType) | 201 void Fullscreen::requestFullscreen(Element& element, RequestType requestType) |
202 { | 202 { |
203 // It is required by isPrivilegedContext() but isn't | 203 // It is required by isSecureContext() but isn't |
204 // actually used. This could be used later if a warning is shown in the | 204 // actually used. This could be used later if a warning is shown in the |
205 // developer console. | 205 // developer console. |
206 String errorMessage; | 206 String errorMessage; |
207 if (document()->isPrivilegedContext(errorMessage)) { | 207 if (document()->isSecureContext(errorMessage)) { |
208 UseCounter::count(document(), UseCounter::FullscreenSecureOrigin); | 208 UseCounter::count(document(), UseCounter::FullscreenSecureOrigin); |
209 } else { | 209 } else { |
210 UseCounter::count(document(), UseCounter::FullscreenInsecureOrigin); | 210 UseCounter::count(document(), UseCounter::FullscreenInsecureOrigin); |
211 OriginsUsingFeatures::countAnyWorld(*document(), OriginsUsingFeatures::F
eature::FullscreenInsecureOrigin); | 211 OriginsUsingFeatures::countAnyWorld(*document(), OriginsUsingFeatures::F
eature::FullscreenInsecureOrigin); |
212 } | 212 } |
213 | 213 |
214 // Ignore this request if the document is not in a live frame. | 214 // Ignore this request if the document is not in a live frame. |
215 if (!document()->isActive()) | 215 if (!document()->isActive()) |
216 return; | 216 return; |
217 | 217 |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 #if ENABLE(OILPAN) | 615 #if ENABLE(OILPAN) |
616 visitor->trace(m_fullScreenElement); | 616 visitor->trace(m_fullScreenElement); |
617 visitor->trace(m_fullScreenElementStack); | 617 visitor->trace(m_fullScreenElementStack); |
618 visitor->trace(m_eventQueue); | 618 visitor->trace(m_eventQueue); |
619 #endif | 619 #endif |
620 WillBeHeapSupplement<Document>::trace(visitor); | 620 WillBeHeapSupplement<Document>::trace(visitor); |
621 DocumentLifecycleObserver::trace(visitor); | 621 DocumentLifecycleObserver::trace(visitor); |
622 } | 622 } |
623 | 623 |
624 } // namespace blink | 624 } // namespace blink |
OLD | NEW |