Make createWindow (mostly) work with OOPIF

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 53 matching lines @@
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/CreateWindow.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/page/WindowFeatures.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/PlatformScreen.h"
 #include "public/platform/Platform.h"
-#include <algorithm>
-
-using std::min;
-using std::max;
 
 namespace blink {
 
 LocalDOMWindow::WindowFrameObserver::WindowFrameObserver(LocalDOMWindow* window, LocalFrame& frame)
     : LocalFrameLifecycleObserver(&frame)
     , m_window(window)
 {
 }
 
 PassOwnPtrWillBeRawPtr<LocalDOMWindow::WindowFrameObserver> LocalDOMWindow::WindowFrameObserver::create(LocalDOMWindow* window, LocalFrame& frame)
@@ skipping 158 matching lines @@
     if (!frame)
         return false;
     return frame->isMainFrame();
 }
 
 unsigned LocalDOMWindow::pendingUnloadEventListeners() const
 {
     return windowsWithUnloadEventListeners().count(const_cast<LocalDOMWindow*>(this));
 }
 
-// This function:
-// 1) Constrains the window rect to the minimum window size and no bigger than the int rect's dimensions.
-// 2) Constrains the window rect to within the top and left boundaries of the available screen rect.
-// 3) Constrains the window rect to within the bottom and right boundaries of the available screen rect.
-// 4) Translate the window rect coordinates to be within the coordinate space of the screen.
-IntRect LocalDOMWindow::adjustWindowRect(LocalFrame& frame, const IntRect& pendingChanges)
-{
-    FrameHost* host = frame.host();
-    ASSERT(host);
-
-    IntRect screen = screenAvailableRect(frame.view());
-    IntRect window = pendingChanges;
-
-    IntSize minimumSize = host->chrome().client().minimumWindowSize();
-    // Let size 0 pass through, since that indicates default size, not minimum size.
-    if (window.width())
-        window.setWidth(min(max(minimumSize.width(), window.width()), screen.width()));
-    if (window.height())
-        window.setHeight(min(max(minimumSize.height(), window.height()), screen.height()));
-
-    // Constrain the window position within the valid screen area.
-    window.setX(max(screen.x(), min(window.x(), screen.maxX() - window.width())));
-    window.setY(max(screen.y(), min(window.y(), screen.maxY() - window.height())));
-
-    return window;
-}
-
 bool LocalDOMWindow::allowPopUp(LocalFrame& firstFrame)
 {
     if (UserGestureIndicator::processingUserGesture())
         return true;
 
     Settings* settings = firstFrame.settings();
     return settings && settings->javaScriptCanOpenWindowsAutomatically();
 }
 
 bool LocalDOMWindow::allowPopUp()
@@ skipping 979 matching lines @@
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     IntRect windowRect = host->chrome().windowRect();
     windowRect.move(x, y);
     // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
-    host->chrome().setWindowRect(adjustWindowRect(*frame(), windowRect));
+    host->chrome().setWindowRect(frame()->view(), windowRect);
 }
 
 void LocalDOMWindow::moveTo(int x, int y, bool hasX, bool hasY) const
 {
     if (!hasX || !hasY)
         UseCounter::count(document(), UseCounter::WindowMoveResizeMissingArguments);
 
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     IntRect windowRect = host->chrome().windowRect();
     windowRect.setLocation(IntPoint(hasX ? x : windowRect.x(), hasY ? y : windowRect.y()));
     // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
-    host->chrome().setWindowRect(adjustWindowRect(*frame(), windowRect));
+    host->chrome().setWindowRect(frame()->view(), windowRect);
 }
 
 void LocalDOMWindow::resizeBy(int x, int y, bool hasX, bool hasY) const
 {
     if (!hasX || !hasY)
         UseCounter::count(document(), UseCounter::WindowMoveResizeMissingArguments);
 
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     IntRect fr = host->chrome().windowRect();
     IntSize dest = fr.size() + IntSize(x, y);
     IntRect update(fr.location(), dest);
-    host->chrome().setWindowRect(adjustWindowRect(*frame(), update));
+    host->chrome().setWindowRect(frame()->view(), update);
 }
 
 void LocalDOMWindow::resizeTo(int width, int height, bool hasWidth, bool hasHeight) const
 {
     if (!hasWidth || !hasHeight)
         UseCounter::count(document(), UseCounter::WindowMoveResizeMissingArguments);
 
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     IntRect fr = host->chrome().windowRect();
     IntSize dest = IntSize(hasWidth ? width : fr.width(), hasHeight ? height : fr.height());
     IntRect update(fr.location(), dest);
-    host->chrome().setWindowRect(adjustWindowRect(*frame(), update));
+    host->chrome().setWindowRect(frame()->view(), update);
 }
 
 int LocalDOMWindow::requestAnimationFrame(FrameRequestCallback* callback)
 {
     callback->m_useLegacyTimeBase = false;
     if (Document* d = document())
         return d->requestAnimationFrame(callback);
     return 0;
 }
 
@@ skipping 187 matching lines @@
             return targetFrame->domWindow();
 
         if (urlString.isEmpty())
             return targetFrame->domWindow();
 
         targetFrame->navigate(*activeDocument, completedURL, false);
         return targetFrame->domWindow();
     }
 
     WindowFeatures windowFeatures(windowFeaturesString);
-    LocalFrame* result = createWindow(urlString, frameName, windowFeatures, *callingWindow, *firstFrame, *frame());
+    Frame* result = createWindow(urlString, frameName, windowFeatures, *callingWindow, *firstFrame, *frame());
     return result ? result->domWindow() : nullptr;
 }
 
 DEFINE_TRACE(LocalDOMWindow)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_frameObserver);
     visitor->trace(m_document);
     visitor->trace(m_properties);
     visitor->trace(m_screen);
@@ skipping 16 matching lines @@
     DOMWindow::trace(visitor);
     DOMWindowLifecycleNotifier::trace(visitor);
 }
 
 LocalFrame* LocalDOMWindow::frame() const
 {
     return m_frameObserver->frame();
 }
 
 } // namespace blink