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

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

Issue 1159593006: Revert of Remove the allowfullscreen exemption for the video-specific fullscreen API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Fullscreen.h ('k') | Source/core/html/HTMLMediaElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 { 70 {
71 // A fullscreen element ready check for an element |element| returns true if all of the 71 // A fullscreen element ready check for an element |element| returns true if all of the
72 // following are true, and false otherwise: 72 // following are true, and false otherwise:
73 73
74 // |element| is in a document. 74 // |element| is in a document.
75 if (!element.inDocument()) 75 if (!element.inDocument())
76 return false; 76 return false;
77 77
78 // |element|'s node document's fullscreen enabled flag is set. 78 // |element|'s node document's fullscreen enabled flag is set.
79 if (!fullscreenIsAllowedForAllOwners(element.document())) { 79 if (!fullscreenIsAllowedForAllOwners(element.document())) {
80 if (requestType == Fullscreen::InternalVideoRequest) 80 if (requestType == Fullscreen::PrefixedVideoRequest)
81 UseCounter::count(element.document(), UseCounter::VideoFullscreenAll owedExemption); 81 UseCounter::count(element.document(), UseCounter::VideoFullscreenAll owedExemption);
82 else 82 else
83 return false; 83 return false;
84 } 84 }
85 85
86 // |element|'s node document's fullscreen element stack is either empty or i ts top element is an 86 // |element|'s node document's fullscreen element stack is either empty or i ts top element is an
87 // inclusive ancestor of |element|. 87 // inclusive ancestor of |element|.
88 if (const Element* topElement = Fullscreen::fullscreenElementFrom(element.do cument())) { 88 if (const Element* topElement = Fullscreen::fullscreenElementFrom(element.do cument())) {
89 if (!topElement->contains(&element)) 89 if (!topElement->contains(&element))
90 return false; 90 return false;
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 #if ENABLE(OILPAN) 616 #if ENABLE(OILPAN)
617 visitor->trace(m_fullScreenElement); 617 visitor->trace(m_fullScreenElement);
618 visitor->trace(m_fullScreenElementStack); 618 visitor->trace(m_fullScreenElementStack);
619 visitor->trace(m_eventQueue); 619 visitor->trace(m_eventQueue);
620 #endif 620 #endif
621 WillBeHeapSupplement<Document>::trace(visitor); 621 WillBeHeapSupplement<Document>::trace(visitor);
622 DocumentLifecycleObserver::trace(visitor); 622 DocumentLifecycleObserver::trace(visitor);
623 } 623 }
624 624
625 } // namespace blink 625 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Fullscreen.h ('k') | Source/core/html/HTMLMediaElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698