Zoom instead of autosizing for desktop sites.

Source/web/PageScaleConstraintsSet.cpp

 /*
  * Copyright (C) 2013 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 21 matching lines @@
 #include "PageScaleConstraintsSet.h"
 
 #include "wtf/Assertions.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 static const float defaultMinimumScale = 0.25f;
 static const float defaultMaximumScale = 5.0f;
+static const float minimumLayoutWidth = 980.0f;

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

ViewportDescription.minWidth.value() should always be 980 when on Android and
!isSpecifiedByAuthor().  Could you use that instead to avoid duplicating the
magic number?

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

Done.

 
 PageScaleConstraintsSet::PageScaleConstraintsSet()
     : m_lastContentsWidth(0)
     , m_needsReset(false)
     , m_constraintsDirty(false)
 {
     m_finalConstraints = defaultConstraints();
 }
 
 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const
@@ skipping 123 matching lines @@
     }
 
     if (adjustedLayoutSizeWidth != m_pageDefinedConstraints.layoutSize.width()) {
         ASSERT(m_pageDefinedConstraints.layoutSize.width() > 0);
         float adjustedLayoutSizeHeight = (adjustedLayoutSizeWidth * m_pageDefinedConstraints.layoutSize.height()) / m_pageDefinedConstraints.layoutSize.width();
         m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth);
         m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight);
     }
 }
 
+void PageScaleConstraintsSet::applyDeviceScaleAdjustment(const ViewportDescription& viewportDescription, float deviceScaleAdjustment)
+{
+    // If possible, reduce the layout width instead of applying text autosizing.
+    // But don't reduce below the minimum fallback width and don't reduce if explicitly specified by the page author.
+    float width = m_pageDefinedConstraints.layoutSize.width();
+    if (width > minimumLayoutWidth && !viewportDescription.isSpecifiedByAuthor())

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

Please delete the condition "width > minimumLayoutWidth" as it does not change
any behavior (redundant with std::max()).

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

Done.

+        m_pageDefinedConstraints.layoutSize.setWidth(std::max(minimumLayoutWidth, width / deviceScaleAdjustment));
+}
+
 } // namespace WebCore