Move pending state from FullscreenController to Fullscreen

third_party/WebKit/Source/core/dom/Fullscreen.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 25 matching lines @@
 #include "core/dom/Element.h"
 #include "platform/Supplementable.h"
 #include "platform/Timer.h"
 #include "platform/geometry/LayoutRect.h"
 #include "wtf/Deque.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
+class ComputedStyle;
 class LayoutFullScreen;
-class ComputedStyle;
 
 class CORE_EXPORT Fullscreen final
     : public GarbageCollectedFinalized<Fullscreen>,
       public Supplement<Document>,
       public ContextLifecycleObserver {
   USING_GARBAGE_COLLECTED_MIXIN(Fullscreen);
 
  public:
   virtual ~Fullscreen();
   static const char* supplementName();
@@ skipping 27 matching lines @@
   // TODO(foolip): The fullscreen element stack is modified synchronously in
   // requestFullscreen(), which is not per spec and means that
   // |fullscreenElement()| is not always the same as
   // |currentFullScreenElement()|, see https://crbug.com/402421.
   Element* fullscreenElement() const {
     return !m_fullscreenElementStack.isEmpty()
                ? m_fullscreenElementStack.back().first.get()
                : nullptr;
   }
 
-  void didEnterFullscreenForElement(Element*);
+  // Called by FullscreenController to notify that we've entered or exited
+  // fullscreen. All frames are notified, so there may be no pending request.
+  void didEnterFullscreen();
   void didExitFullscreen();
 
   void setFullScreenLayoutObject(LayoutFullScreen*);
   LayoutFullScreen* fullScreenLayoutObject() const {
     return m_fullScreenLayoutObject;
   }
   void fullScreenLayoutObjectDestroyed();
 
   void elementRemoved(Element&);
 
@@ skipping 24 matching lines @@
   Document* document();
 
   void clearFullscreenElementStack();
   void popFullscreenElementStack();
   void pushFullscreenElementStack(Element&, RequestType);
 
   void enqueueChangeEvent(Document&, RequestType);
   void enqueueErrorEvent(Element&, RequestType);
   void eventQueueTimerFired(TimerBase*);
 
+  Member<Element> m_pendingFullscreenElement;
   HeapVector<std::pair<Member<Element>, RequestType>> m_fullscreenElementStack;
   Member<Element> m_currentFullScreenElement;
   LayoutFullScreen* m_fullScreenLayoutObject;
   Timer<Fullscreen> m_eventQueueTimer;
   HeapDeque<Member<Event>> m_eventQueue;
   LayoutRect m_savedPlaceholderFrameRect;
   RefPtr<ComputedStyle> m_savedPlaceholderComputedStyle;
 
   // TODO(alexmos, dcheng): Currently, this assumes that if fullscreen was
   // entered for an element in an out-of-process iframe, then it's not
@@ skipping 15 matching lines @@
 
 inline bool Fullscreen::isCurrentFullScreenElement(const Element& element) {
   if (Fullscreen* found = fromIfExists(element.document()))
     return found->currentFullScreenElement() == &element;
   return false;
 }
 
 }  // namespace blink
 
 #endif  // Fullscreen_h