Revert 183623 "Fix fullscreen elements in pinch viewport mode."

Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 137 matching lines @@
     }
 
     FrameView* frameView = m_page->deprecatedLocalMainFrame()->view();
     bool frameIsScrollable = frameView && frameView->isScrollable();
     if (m_shouldScrollOnMainThreadDirty || m_wasFrameScrollable != frameIsScrollable) {
         setShouldUpdateScrollLayerPositionOnMainThread(mainThreadScrollingReasons());
         m_shouldScrollOnMainThreadDirty = false;
     }
     m_wasFrameScrollable = frameIsScrollable;
 
+    // The mainFrame view doesn't get included in the FrameTree below, so we
+    // update its size separately.
     if (WebLayer* scrollingWebLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : 0) {
-        // If there is a non-root fullscreen element, prevent the main frame
-        // from scrolling.
+        // If there is a fullscreen element, set the scroll bounds to empty so the main frame won't scroll.
         Document* mainFrameDocument = m_page->deprecatedLocalMainFrame()->document();
         Element* fullscreenElement = Fullscreen::fullscreenElementFrom(*mainFrameDocument);
-        if (fullscreenElement && fullscreenElement != mainFrameDocument->documentElement()) {
-            if (m_page->settings().pinchVirtualViewportEnabled()) {
-                toWebLayer(m_page->frameHost().pinchViewport().scrollLayer())->setUserScrollable(false, false);
-            } else {
-                scrollingWebLayer->setBounds(IntSize());
-            }
-        } else {
-            if (m_page->settings().pinchVirtualViewportEnabled()) {
-                toWebLayer(m_page->frameHost().pinchViewport().scrollLayer())->setUserScrollable(true, true);
-            } else {
-                scrollingWebLayer->setBounds(frameView->contentsSize());
-            }
-        }
-        scrollingWebLayer->setUserScrollable(frameView->userInputScrollable(HorizontalScrollbar), frameView->userInputScrollable(VerticalScrollbar));
+        if (fullscreenElement && fullscreenElement != mainFrameDocument->documentElement())
+            scrollingWebLayer->setBounds(IntSize());
+        else
+            scrollingWebLayer->setBounds(frameView->contentsSize());
     }
 
     const FrameTree& tree = m_page->mainFrame()->tree();
     for (const Frame* child = tree.firstChild(); child; child = child->tree().nextSibling()) {
         if (!child->isLocalFrame())
             continue;
         if (WebLayer* scrollLayer = toWebLayer(toLocalFrame(child)->view()->layerForScrolling()))
             scrollLayer->setBounds(toLocalFrame(child)->view()->contentsSize());
     }
 }
@@ skipping 797 matching lines @@
     bool frameIsScrollable = frameView && frameView->isScrollable();
     if (frameIsScrollable != m_wasFrameScrollable)
         return true;
 
     if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : 0)
         return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds();
     return false;
 }
 
 } // namespace blink