Enabled using viewport on desktop browsers behind experimental flag

Source/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 10 matching lines @@
 #include "config.h"
 #include "core/rendering/RenderView.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameView.h"
 #include "core/page/Page.h"
+#include "core/page/Settings.h"
 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
 #include "core/platform/graphics/FloatQuad.h"
 #include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/transforms/TransformState.h"
 #include "core/rendering/ColumnInfo.h"
 #include "core/rendering/FlowThreadController.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderGeometryMap.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderLayerBacking.h"
@@ skipping 902 matching lines @@
 bool RenderView::rootBackgroundIsEntirelyFixed() const
 {
     RenderObject* rootObject = document()->documentElement() ? document()->documentElement()->renderer() : 0;
     if (!rootObject)
         return false;
 
     RenderObject* rootRenderer = rootObject->rendererForRootBackground();
     return rootRenderer->hasEntirelyFixedBackground();
 }
 
+bool RenderView::useDesktopStyleLayout() const
+{
+    Page* page = document()->page();
+
+    if (!page)
+        return false;
+
+    return !page->settings()->layoutFallbackWidth();
+}
+
 LayoutRect RenderView::backgroundRect(RenderBox* backgroundRenderer) const
 {
     if (!hasColumns())
         return unscaledDocumentRect();
 
     ColumnInfo* columnInfo = this->columnInfo();
     LayoutRect backgroundRect(0, 0, columnInfo->desiredColumnWidth(), columnInfo->columnHeight() * columnInfo->columnCount());
     if (!isHorizontalWritingMode())
         backgroundRect = backgroundRect.transposedRect();
     backgroundRenderer->flipForWritingMode(backgroundRect);
 
     return backgroundRect;
 }
 
 IntRect RenderView::documentRect() const
 {
     FloatRect overflowRect(unscaledDocumentRect());
     if (hasTransform())
         overflowRect = layer()->currentTransform().mapRect(overflowRect);
     return IntRect(overflowRect);
 }
 
 int RenderView::viewHeight() const
 {
     int height = 0;
     if (!shouldUsePrintingLayout() && m_frameView) {
         height = m_frameView->layoutHeight();
-        height = m_frameView->useFixedLayout() ? ceilf(style()->effectiveZoom() * float(height)) : height;

[aelias_OOO_until_Jul13, 2013/07/31 22:31:21]

This is a legacy of one of the other WebKit ports, since Chrome for Android
never used effectiveZoom().  So I suggest trying to just delete these lines.

+        height = !useDesktopStyleLayout() ? ceilf(style()->effectiveZoom() * float(height)) : height;
     }
+
     return height;
 }
 
 int RenderView::viewWidth() const
 {
     int width = 0;
     if (!shouldUsePrintingLayout() && m_frameView) {
         width = m_frameView->layoutWidth();
-        width = m_frameView->useFixedLayout() ? ceilf(style()->effectiveZoom() * float(width)) : width;
+        width = !useDesktopStyleLayout() ? ceilf(style()->effectiveZoom() * float(width)) : width;
     }
+
     return width;
 }
 
 int RenderView::viewLogicalHeight() const
 {
     int height = style()->isHorizontalWritingMode() ? viewHeight() : viewWidth();
 
     if (hasColumns() && !style()->hasInlineColumnAxis()) {
         if (int pageLength = m_frameView->pagination().pageLength)
             height = pageLength;
@@ skipping 146 matching lines @@
 #endif
 
     if (layoutState)
         layoutState->m_isPaginated = m_fragmenting;
         
     if (m_flowThreadState != RenderObject::NotInsideFlowThread)
         m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
 }
 
 } // namespace WebCore