Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 153 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/FloatSize.h b/Source/WebCore/platform/graphics/FloatSize.h
new file mode 100644
index 0000000..160fc9a
--- /dev/null
+++ b/Source/WebCore/platform/graphics/FloatSize.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005 Nokia.  All rights reserved.
+ *               2008 Eric Seidel <eric@webkit.org>
+ *
+ * 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FloatSize_h
+#define FloatSize_h
+
+#include "IntSize.h"
+#include <wtf/MathExtras.h>
+
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+typedef struct CGSize CGSize;
+#endif
+
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+typedef struct CGSize NSSize;
+#else
+typedef struct _NSSize NSSize;
+#endif
+#endif
+
+namespace WebCore {
+
+class IntSize;
+
+class FloatSize {
+public:
+    FloatSize() : m_width(0), m_height(0) { }
+    FloatSize(float width, float height) : m_width(width), m_height(height) { }
+    FloatSize(const IntSize&);
+
+    static FloatSize narrowPrecision(double width, double height);
+
+    float width() const { return m_width; }
+    float height() const { return m_height; }
+
+    void setWidth(float width) { m_width = width; }
+    void setHeight(float height) { m_height = height; }
+
+    bool isEmpty() const { return m_width <= 0 || m_height <= 0; }
+
+    float aspectRatio() const { return m_width / m_height; }
+
+    void scale(float scale)
+    {
+        m_width *= scale;
+        m_height *= scale;
+    }
+
+    FloatSize expandedTo(const FloatSize& other) const
+    {
+        return FloatSize(m_width > other.m_width ? m_width : other.m_width,
+            m_height > other.m_height ? m_height : other.m_height);
+    }
+
+    FloatSize shrunkTo(const FloatSize& other) const
+    {
+       return FloatSize(m_width < other.m_width ? m_width : other.m_width,
+           m_height < other.m_height ? m_height : other.m_height);
+    }
+
+    float diagonalLength() const;
+    float diagonalLengthSquared() const
+    {
+        return m_width * m_width + m_height * m_height;
+    }
+
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+    explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
+    operator CGSize() const;
+#endif
+
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
+        || (PLATFORM(CHROMIUM) && OS(DARWIN))
+    explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
+    operator NSSize() const;
+#endif
+
+private:
+    float m_width, m_height;
+};
+
+inline FloatSize& operator+=(FloatSize& a, const FloatSize& b)
+{
+    a.setWidth(a.width() + b.width());
+    a.setHeight(a.height() + b.height());
+    return a;
+}
+
+inline FloatSize& operator-=(FloatSize& a, const FloatSize& b)
+{
+    a.setWidth(a.width() - b.width());
+    a.setHeight(a.height() - b.height());
+    return a;
+}
+
+inline FloatSize operator+(const FloatSize& a, const FloatSize& b)
+{
+    return FloatSize(a.width() + b.width(), a.height() + b.height());
+}
+
+inline FloatSize operator-(const FloatSize& a, const FloatSize& b)
+{
+    return FloatSize(a.width() - b.width(), a.height() - b.height());
+}
+
+inline FloatSize operator-(const FloatSize& size)
+{
+    return FloatSize(-size.width(), -size.height());
+}
+
+inline bool operator==(const FloatSize& a, const FloatSize& b)
+{
+    return a.width() == b.width() && a.height() == b.height();
+}
+
+inline bool operator!=(const FloatSize& a, const FloatSize& b)
+{
+    return a.width() != b.width() || a.height() != b.height();
+}
+
+inline IntSize roundedIntSize(const FloatSize& p)
+{
+    return IntSize(static_cast<int>(roundf(p.width())), static_cast<int>(roundf(p.height())));
+}
+
+} // namespace WebCore
+
+#endif // FloatSize_h