Experimental viewport meta tag support for desktop, Blink-side.

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 1674 matching lines @@
     FrameView* view = mainFrameImpl()->frameView();
     if (!view)
         return;
 
     WebSize oldSize = m_size;
     float oldPageScaleFactor = pageScaleFactor();
     int oldContentsWidth = contentsSize().width();
 
     m_size = newSize;
 
-    bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled() && oldSize.width && oldContentsWidth && newSize.width != oldSize.width;
+    bool shouldAnchorAndRescaleViewport =
+        settings()->viewportEnabled() && settings()->scaleViewportOnResize()

[aelias_OOO_until_Jul13, 2013/10/25 04:10:08]

You can delete the settings()->viewportEnabled() now that you have a different
setting.

[bokan, 2013/10/28 22:17:52]

Done.

+        && oldSize.width && oldContentsWidth && newSize.width != oldSize.width;
+
     ViewportAnchor viewportAnchor(&mainFrameImpl()->frame()->eventHandler());
     if (shouldAnchorAndRescaleViewport) {
         viewportAnchor.setAnchor(view->visibleContentRect(),
                                  FloatSize(viewportAnchorXCoord, viewportAnchorYCoord));
     }
 
     updatePageDefinedViewportConstraints(mainFrameImpl()->frame()->document()->viewportDescription());
     updateMainFrameLayoutSize();
 
     WebDevToolsAgentPrivate* agentPrivate = devToolsAgentPrivate();
     if (agentPrivate)
         agentPrivate->webViewResized(newSize);
     WebFrameImpl* webFrame = mainFrameImpl();
     if (webFrame->frameView()) {
         webFrame->frameView()->resize(m_size);
         if (m_pinchViewports)
             m_pinchViewports->setViewportSize(m_size);
     }
 
     if (settings()->viewportEnabled() && !m_fixedLayoutSizeLock) {
         // Relayout immediately to recalculate the minimum scale limit.
         if (view->needsLayout())
             view->layout();

[aelias_OOO_until_Jul13, 2013/10/25 04:10:08]

Hmm, this should a no-op after the fixed layout change CL (I thought I mentioned
it should be deleted at the time), please delete this layout call.  Then you can
delete the if statement here and collapse the "!m_fixedLayoutSizeLock" condition
as part of the shouldAnchorAndRescaleViewport boolean setting.

[bokan, 2013/10/25 17:19:38]

Sorry, you did mention it in that review, but I replied and took the lack or
response as agreement. Why do you think this is a no-op now? I tried removing
this but it breaks numerous unit tests related to minimum scale so it does seem
to be required. None of the changes in the fixed layout CL add a layout above.

[aelias_OOO_until_Jul13, 2013/10/25 23:15:02]

OK, that's fine, my fault for not remembering that.

I never really liked that layout call but I still can't come up with a cleaner
alternative whenever I look into it, so OK.

 
         if (shouldAnchorAndRescaleViewport) {
             float viewportWidthRatio = static_cast<float>(newSize.width) / oldSize.width;
             float contentsWidthRatio = static_cast<float>(contentsSize().width()) / oldContentsWidth;
             float scaleMultiplier = viewportWidthRatio / contentsWidthRatio;
 
             IntSize viewportSize = view->visibleContentRect().size();
             if (scaleMultiplier != 1) {
                 float newPageScaleFactor = oldPageScaleFactor * scaleMultiplier;
                 viewportSize.scale(pageScaleFactor() / newPageScaleFactor);
@@ skipping 2379 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