Changeset 47650 in webkit

Timestamp:

Aug 21, 2009 5:33:18 PM (15 years ago)

Author:

mitz@apple.com

Message:

WebCore:
Rendering changes to complete
[CSS3 Backgrounds and Borders] Add support for the "contain" value for
background-size
​https://bugs.webkit.org/show_bug.cgi?id=27573
and
[CSS3 Backgrounds and Borders] Add support for the "cover" value for
background-size
​https://bugs.webkit.org/show_bug.cgi?id=27574

Reviewed by Beth Dakin.

Test: fast/backgrounds/size/contain-and-cover.html

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::calculateBackgroundSize):

• rendering/RenderObject.cpp:

(WebCore::mustRepaintFillLayers):

LayoutTests:
Rendering tests for
[CSS3 Backgrounds and Borders] Add support for the "contain" value for
background-size
​https://bugs.webkit.org/show_bug.cgi?id=27573
and
[CSS3 Backgrounds and Borders] Add support for the "cover" value for
background-size
​https://bugs.webkit.org/show_bug.cgi?id=27574

Reviewed by Beth Dakin.

• fast/backgrounds/size/contain-and-cover-expected.checksum: Added.
• fast/backgrounds/size/contain-and-cover-expected.png: Added.
• fast/backgrounds/size/contain-and-cover-expected.txt: Added.
• fast/backgrounds/size/contain-and-cover.html: Added.
• fast/backgrounds/size/resources/SquirrelFish.svg: Added!!!

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/size/contain-and-cover-expected.checksum (added)
• LayoutTests/fast/backgrounds/size/contain-and-cover-expected.png (added)
• LayoutTests/fast/backgrounds/size/contain-and-cover-expected.txt (added)
• LayoutTests/fast/backgrounds/size/contain-and-cover.html (added)
• LayoutTests/fast/backgrounds/size/resources/SquirrelFish.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Rendering tests for
+        [CSS3 Backgrounds and Borders] Add support for the "contain" value for
+        background-size
+        https://bugs.webkit.org/show_bug.cgi?id=27573
+        and
+        [CSS3 Backgrounds and Borders] Add support for the "cover" value for
+        background-size
+        https://bugs.webkit.org/show_bug.cgi?id=27574
+
+        * fast/backgrounds/size/contain-and-cover-expected.checksum: Added.
+        * fast/backgrounds/size/contain-and-cover-expected.png: Added.
+        * fast/backgrounds/size/contain-and-cover-expected.txt: Added.
+        * fast/backgrounds/size/contain-and-cover.html: Added.
+        * fast/backgrounds/size/resources/SquirrelFish.svg: Added!!!
+
 2009-08-21  Michelangelo De Simone  <micdesim@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Rendering changes to complete
+        [CSS3 Backgrounds and Borders] Add support for the "contain" value for
+        background-size
+        https://bugs.webkit.org/show_bug.cgi?id=27573
+        and
+        [CSS3 Backgrounds and Borders] Add support for the "cover" value for
+        background-size
+        https://bugs.webkit.org/show_bug.cgi?id=27574
+
+        Test: fast/backgrounds/size/contain-and-cover.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::calculateBackgroundSize):
+        * rendering/RenderObject.cpp:
+        (WebCore::mustRepaintFillLayers):
+
 2009-08-21  Michelangelo De Simone  <micdesim@gmail.com>
 

trunk/WebCore/rendering/RenderBoxModelObject.cpp

@@ -499 +499 @@
     bg->setImageContainerSize(IntSize(scaledWidth, scaledHeight)); // Use the box established by background-origin.
 
-    if (bgLayer->size().type == SizeLength) {
-        int w = scaledWidth;
-        int h = scaledHeight;
-        Length bgWidth = bgLayer->size().size.width();
-        Length bgHeight = bgLayer->size().size.height();
-
-        if (bgWidth.isFixed())
-            w = bgWidth.value();
-        else if (bgWidth.isPercent())
-            w = bgWidth.calcValue(scaledWidth);
-        
-        if (bgHeight.isFixed())
-            h = bgHeight.value();
-        else if (bgHeight.isPercent())
-            h = bgHeight.calcValue(scaledHeight);
-        
-        // If one of the values is auto we have to use the appropriate
-        // scale to maintain our aspect ratio.
-        if (bgWidth.isAuto() && !bgHeight.isAuto())
-            w = bg->imageSize(this, style()->effectiveZoom()).width() * h / bg->imageSize(this, style()->effectiveZoom()).height();        
-        else if (!bgWidth.isAuto() && bgHeight.isAuto())
-            h = bg->imageSize(this, style()->effectiveZoom()).height() * w / bg->imageSize(this, style()->effectiveZoom()).width();
-        else if (bgWidth.isAuto() && bgHeight.isAuto()) {
-            // If both width and height are auto, we just want to use the image's
-            // intrinsic size.
-            w = bg->imageSize(this, style()->effectiveZoom()).width();
-            h = bg->imageSize(this, style()->effectiveZoom()).height();
-        }
-        
-        return IntSize(max(1, w), max(1, h));
-    } else
-        return bg->imageSize(this, style()->effectiveZoom());
+    EFillSizeType type = bgLayer->size().type;
+
+    switch (type) {
+        case SizeLength: {
+            int w = scaledWidth;
+            int h = scaledHeight;
+            Length bgWidth = bgLayer->size().size.width();
+            Length bgHeight = bgLayer->size().size.height();
+
+            if (bgWidth.isFixed())
+                w = bgWidth.value();
+            else if (bgWidth.isPercent())
+                w = bgWidth.calcValue(scaledWidth);
+            
+            if (bgHeight.isFixed())
+                h = bgHeight.value();
+            else if (bgHeight.isPercent())
+                h = bgHeight.calcValue(scaledHeight);
+            
+            // If one of the values is auto we have to use the appropriate
+            // scale to maintain our aspect ratio.
+            if (bgWidth.isAuto() && !bgHeight.isAuto())
+                w = bg->imageSize(this, style()->effectiveZoom()).width() * h / bg->imageSize(this, style()->effectiveZoom()).height();        
+            else if (!bgWidth.isAuto() && bgHeight.isAuto())
+                h = bg->imageSize(this, style()->effectiveZoom()).height() * w / bg->imageSize(this, style()->effectiveZoom()).width();
+            else if (bgWidth.isAuto() && bgHeight.isAuto()) {
+                // If both width and height are auto, we just want to use the image's
+                // intrinsic size.
+                w = bg->imageSize(this, style()->effectiveZoom()).width();
+                h = bg->imageSize(this, style()->effectiveZoom()).height();
+            }
+            
+            return IntSize(max(1, w), max(1, h));
+        }
+        case Contain:
+        case Cover: {
+            IntSize imageIntrinsicSize = bg->imageSize(this, 1);
+            float horizontalScaleFactor = static_cast<float>(scaledWidth) / imageIntrinsicSize.width();
+            float verticalScaleFactor = static_cast<float>(scaledHeight) / imageIntrinsicSize.height();
+            float scaleFactor = type == Contain ? min(horizontalScaleFactor, verticalScaleFactor) : max(horizontalScaleFactor, verticalScaleFactor);
+
+            return IntSize(max<int>(1, imageIntrinsicSize.width() * scaleFactor), max<int>(1, imageIntrinsicSize.height() * scaleFactor));
+        }
+        case SizeNone:
+            ASSERT_NOT_REACHED();
+            break;
+    }
+    return bg->imageSize(this, style()->effectiveZoom());
 }
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -660 +660 @@
         if (layer->size().size.width().isPercent() || layer->size().size.height().isPercent())
             return true;
-    } else if (img->usesImageContainerSize())
+    } else if (layer->size().type == Contain || layer->size().type == Cover || img->usesImageContainerSize())
         return true;