Use IntRect instead of FloatRect for window positions and sizes

Source/core/page/WindowFeatures.cpp

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2006 Jon Shier (jshier@iastate.edu)
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reseved.
  *  Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  *  USA
  */
 
 #include "config.h"
 #include "core/page/WindowFeatures.h"
 
-#include "platform/geometry/FloatRect.h"
+#include "platform/geometry/IntRect.h"
 #include "wtf/Assertions.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 // Though isspace() considers \t and \v to be whitespace, Win IE doesn't when parsing window features.
 static bool isWindowFeaturesSeparator(UChar c)
 {
     return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '=' || c == ',' || c == '\0';
@@ skipping 121 matching lines @@
     else if (keyString == "status")
         statusBarVisible = value;
     else if (keyString == "fullscreen")
         fullscreen = value;
     else if (keyString == "scrollbars")
         scrollbarsVisible = value;
     else if (value == 1)
         additionalFeatures.append(keyString);
 }
 
-WindowFeatures::WindowFeatures(const String& dialogFeaturesString, const FloatRect& screenAvailableRect)
+WindowFeatures::WindowFeatures(const String& dialogFeaturesString, const IntRect& screenAvailableRect)
     : widthSet(true)
     , heightSet(true)
     , menuBarVisible(false)
     , toolBarVisible(false)
     , locationBarVisible(false)
     , fullscreen(false)
     , dialog(true)
 {
     DialogFeaturesMap features;
     parseDialogFeatures(dialogFeaturesString, features);
 
     const bool trusted = false;
 
     // The following features from Microsoft's documentation are not implemented:
     // - default font settings
     // - width, height, left, and top specified in units other than "px"
     // - edge (sunken or raised, default is raised)
     // - dialogHide: trusted && boolFeature(features, "dialoghide"), makes dialog hide when you print
     // - help: boolFeature(features, "help", true), makes help icon appear in dialog (what does it do on Windows?)
     // - unadorned: trusted && boolFeature(features, "unadorned");
 
-    width = floatFeature(features, "dialogwidth", 100, screenAvailableRect.width(), 620); // default here came from frame size of dialog in MacIE
-    height = floatFeature(features, "dialogheight", 100, screenAvailableRect.height(), 450); // default here came from frame size of dialog in MacIE
+    width = intFeature(features, "dialogwidth", 100, screenAvailableRect.width(), 620); // default here came from frame size of dialog in MacIE
+    height = intFeature(features, "dialogheight", 100, screenAvailableRect.height(), 450); // default here came from frame size of dialog in MacIE
 
-    x = floatFeature(features, "dialogleft", screenAvailableRect.x(), screenAvailableRect.maxX() - width, -1);
+    x = intFeature(features, "dialogleft", screenAvailableRect.x(), screenAvailableRect.maxX() - width, -1);
     xSet = x > 0;
-    y = floatFeature(features, "dialogtop", screenAvailableRect.y(), screenAvailableRect.maxY() - height, -1);
+    y = intFeature(features, "dialogtop", screenAvailableRect.y(), screenAvailableRect.maxY() - height, -1);
     ySet = y > 0;
 
     if (boolFeature(features, "center", true)) {
         if (!xSet) {
             x = screenAvailableRect.x() + (screenAvailableRect.width() - width) / 2;
             xSet = true;
         }
         if (!ySet) {
             y = screenAvailableRect.y() + (screenAvailableRect.height() - height) / 2;
             ySet = true;
         }
     }
 
     resizable = boolFeature(features, "resizable");
     scrollbarsVisible = boolFeature(features, "scroll", true);
     statusBarVisible = boolFeature(features, "status", !trusted);
 }
 
 bool WindowFeatures::boolFeature(const DialogFeaturesMap& features, const char* key, bool defaultValue)
 {
     DialogFeaturesMap::const_iterator it = features.find(key);
     if (it == features.end())
         return defaultValue;
     const String& value = it->value;
     return value.isNull() || value == "1" || value == "yes" || value == "on";
 }
 
-float WindowFeatures::floatFeature(const DialogFeaturesMap& features, const char* key, float min, float max, float defaultValue)
+int WindowFeatures::intFeature(const DialogFeaturesMap& features, const char* key, int min, int max, int defaultValue)
 {
     DialogFeaturesMap::const_iterator it = features.find(key);
     if (it == features.end())
         return defaultValue;
-    // FIXME: The toDouble function does not offer a way to tell "0q" from string with no digits in it: Both
-    // return the number 0 and false for ok. But "0q" should yield the minimum rather than the default.
     bool ok;
-    double parsedNumber = it->value.toDouble(&ok);
-    if ((!parsedNumber && !ok) || std::isnan(parsedNumber))
+    int parsedNumber = it->value.toInt(&ok);
+    if (!ok)
         return defaultValue;
     if (parsedNumber < min || max <= min)
         return min;
     if (parsedNumber > max)
         return max;
-    // FIXME: Seems strange to cast a double to int and then convert back to a float. Why is this a good idea?
-    return static_cast<int>(parsedNumber);

[Jens Widell, 2015/01/28 12:29:55]

Due to this cast, changing the return type from 'float' to 'int' doesn't really
change anything. (Unless the 'min', 'max' or 'defaultValue' arguments were
non-integer, but they never are.)

Also, this only affects showModalDialog(), AFAICT.

+    return parsedNumber;
 }
 
 void WindowFeatures::parseDialogFeatures(const String& string, DialogFeaturesMap& map)
 {
     Vector<String> vector;
     string.split(';', vector);
     size_t size = vector.size();
     for (size_t i = 0; i < size; ++i) {
         const String& featureString = vector[i];
 
@@ skipping 11 matching lines @@
         if (separatorPosition != kNotFound) {
             value = featureString.substring(separatorPosition + 1).stripWhiteSpace().lower();
             value = value.left(value.find(' '));
         }
 
         map.set(key, value);
     }
 }
 
 } // namespace blink