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

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

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 | « LayoutTests/media/video-controls-fullscreen-iframe.html ('k') | Source/core/dom/Fullscreen.cpp » ('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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual ~Fullscreen(); 53 virtual ~Fullscreen();
54 static const char* supplementName(); 54 static const char* supplementName();
55 static Fullscreen& from(Document&); 55 static Fullscreen& from(Document&);
56 static Fullscreen* fromIfExists(Document&); 56 static Fullscreen* fromIfExists(Document&);
57 static Element* fullscreenElementFrom(Document&); 57 static Element* fullscreenElementFrom(Document&);
58 static Element* currentFullScreenElementFrom(Document&); 58 static Element* currentFullScreenElementFrom(Document&);
59 static bool isFullScreen(Document&); 59 static bool isFullScreen(Document&);
60 static bool isActiveFullScreenElement(const Element&); 60 static bool isActiveFullScreenElement(const Element&);
61 61
62 enum RequestType { 62 enum RequestType {
63 // Element.requestFullscreen() 63 UnprefixedRequest, // Element.requestFullscreen()
64 UnprefixedRequest, 64 PrefixedRequest, // Element.webkitRequestFullscreen() and webkitRequestF ullScreen()
65 // Element.webkitRequestFullscreen()/webkitRequestFullScreen() and 65 PrefixedVideoRequest, // HTMLVideoElement.webkitEnterFullscreen() and we bkitEnterFullScreen()
66 // HTMLVideoElement.webkitEnterFullscreen()/webkitEnterFullScreen()
67 PrefixedRequest,
68 // Fullscreen button in <video controls> and
69 // HTMLMediaElement::mediaPlayerRequestFullscreen()
70 InternalVideoRequest,
71 }; 66 };
72 67
73 void requestFullscreen(Element&, RequestType); 68 void requestFullscreen(Element&, RequestType);
74 static void fullyExitFullscreen(Document&); 69 static void fullyExitFullscreen(Document&);
75 void exitFullscreen(); 70 void exitFullscreen();
76 71
77 static bool fullscreenEnabled(Document&); 72 static bool fullscreenEnabled(Document&);
78 Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpt y() ? m_fullScreenElementStack.last().first.get() : 0; } 73 Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpt y() ? m_fullScreenElementStack.last().first.get() : 0; }
79 74
80 void didEnterFullScreenForElement(Element*); 75 void didEnterFullScreenForElement(Element*);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 inline Fullscreen* Fullscreen::fromIfExists(Document& document) 126 inline Fullscreen* Fullscreen::fromIfExists(Document& document)
132 { 127 {
133 if (!document.hasFullscreenSupplement()) 128 if (!document.hasFullscreenSupplement())
134 return 0; 129 return 0;
135 return fromIfExistsSlow(document); 130 return fromIfExistsSlow(document);
136 } 131 }
137 132
138 } // namespace blink 133 } // namespace blink
139 134
140 #endif // Fullscreen_h 135 #endif // Fullscreen_h
OLDNEW
« no previous file with comments | « LayoutTests/media/video-controls-fullscreen-iframe.html ('k') | Source/core/dom/Fullscreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698