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

Unified Diff: Source/core/rendering/RenderFullScreen.cpp

Issue 788073004: Replace RenderFullscreen with top layer - Take II (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated after review comments. Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderFullScreen.cpp
diff --git a/Source/core/rendering/RenderFullScreen.cpp b/Source/core/rendering/RenderFullScreen.cpp
deleted file mode 100644
index bb7f9de8b043b2090af56b7ebae973499987ebe9..0000000000000000000000000000000000000000
--- a/Source/core/rendering/RenderFullScreen.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "core/rendering/RenderFullScreen.h"
-
-#include "core/dom/Fullscreen.h"
-#include "core/frame/FrameHost.h"
-#include "core/frame/Settings.h"
-#include "core/page/Chrome.h"
-#include "core/page/Page.h"
-#include "core/rendering/RenderBlockFlow.h"
-
-#include "public/platform/WebScreenInfo.h"
-
-using namespace blink;
-
-class RenderFullScreenPlaceholder final : public RenderBlockFlow {
-public:
- RenderFullScreenPlaceholder(RenderFullScreen* owner)
- : RenderBlockFlow(0)
- , m_owner(owner)
- {
- setDocumentForAnonymous(&owner->document());
- }
-private:
- virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderFullScreenPlaceholder || RenderBlockFlow::isOfType(type); }
- virtual void willBeDestroyed() override;
- RenderFullScreen* m_owner;
-};
-
-void RenderFullScreenPlaceholder::willBeDestroyed()
-{
- m_owner->setPlaceholder(0);
- RenderBlockFlow::willBeDestroyed();
-}
-
-RenderFullScreen::RenderFullScreen()
- : RenderFlexibleBox(0)
- , m_placeholder(nullptr)
-{
- setReplaced(false);
-}
-
-RenderFullScreen* RenderFullScreen::createAnonymous(Document* document)
-{
- RenderFullScreen* renderer = new RenderFullScreen();
- renderer->setDocumentForAnonymous(document);
- return renderer;
-}
-
-void RenderFullScreen::trace(Visitor* visitor)
-{
- visitor->trace(m_placeholder);
- RenderFlexibleBox::trace(visitor);
-}
-
-void RenderFullScreen::willBeDestroyed()
-{
- if (m_placeholder) {
- remove();
- if (!m_placeholder->beingDestroyed())
- m_placeholder->destroy();
- ASSERT(!m_placeholder);
- }
-
- // RenderObjects are unretained, so notify the document (which holds a pointer to a RenderFullScreen)
- // if its RenderFullScreen is destroyed.
- Fullscreen& fullscreen = Fullscreen::from(document());
- if (fullscreen.fullScreenRenderer() == this)
- fullscreen.fullScreenRendererDestroyed();
-
- RenderFlexibleBox::willBeDestroyed();
-}
-
-void RenderFullScreen::updateStyle()
-{
- RefPtr<RenderStyle> fullscreenStyle = RenderStyle::createDefaultStyle();
-
- // Create a stacking context:
- fullscreenStyle->setZIndex(INT_MAX);
-
- fullscreenStyle->setFontDescription(FontDescription());
- fullscreenStyle->font().update(nullptr);
-
- fullscreenStyle->setDisplay(FLEX);
- fullscreenStyle->setJustifyContent(ContentPositionCenter);
- fullscreenStyle->setAlignItems(ItemPositionCenter);
- fullscreenStyle->setFlexDirection(FlowColumn);
-
- fullscreenStyle->setPosition(FixedPosition);
- fullscreenStyle->setLeft(Length(0, blink::Fixed));
- fullscreenStyle->setTop(Length(0, blink::Fixed));
- if (document().page()->settings().pinchVirtualViewportEnabled()) {
- IntSize viewportSize = document().page()->frameHost().pinchViewport().size();
- fullscreenStyle->setWidth(Length(viewportSize.width(), blink::Fixed));
- fullscreenStyle->setHeight(Length(viewportSize.height(), blink::Fixed));
- } else {
- fullscreenStyle->setWidth(Length(100.0, Percent));
- fullscreenStyle->setHeight(Length(100.0, Percent));
- }
-
- fullscreenStyle->setBackgroundColor(StyleColor(Color::black));
-
- setStyle(fullscreenStyle);
-}
-
-RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, RenderObject* parent, Document* document)
-{
- // FIXME: We should not modify the structure of the render tree during
- // layout. crbug.com/370459
- DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
-
- RenderFullScreen* fullscreenRenderer = RenderFullScreen::createAnonymous(document);
- fullscreenRenderer->updateStyle();
- if (parent && !parent->isChildAllowed(fullscreenRenderer, fullscreenRenderer->style())) {
- fullscreenRenderer->destroy();
- return 0;
- }
- if (object) {
- // |object->parent()| can be null if the object is not yet attached
- // to |parent|.
- if (RenderObject* parent = object->parent()) {
- RenderBlock* containingBlock = object->containingBlock();
- ASSERT(containingBlock);
- // Since we are moving the |object| to a new parent |fullscreenRenderer|,
- // the line box tree underneath our |containingBlock| is not longer valid.
- containingBlock->deleteLineBoxTree();
-
- parent->addChild(fullscreenRenderer, object);
- object->remove();
-
- // Always just do a full layout to ensure that line boxes get deleted properly.
- // Because objects moved from |parent| to |fullscreenRenderer|, we want to
- // make new line boxes instead of leaving the old ones around.
- parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
- containingBlock->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
- }
- fullscreenRenderer->addChild(object);
- fullscreenRenderer->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
- }
-
- ASSERT(document);
- Fullscreen::from(*document).setFullScreenRenderer(fullscreenRenderer);
- return fullscreenRenderer;
-}
-
-void RenderFullScreen::unwrapRenderer()
-{
- // FIXME: We should not modify the structure of the render tree during
- // layout. crbug.com/370459
- DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
-
- if (parent()) {
- for (RenderObject* child = firstChild(); child; child = firstChild()) {
- // We have to clear the override size, because as a flexbox, we
- // may have set one on the child, and we don't want to leave that
- // lying around on the child.
- if (child->isBox())
- toRenderBox(child)->clearOverrideSize();
- child->remove();
- parent()->addChild(child, this);
- parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
- }
- }
- if (placeholder())
- placeholder()->remove();
- remove();
- destroy();
-}
-
-void RenderFullScreen::setPlaceholder(RenderBlock* placeholder)
-{
- m_placeholder = placeholder;
-}
-
-void RenderFullScreen::createPlaceholder(PassRefPtr<RenderStyle> style, const LayoutRect& frameRect)
-{
- if (style->width().isAuto())
- style->setWidth(Length(frameRect.width(), Fixed));
- if (style->height().isAuto())
- style->setHeight(Length(frameRect.height(), Fixed));
-
- if (!m_placeholder) {
- m_placeholder = new RenderFullScreenPlaceholder(this);
- m_placeholder->setStyle(style);
- if (parent()) {
- parent()->addChild(m_placeholder, this);
- parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
- }
- } else
- m_placeholder->setStyle(style);
-}

Powered by Google App Engine
This is Rietveld 408576698