Replace RenderFullscreen with top layer - Take II

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)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 22 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 RenderFullScreen;
 class RenderStyle;
 
 class Fullscreen final
     : public NoBaseWillBeGarbageCollectedFinalized<Fullscreen>
     , public DocumentSupplement
     , public DocumentLifecycleObserver {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Fullscreen);
 public:
     virtual ~Fullscreen();
     static const char* supplementName();
@@ skipping 13 matching lines @@
     void requestFullscreen(Element&, RequestType);
     static void fullyExitFullscreen(Document&);
     void exitFullscreen();
 
     static bool fullscreenEnabled(Document&);
     Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpty() ? m_fullScreenElementStack.last().first.get() : 0; }
 
     void didEnterFullScreenForElement(Element*);
     void didExitFullScreenForElement(Element*);
 
-    void setFullScreenRenderer(RenderFullScreen*);
-    RenderFullScreen* fullScreenRenderer() const { return m_fullScreenRenderer; }
-    void fullScreenRendererDestroyed();
-
     void elementRemoved(Element&);
 
     // Mozilla API
     Element* webkitCurrentFullScreenElement() const { return m_fullScreenElement.get(); }
 
     virtual void documentWasDetached() override;
 #if !ENABLE(OILPAN)
     virtual void documentWasDisposed() override;
 #endif
 
     virtual void trace(Visitor*) override;
 
+    // Used for testing.
+    const WillBeHeapVector<std::pair<RefPtrWillBeMember<Element>, RequestType> >& fullScreenElementStack() { return m_fullScreenElementStack; }

[esprehn, 2014/12/15 09:45:32]

Add ForTesting() for the function name?

[Julien - ping for review, 2014/12/15 17:02:53]

Removed the for-testing comment as it could be useful for ASSERTs too.

+
 private:
     static Fullscreen* fromIfExistsSlow(Document&);
 
     explicit Fullscreen(Document&);
 
     Document* document();
 
     void clearFullscreenElementStack();
     void popFullscreenElementStack();
     void pushFullscreenElementStack(Element&, RequestType);
 
     void enqueueChangeEvent(Document&, RequestType);
     void enqueueErrorEvent(Element&, RequestType);
     void eventQueueTimerFired(Timer<Fullscreen>*);
 
     RefPtrWillBeMember<Element> m_fullScreenElement;
     WillBeHeapVector<std::pair<RefPtrWillBeMember<Element>, RequestType> > m_fullScreenElementStack;
-    RawPtrWillBeMember<RenderFullScreen> m_fullScreenRenderer;
     Timer<Fullscreen> m_eventQueueTimer;
     WillBeHeapDeque<RefPtrWillBeMember<Event> > m_eventQueue;
     LayoutRect m_savedPlaceholderFrameRect;
     RefPtr<RenderStyle> m_savedPlaceholderRenderStyle;
 };
 
 inline bool Fullscreen::isActiveFullScreenElement(const Element& element)
 {
     Fullscreen* fullscreen = fromIfExists(element.document());
     if (!fullscreen)
         return false;
     return fullscreen->webkitCurrentFullScreenElement() == &element;
 }
 
 inline Fullscreen* Fullscreen::fromIfExists(Document& document)
 {
     if (!document.hasFullscreenSupplement())
         return 0;
     return fromIfExistsSlow(document);
 }
 
 } // namespace blink
 
 #endif // Fullscreen_h