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

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

Issue 497723002: Merge willEnter/willExitFullScreen into didEnter/didExitFullScreen (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « no previous file | Source/core/dom/Fullscreen.cpp » ('j') | Source/core/dom/Fullscreen.cpp » ('J')
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 PrefixedVideoRequest, // HTMLVideoElement.webkitEnterFullscreen() and we bkitEnterFullScreen() 66 PrefixedVideoRequest, // HTMLVideoElement.webkitEnterFullscreen() and we bkitEnterFullScreen()
67 }; 67 };
68 68
69 void requestFullscreen(Element&, RequestType); 69 void requestFullscreen(Element&, RequestType);
70 static void fullyExitFullscreen(Document&); 70 static void fullyExitFullscreen(Document&);
71 void exitFullscreen(); 71 void exitFullscreen();
72 72
73 static bool fullscreenEnabled(Document&); 73 static bool fullscreenEnabled(Document&);
74 Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpt y() ? m_fullScreenElementStack.last().first.get() : 0; } 74 Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpt y() ? m_fullScreenElementStack.last().first.get() : 0; }
75 75
76 void willEnterFullScreenForElement(Element*);
77 void didEnterFullScreenForElement(Element*); 76 void didEnterFullScreenForElement(Element*);
78 void willExitFullScreenForElement(Element*);
79 void didExitFullScreenForElement(Element*); 77 void didExitFullScreenForElement(Element*);
80 78
81 void setFullScreenRenderer(RenderFullScreen*); 79 void setFullScreenRenderer(RenderFullScreen*);
82 RenderFullScreen* fullScreenRenderer() const { return m_fullScreenRenderer; } 80 RenderFullScreen* fullScreenRenderer() const { return m_fullScreenRenderer; }
83 void fullScreenRendererDestroyed(); 81 void fullScreenRendererDestroyed();
84 82
85 void elementRemoved(Element&); 83 void elementRemoved(Element&);
86 84
87 // Mozilla API 85 // Mozilla API
88 bool webkitFullScreenKeyboardInputAllowed() const { return m_fullScreenEleme nt.get() && m_areKeysEnabledInFullScreen; } 86 bool webkitFullScreenKeyboardInputAllowed() const { return m_fullScreenEleme nt.get() && m_areKeysEnabledInFullScreen; }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // Needed by the HeapVector<> element stack. 138 // Needed by the HeapVector<> element stack.
141 namespace WTF { 139 namespace WTF {
142 140
143 template<>struct IsPod<blink::Fullscreen::RequestType> { 141 template<>struct IsPod<blink::Fullscreen::RequestType> {
144 static const bool value = true; 142 static const bool value = true;
145 }; 143 };
146 144
147 } // namespace WTF 145 } // namespace WTF
148 146
149 #endif // Fullscreen_h 147 #endif // Fullscreen_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Fullscreen.cpp » ('j') | Source/core/dom/Fullscreen.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698