Make createWindow (mostly) work with OOPIF

Source/core/page/Chrome.cpp

 /*
  * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 20 matching lines @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/HitTestResult.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/PopupOpeningObserver.h"
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/WindowFeatures.h"
 #include "platform/FileChooser.h"
 #include "platform/Logging.h"
+#include "platform/PlatformScreen.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/network/NetworkHints.h"
 #include "public/platform/WebScreenInfo.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
+#include <algorithm>
+
+using namespace std;

[dcheng, 2015/04/29 21:37:46]

This is generally discourage in Chrome, and we probably shouldn't do this in
Blink either. I'd prefer to see max and min explicitly qualified with std (or
just using std::max/using std::min like we used to)

[Nate Chapin, 2015/05/01 20:30:52]

Done.

 
 namespace blink {
 
 using namespace HTMLNames;
 
 Chrome::Chrome(Page* page, ChromeClient* client)
     : m_page(page)
     , m_client(client)
 {
     ASSERT(m_client);
@@ skipping 21 matching lines @@
 blink::WebScreenInfo Chrome::screenInfo() const
 {
     return m_client->screenInfo();
 }
 
 void Chrome::contentsSizeChanged(LocalFrame* frame, const IntSize& size) const
 {
     m_client->contentsSizeChanged(frame, size);
 }
 
-void Chrome::setWindowRect(const IntRect& rect) const
+void Chrome::setWindowRect(Widget* widget, const IntRect& pendingRect) const
 {
-    m_client->setWindowRect(rect);
+    IntRect screen = screenAvailableRect(widget);
+    IntRect window = pendingRect;
+
+    IntSize minimumSize = m_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())));
+
+
+    m_client->setWindowRect(window);
 }
 
 IntRect Chrome::windowRect() const
 {
     return m_client->windowRect();
 }
 
 IntRect Chrome::pageRect() const
 {
     return m_client->pageRect();
@@ skipping 288 matching lines @@
 {
     m_client->registerViewportLayers();
 }
 
 void Chrome::willBeDestroyed()
 {
     m_client->chromeDestroyed();
 }
 
 } // namespace blink