Use IntRect instead of FloatRect for window positions and sizes

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 83 matching lines @@
 #include "core/page/WindowFocusAllowedIndicator.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/storage/Storage.h"
 #include "core/storage/StorageArea.h"
 #include "core/storage/StorageNamespace.h"
 #include "core/timing/Performance.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/PlatformScreen.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
-#include "platform/geometry/FloatRect.h"
+#include "platform/geometry/IntRect.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
 #include "wtf/MainThread.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 
 using std::min;
@@ skipping 205 matching lines @@
         return false;
     return frame->isMainFrame();
 }
 
 unsigned LocalDOMWindow::pendingUnloadEventListeners() const
 {
     return windowsWithUnloadEventListeners().count(const_cast<LocalDOMWindow*>(this));
 }
 
 // This function:
-// 1) Validates the pending changes are not changing any value to NaN; in that case keep original value.
-// 2) Constrains the window rect to the minimum window size and no bigger than the float rect's dimensions.
-// 3) Constrains the window rect to within the top and left boundaries of the available screen rect.
-// 4) Constrains the window rect to within the bottom and right boundaries of the available screen rect.
-// 5) Translate the window rect coordinates to be within the coordinate space of the screen.
-FloatRect LocalDOMWindow::adjustWindowRect(LocalFrame& frame, const FloatRect& pendingChanges)
+// 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);
 
-    FloatRect screen = screenAvailableRect(frame.view());
-    FloatRect window = host->chrome().windowRect();
+    IntRect screen = screenAvailableRect(frame.view());
+    IntRect window = pendingChanges;
 
-    // Make sure we're in a valid state before adjusting dimensions.
-    ASSERT(std::isfinite(screen.x()));
-    ASSERT(std::isfinite(screen.y()));
-    ASSERT(std::isfinite(screen.width()));
-    ASSERT(std::isfinite(screen.height()));
-    ASSERT(std::isfinite(window.x()));
-    ASSERT(std::isfinite(window.y()));
-    ASSERT(std::isfinite(window.width()));
-    ASSERT(std::isfinite(window.height()));
-
-    // Update window values if new requested values are not NaN.
-    if (!std::isnan(pendingChanges.x()))
-        window.setX(pendingChanges.x());
-    if (!std::isnan(pendingChanges.y()))
-        window.setY(pendingChanges.y());
-    if (!std::isnan(pendingChanges.width()))
-        window.setWidth(pendingChanges.width());
-    if (!std::isnan(pendingChanges.height()))
-        window.setHeight(pendingChanges.height());
-
-    FloatSize minimumSize = host->chrome().client().minimumWindowSize();
+    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())));
 
@@ skipping 689 matching lines @@
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(host->chrome().windowRect().height() * host->deviceScaleFactor());
-    return static_cast<int>(host->chrome().windowRect().height());
+    return host->chrome().windowRect().height();
 }
 
 int LocalDOMWindow::outerWidth() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(host->chrome().windowRect().width() * host->deviceScaleFactor());
-    return static_cast<int>(host->chrome().windowRect().width());
+    return host->chrome().windowRect().width();
 }
 
 int LocalDOMWindow::innerHeight() const
 {
     if (!frame())
         return 0;
 
     FrameView* view = frame()->view();
     if (!view)
         return 0;
@@ skipping 45 matching lines @@
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(host->chrome().windowRect().x() * host->deviceScaleFactor());
-    return static_cast<int>(host->chrome().windowRect().x());
+    return host->chrome().windowRect().x();
 }
 
 int LocalDOMWindow::screenY() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(host->chrome().windowRect().y() * host->deviceScaleFactor());
-    return static_cast<int>(host->chrome().windowRect().y());
+    return host->chrome().windowRect().y();
 }
 
 double LocalDOMWindow::scrollX() const
 {
     if (!frame())
         return 0;
 
     FrameView* view = frame()->view();
     if (!view)
         return 0;
@@ skipping 235 matching lines @@
         if (std::isnan(scrollToOptions.top()))
             return;
         scaledY = scrollToOptions.top() * frame()->pageZoomFactor();
     }
 
     ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
     ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
     scrollViewportTo(frame(), DoublePoint(scaledX, scaledY), scrollBehavior);
 }
 
-void LocalDOMWindow::moveBy(float x, float y) const
+void LocalDOMWindow::moveBy(int x, int y) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    FloatRect windowRect = host->chrome().windowRect();
+    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));
 }
 
-void LocalDOMWindow::moveTo(float x, float y) const
+void LocalDOMWindow::moveTo(int x, int y, bool hasX, bool hasY) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    FloatRect windowRect = host->chrome().windowRect();
-    windowRect.setLocation(FloatPoint(x, y));
+    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));
 }
 
-void LocalDOMWindow::resizeBy(float x, float y) const
+void LocalDOMWindow::resizeBy(int x, int y) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    FloatRect fr = host->chrome().windowRect();
-    FloatSize dest = fr.size() + FloatSize(x, y);
-    FloatRect update(fr.location(), dest);
+    IntRect fr = host->chrome().windowRect();
+    IntSize dest = fr.size() + IntSize(x, y);
+    IntRect update(fr.location(), dest);
     host->chrome().setWindowRect(adjustWindowRect(*frame(), update));
 }
 
-void LocalDOMWindow::resizeTo(float width, float height) const
+void LocalDOMWindow::resizeTo(int width, int height, bool hasWidth, bool hasHeight) const
 {
     if (!frame() || !frame()->isMainFrame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
-    FloatRect fr = host->chrome().windowRect();
-    FloatSize dest = FloatSize(width, height);
-    FloatRect update(fr.location(), dest);
+    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));
 }
 
 int LocalDOMWindow::requestAnimationFrame(RequestAnimationFrameCallback* callback)
 {
     callback->m_useLegacyTimeBase = false;
     if (Document* d = document())
         return d->requestAnimationFrame(callback);
     return 0;
 }
@@ skipping 362 matching lines @@
     return m_frameObserver->frame();
 }
 
 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
     return v8::Handle<v8::Object>();
 }
 
 } // namespace blink