Base new scale on minimum-scale after orientation change.

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 2024 matching lines @@
     const char* url = "resize_scroll_mobile.html";
     const float initialPageScaleFactor = 1;
     const WebSize scrollOffset(0, 50);
     const WebSize viewportSize(120, 160);
     const bool shouldScaleRelativeToViewportWidth = true;
 
     testResizeYieldsCorrectScrollAndScale(
         url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
 }
 
+TEST_F(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForMinimumScale)
+{
+    // This tests a scenario where minimum-scale is set to 1.0, but some element
+    // on the page is slightly larger than the portrait width, so our "natural"
+    // minimum-scale would be lower. In that case, we should stick to 1.0 scale
+    // on rotation and not do anything strange.
+    const char* url = "resize_scroll_minimum_scale.html";
+    const float initialPageScaleFactor = 1;
+    const WebSize scrollOffset(0, 0);
+    const WebSize viewportSize(240, 320);
+    const bool shouldScaleRelativeToViewportWidth = false;
+
+    testResizeYieldsCorrectScrollAndScale(
+        url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
+}
+
 TEST_F(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedWidth)
 {
     // With a fixed width, pageScaleFactor scales by the relative change in viewport width.
     const char* url = "resize_scroll_fixed_width.html";
     const float initialPageScaleFactor = 2;
     const WebSize scrollOffset(0, 200);
     const WebSize viewportSize(240, 320);
     const bool shouldScaleRelativeToViewportWidth = true;
 
     testResizeYieldsCorrectScrollAndScale(
@@ skipping 3853 matching lines @@
 
     client.reset();
     // Try to load the request with cross origin access. Should succeed.
     options.crossOriginRequestPolicy = WebCore::AllowCrossOriginRequests;
     WebCore::DocumentThreadableLoader::loadResourceSynchronously(
         *frame->document(), WebCore::ResourceRequest(resourceUrl), client, options, resourceLoaderOptions);
     EXPECT_FALSE(client.failed());
 }
 
 } // namespace