Refactor viewport initialization logic out of WebViewImpl.

Source/core/dom/ViewportArguments.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 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 10 matching lines @@
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef ViewportArguments_h
 #define ViewportArguments_h
 
+#include "core/dom/ViewportAttributes.h"
 #include "core/platform/graphics/FloatSize.h"
 #include <wtf/Forward.h>
 
 namespace WebCore {
 
 class Document;
 
 enum ViewportErrorCode {
     UnrecognizedViewportArgumentKeyError,
     UnrecognizedViewportArgumentValueError,
     TruncatedViewportArgumentValueError,
     MaximumScaleTooLargeError,
     TargetDensityDpiUnsupported
 };
 
-struct ViewportAttributes {
-    FloatSize layoutSize;
-
-    float initialScale;
-    float minimumScale;
-    float maximumScale;
-
-    float userScalable;
-    float orientation;
-};
-
 struct ViewportArguments {
 
     enum Type {
         // These are ordered in increasing importance.
         Implicit,
         XHTMLMobileProfile,
         HandheldFriendlyMeta,
         MobileOptimizedMeta,
         ViewportMeta,
         CSSDeviceAdaptation
@@ skipping 16 matching lines @@
         , width(ValueAuto)
         , minWidth(ValueAuto)
         , maxWidth(ValueAuto)
         , height(ValueAuto)
         , minHeight(ValueAuto)
         , maxHeight(ValueAuto)
         , zoom(ValueAuto)
         , minZoom(ValueAuto)
         , maxZoom(ValueAuto)
         , userZoom(ValueAuto)
-        , orientation(ValueAuto)
         , deprecatedTargetDensityDPI(ValueAuto)
     {
     }
 
     // All arguments are in CSS units.
     ViewportAttributes resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const;
 
     float width;
     float minWidth;
     float maxWidth;
     float height;
     float minHeight;
     float maxHeight;
     float zoom;
     float minZoom;
     float maxZoom;
     float userZoom;
-    float orientation;
     float deprecatedTargetDensityDPI; // Only used for Android WebView
 
     bool operator==(const ViewportArguments& other) const
     {
         // Used for figuring out whether to reset the viewport or not,
         // thus we are not taking type into account.
         return width == other.width
             && minWidth == other.minWidth
             && maxWidth == other.maxWidth
             && height == other.height
             && minHeight == other.minHeight
             && maxHeight == other.maxHeight
             && zoom == other.zoom
             && minZoom == other.minZoom
             && maxZoom == other.maxZoom
             && userZoom == other.userZoom
-            && orientation == other.orientation
             && deprecatedTargetDensityDPI == other.deprecatedTargetDensityDPI;
     }
 
     bool operator!=(const ViewportArguments& other) const
     {
         return !(*this == other);
     }
-
-    // FIXME: We're going to keep this constant around until all embedders
-    // refactor their code to no longer need it.
-    static const float deprecatedTargetDPI;
 };
 
-ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport);
-
-void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport, float devicePixelRatio);
-void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
-float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);
-
 void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
 void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
 
 } // namespace WebCore
 
 #endif // ViewportArguments_h