Revert 183623 "Fix fullscreen elements in pinch viewport mode."

Source/core/rendering/RenderFullScreen.cpp

 /*
  * 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());
     }
@@ skipping 40 matching lines @@
 
     // 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()
+static PassRefPtr<RenderStyle> createFullScreenStyle()
 {
     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(JustifyCenter);
     fullscreenStyle->setAlignItems(ItemPositionCenter);
     fullscreenStyle->setFlexDirection(FlowColumn);
 
     fullscreenStyle->setPosition(FixedPosition);
+    fullscreenStyle->setWidth(Length(100.0, Percent));
+    fullscreenStyle->setHeight(Length(100.0, Percent));
     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);
+    return fullscreenStyle.release();
 }
 
 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();
+    fullscreenRenderer->setStyle(createFullScreenStyle());
     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);
@@ skipping 58 matching lines @@
     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);
 }