Improve mobile device rotation behavior.

Source/WebKit/chromium/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 19 matching lines @@
 
 #include "config.h"
 
 #include "WebFrame.h"
 
 #include "DocumentMarkerController.h"
 #include "FloatRect.h"
 #include "Frame.h"
 #include "FrameTestHelpers.h"
 #include "FrameView.h"
+#include "HitTestResult.h"
 #include "PlatformContextSkia.h"
 #include "Range.h"
 #include "RenderView.h"
 #include "ResourceError.h"
 #include "Settings.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "URLTestHelpers.h"
 #include "WebDataSource.h"
 #include "WebDocument.h"
@@ skipping 516 matching lines @@
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
     m_webView->layout();
 
     m_webView->setPageScaleFactor(2, WebPoint());
 
     WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(m_webView);
     EXPECT_EQ(1, webViewImpl->page()->mainFrame()->frameScaleFactor());
     EXPECT_EQ(980, webViewImpl->page()->mainFrame()->contentRenderer()->unscaledDocumentRect().width());
     EXPECT_EQ(980, webViewImpl->mainFrameImpl()->frameView()->contentsSize().width());
 }
+
+static WebCore::FloatSize computeRelativeOffset(const WebCore::IntPoint& absoluteOffset, const WebCore::LayoutRect& rect)
+{
+    WebCore::FloatSize relativeOffset = WebCore::FloatPoint(absoluteOffset) - rect.location();
+    relativeOffset.scale(1.f / rect.width(), 1.f / rect.height());

[aelias_OOO_until_Jul13, 2013/04/08 04:24:52]

Delete .f

[jdduke (slow), 2013/04/10 16:58:19]

Done.

+    return relativeOffset;
+}
+
+TEST_F(WebFrameTest, resizePreservesRelativeScrollOffset)
+{
+    registerMockedHttpURLLoad("resize_scroll_anchor.html");
+
+    const WebSize viewportSize = WebSize(320, 240);
+
+    m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "resize_scroll_anchor.html", true);
+    m_webView->settings()->setViewportEnabled(true);
+    m_webView->setPageScaleFactor(2.0f, WebPoint());
+    m_webView->enableFixedLayoutMode(false);

[aelias_OOO_until_Jul13, 2013/04/08 04:24:52]

This is odd, on Android fixedLayoutMode setting is always true.  This should be
true.  If it breaks your test, something is wrong with the test :).

[jdduke (slow), 2013/04/10 16:58:19]

Nothing broken, I was too lazy to check the default setting.

+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(m_webView);
+
+    // Resize at origin
+    webViewImpl->resize(WebSize(viewportSize.width, viewportSize.height));
+    webViewImpl->mainFrame()->setScrollOffset(WebSize());
+    ASSERT_EQ(WebSize(), webViewImpl->mainFrame()->scrollOffset());

[aelias_OOO_until_Jul13, 2013/04/08 04:24:52]

Delete this assert.

[jdduke (slow), 2013/04/10 16:58:19]

Done.

+    webViewImpl->resize(WebSize(viewportSize.height * 2 , viewportSize.width / 2));
+    EXPECT_EQ(WebSize(), webViewImpl->mainFrame()->scrollOffset());
+
+    // Resize as rotation
+    const WebSize scrollOffset = WebSize(200, 400);
+    webViewImpl->resize(WebSize(viewportSize.width, viewportSize.height));
+    webViewImpl->mainFrame()->setScrollOffset(scrollOffset);
+    ASSERT_EQ(scrollOffset, webViewImpl->mainFrame()->scrollOffset());

[aelias_OOO_until_Jul13, 2013/04/08 04:24:52]

Delete this assert.

[jdduke (slow), 2013/04/10 16:58:19]

Done.

+
+    WebCore::IntPoint anchorPoint = WebCore::IntPoint(scrollOffset) + WebCore::IntPoint(viewportSize.width / 2, 0);
+    RefPtr<WebCore::Node> anchorNode
+        = webViewImpl->mainFrameImpl()->frame()->eventHandler()->hitTestResultAtPoint(anchorPoint).innerNode();
+    ASSERT(anchorNode);
+
+    const WebCore::FloatSize preResizeRelativeOffset
+        = computeRelativeOffset(anchorPoint, anchorNode->Node::boundingBox());
+    webViewImpl->resize(WebSize(viewportSize.height, viewportSize.width));
+    WebCore::IntPoint newAnchorPoint = WebCore::IntPoint(webViewImpl->mainFrame()->scrollOffset()) + WebCore::IntPoint(viewportSize.height / 2, 0);
+    const WebCore::FloatSize postResizeRelativeOffset
+        = computeRelativeOffset(newAnchorPoint, anchorNode->Node::boundingBox());

[aelias_OOO_until_Jul13, 2013/04/08 04:24:52]

anchorNode->boundingBox()

+    EXPECT_NEAR(preResizeRelativeOffset.width(), postResizeRelativeOffset.width(), 0.1f);
+}
 #endif
 
 TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)
 {
     registerMockedHttpURLLoad("fixed_layout.html");
 
     FixedLayoutTestWebViewClient client;
     client.m_screenInfo.deviceScaleFactor = 1;
     int viewportWidth = 50;
     int viewportHeight = 50;
@@ skipping 1975 matching lines @@
     EXPECT_FALSE(client.wasProgrammaticScroll());
     EXPECT_TRUE(client.wasUserScroll());
     client.reset();
 
     m_webView->close();
     m_webView = 0;
 }
 
 
 } // namespace