Merge 114095 - Background width (or height) is wrong if width (or height) * zoom < 1.

Source/WebCore/platform/graphics/IntSize.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * 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
@@ skipping 62 matching lines @@
     bool isEmpty() const { return m_width <= 0 || m_height <= 0; }
     bool isZero() const { return !m_width && !m_height; }
 
     float aspectRatio() const { return static_cast<float>(m_width) / static_cast<float>(m_height); }
     
     void expand(int width, int height)
     {
         m_width += width;
         m_height += height;
     }
+
+    void scale(float widthScale, float heightScale)
+    {
+        m_width = static_cast<int>(static_cast<float>(m_width) * widthScale);
+        m_height = static_cast<int>(static_cast<float>(m_height) * heightScale);
+    }
     
     void scale(float scale)
     {
-        m_width = static_cast<int>(static_cast<float>(m_width) * scale);
-        m_height = static_cast<int>(static_cast<float>(m_height) * scale);
+        this->scale(scale, scale);
     }
-    
+
     IntSize expandedTo(const IntSize& other) const
     {
         return IntSize(m_width > other.m_width ? m_width : other.m_width,
             m_height > other.m_height ? m_height : other.m_height);
     }
 
     IntSize shrunkTo(const IntSize& other) const
     {
         return IntSize(m_width < other.m_width ? m_width : other.m_width,
             m_height < other.m_height ? m_height : other.m_height);
     }
 
     void clampNegativeToZero()
     {
         *this = expandedTo(IntSize());
     }
 
+    void clampToMinimumSize(const IntSize& minimumSize)
+    {
+        if (m_width < minimumSize.width())
+            m_width = minimumSize.width();
+        if (m_height < minimumSize.height())
+            m_height = minimumSize.height();
+    }
+
     int diagonalLengthSquared() const
     {
         return m_width * m_width + m_height * m_height;
     }
 
     IntSize transposedSize() const
     {
         return IntSize(m_height, m_width);
     }
 
@@ skipping 66 matching lines @@
 }
 
 inline bool operator!=(const IntSize& a, const IntSize& b)
 {
     return a.width() != b.width() || a.height() != b.height();
 }
 
 } // namespace WebCore
 
 #endif // IntSize_h