Reverting changes that made window.scroll properties relative to the layout viewport.

third_party/WebKit/Source/core/testing/DummyPageHolder.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/testing/DummyPageHolder.h"
 
+#include "core/frame/FrameHost.h"
+#include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
-#include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/loader/EmptyClients.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 void RootLayerScrollsFrameSettingOverride(Settings& settings)
 {
     settings.setRootLayerScrolls(true);
@@ skipping 30 matching lines @@
     settings.setAcceleratedCompositingEnabled(false);
     if (settingOverrider)
         (*settingOverrider)(settings);
 
     m_frameLoaderClient = frameLoaderClient;
     if (!m_frameLoaderClient)
         m_frameLoaderClient = EmptyFrameLoaderClient::create();
 
     m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost(), 0);
     m_frame->setView(FrameView::create(m_frame.get(), initialViewSize));
+    m_frame->view()->page()->frameHost().visualViewport().setSize(initialViewSize);
     m_frame->init();
 }
 
 DummyPageHolder::~DummyPageHolder()
 {
     m_page->willBeDestroyed();
     m_page.clear();
     m_frame.clear();
 }
 
@@ skipping 12 matching lines @@
 {
     return *m_frame->view();
 }
 
 Document& DummyPageHolder::document() const
 {
     return *m_frame->domWindow()->document();
 }
 
 } // namespace blink