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

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

Issue 421693003: Stop using controller as a variable name for FullscreenElementStack (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/rendering/RenderFullScreen.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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 WillBeHeapVector<RefPtrWillBeMember<Element> > m_fullScreenElementStack; 117 WillBeHeapVector<RefPtrWillBeMember<Element> > m_fullScreenElementStack;
118 RenderFullScreen* m_fullScreenRenderer; 118 RenderFullScreen* m_fullScreenRenderer;
119 Timer<FullscreenElementStack> m_eventQueueTimer; 119 Timer<FullscreenElementStack> m_eventQueueTimer;
120 WillBeHeapDeque<RefPtrWillBeMember<Event> > m_eventQueue; 120 WillBeHeapDeque<RefPtrWillBeMember<Event> > m_eventQueue;
121 LayoutRect m_savedPlaceholderFrameRect; 121 LayoutRect m_savedPlaceholderFrameRect;
122 RefPtr<RenderStyle> m_savedPlaceholderRenderStyle; 122 RefPtr<RenderStyle> m_savedPlaceholderRenderStyle;
123 }; 123 };
124 124
125 inline bool FullscreenElementStack::isActiveFullScreenElement(const Element& ele ment) 125 inline bool FullscreenElementStack::isActiveFullScreenElement(const Element& ele ment)
126 { 126 {
127 FullscreenElementStack* controller = fromIfExists(element.document()); 127 FullscreenElementStack* fullscreen = fromIfExists(element.document());
128 if (!controller) 128 if (!fullscreen)
129 return false; 129 return false;
130 return controller->webkitIsFullScreen() && controller->webkitCurrentFullScre enElement() == element; 130 return fullscreen->webkitCurrentFullScreenElement() == &element;
falken 2014/07/28 02:10:48 I don't get how this worked before, webkitCurrentF
philipj_slow 2014/07/28 07:47:10 That worked because of the DEFINE_COMPARISON_OPERA
131 } 131 }
132 132
133 inline FullscreenElementStack* FullscreenElementStack::fromIfExists(Document& do cument) 133 inline FullscreenElementStack* FullscreenElementStack::fromIfExists(Document& do cument)
134 { 134 {
135 if (!document.hasFullscreenElementStack()) 135 if (!document.hasFullscreenElementStack())
136 return 0; 136 return 0;
137 return fromIfExistsSlow(document); 137 return fromIfExistsSlow(document);
138 } 138 }
139 139
140 } // namespace blink 140 } // namespace blink
141 141
142 #endif // FullscreenElementStack_h 142 #endif // FullscreenElementStack_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderFullScreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698