Zoom instead of autosizing for desktop sites.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2978 matching lines @@
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 }
 
 void WebViewImpl::updatePageDefinedViewportConstraints(const ViewportDescription& description)
 {
     if (!settings()->viewportEnabled() || !page() || !m_size.width || !m_size.height)
         return;
 
     ViewportDescription adjustedDescription = description;

[aelias_OOO_until_Jul13, 2013/11/07 02:05:25]

Could you mutate this value instead of changing the PageScaleConstraintsSet
post-facto?

[aelias_OOO_until_Jul13, 2013/11/07 22:02:50]

Looks like you missed this comment, please follow up.

[skobes, 2013/11/08 03:26:47]

I did miss this, sorry.

Unfortunately I don't think I can do it that way... the value we need to adjust
is the layoutSize inside the PageScaleConstraints object, which is computed by
ViewportDescription::resolve but not actually stored in the ViewportDescription.

[aelias_OOO_until_Jul13, 2013/11/08 04:06:17]

Right, never mind, sorry.

     if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedDescription.type == ViewportDescription::ViewportMeta) {
         if (adjustedDescription.maxWidth.type() == ExtendToZoom)
             adjustedDescription.maxWidth = Length(); // auto
         adjustedDescription.minWidth = adjustedDescription.maxWidth;
         adjustedDescription.minHeight = adjustedDescription.maxHeight;
     }
     float oldInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().initialScale;
     m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedDescription, m_size);
 
     if (settingsImpl()->clobberUserAgentInitialScaleQuirk()
         && m_pageScaleConstraintsSet.userAgentConstraints().initialScale != -1
         && m_pageScaleConstraintsSet.userAgentConstraints().initialScale * deviceScaleFactor() <= 1) {
         if (!description.maxWidth.isFixed()
             || (description.maxWidth == Length(100, ViewportPercentageWidth) && m_pageScaleConstraintsSet.pageDefinedConstraints().initialScale == 1.0f))
             setInitialPageScaleOverride(-1);
     }
     m_pageScaleConstraintsSet.adjustForAndroidWebViewQuirks(adjustedDescription, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), settingsImpl()->supportDeprecatedTargetDensityDPI(), page()->settings().wideViewportQuirkEnabled(), page()->settings().useWideViewport(), page()->settings().loadWithOverviewMode());
+    m_pageScaleConstraintsSet.applyDeviceScaleAdjustment(adjustedDescription, page()->settings().deviceScaleAdjustment(), page()->settings().layoutFallbackWidth());

[aelias_OOO_until_Jul13, 2013/11/07 02:05:25]

layoutFallbackWidth setting is due for removal soon, we shouldn't add another
dependency on it.  The value 980 is now specified by
"@viewport{min-width:980px}" in UA CSS files.  It doesn't look like you need it
either, since you can expect m_pageDefinedConstraints.layoutSize.width() to
already be 980 or higher if !viewportDescription.isSpecifiedByAuthor().

[skobes, 2013/11/07 17:55:27]

It's needed to avoid reducing the width below 980px.  Changed to a constant.

     float newInitialScale = m_pageScaleConstraintsSet.pageDefinedConstraints().initialScale;
     if (oldInitialScale != newInitialScale && newInitialScale != -1) {
         m_pageScaleConstraintsSet.setNeedsReset(true);
         if (mainFrameImpl() && mainFrameImpl()->frameView())
             mainFrameImpl()->frameView()->setNeedsLayout();
     }
 
     updateMainFrameLayoutSize();
 }
 
@@ skipping 1158 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace WebKit