Changeset 88009 in webkit

Timestamp:

Jun 3, 2011 5:43:26 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

2011-06-03 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Andreas Kling.

Incorrect embedded document replaced size calculation for box-sizing: border-box
​https://bugs.webkit.org/show_bug.cgi?id=62007

When using <object style="box-sizing: border-box" data="foo.svg"/> to embed foo.svg
which has an intrinsic width/height, the embedded document intrinsic size is incorrect.

• platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png: Added.
• platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.txt: Added.
• platform/mac/svg/as-object: Added.
• platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.png: Added.
• platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.txt: Added.
• svg/as-image/img-preserveAspectRatio-support-2.html: Added.
• svg/as-image/resources/circle-default-default.svg: Added.
• svg/as-object: Added.
• svg/as-object/object-box-sizing-no-width-height.html: Added.

2011-06-03 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Andreas Kling.

Incorrect embedded document replaced size calculation for box-sizing: border-box
​https://bugs.webkit.org/show_bug.cgi?id=62007

When using <object style="box-sizing: border-box" data="foo.svg"/> to embed foo.svg
which has an intrinsic width/height, the embedded document intrinsic size is incorrect.

RenderPart::computeEmbeddedDocumentReplacedWidth/Height has to ask the content renderer for the replaced width/height not ourselves.

Tests: svg/as-image/img-preserveAspectRatio-support-2.html

svg/as-object/object-box-sizing-no-width-height.html

• rendering/RenderPart.cpp: (WebCore::RenderPart::computeEmbeddedDocumentReplacedWidth): (WebCore::RenderPart::computeEmbeddedDocumentReplacedHeight):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png (added)
• LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.txt (added)
• LayoutTests/platform/mac/svg/as-object (added)
• LayoutTests/platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.png (added)
• LayoutTests/platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.txt (added)
• LayoutTests/svg/as-image/img-preserveAspectRatio-support-2.html (added)
• LayoutTests/svg/as-image/resources/circle-default-default.svg (added)
• LayoutTests/svg/as-object (added)
• LayoutTests/svg/as-object/object-box-sizing-no-width-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderPart.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-03  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Andreas Kling.
+
+        Incorrect embedded document replaced size calculation for box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=62007
+
+        When using <object style="box-sizing: border-box" data="foo.svg"/> to embed foo.svg
+        which has an intrinsic width/height, the embedded document intrinsic size is incorrect.
+
+        * platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png: Added.
+        * platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.txt: Added.
+        * platform/mac/svg/as-object: Added.
+        * platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.png: Added.
+        * platform/mac/svg/as-object/object-box-sizing-no-width-height-expected.txt: Added.
+        * svg/as-image/img-preserveAspectRatio-support-2.html: Added.
+        * svg/as-image/resources/circle-default-default.svg: Added.
+        * svg/as-object: Added.
+        * svg/as-object/object-box-sizing-no-width-height.html: Added.
+
 2011-06-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Andreas Kling.
+
+        Incorrect embedded document replaced size calculation for box-sizing: border-box
+        https://bugs.webkit.org/show_bug.cgi?id=62007
+
+        When using <object style="box-sizing: border-box" data="foo.svg"/> to embed foo.svg
+        which has an intrinsic width/height, the embedded document intrinsic size is incorrect.
+
+        RenderPart::computeEmbeddedDocumentReplacedWidth/Height has to ask the content renderer for the replaced width/height not ourselves.
+
+        Tests: svg/as-image/img-preserveAspectRatio-support-2.html
+               svg/as-object/object-box-sizing-no-width-height.html
+
+        * rendering/RenderPart.cpp:
+        (WebCore::RenderPart::computeEmbeddedDocumentReplacedWidth):
+        (WebCore::RenderPart::computeEmbeddedDocumentReplacedHeight):
+
 2011-06-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderPart.cpp

@@ -117 +117 @@
     ASSERT(contentRenderer);
     ASSERT(contentRenderer->style());
-    return computeReplacedLogicalWidthRespectingMinMaxWidth(computeReplacedLogicalWidthUsing(contentRenderer->style()->logicalWidth()), includeMaxWidth);
+    return contentRenderer->computeReplacedLogicalWidthRespectingMinMaxWidth(contentRenderer->computeReplacedLogicalWidthUsing(contentRenderer->style()->logicalWidth()), includeMaxWidth);
 }
 
@@ -124 +124 @@
     ASSERT(contentRenderer);
     ASSERT(contentRenderer->style());
-    return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(contentRenderer->style()->logicalHeight()));
+    return contentRenderer->computeReplacedLogicalHeightRespectingMinMaxHeight(contentRenderer->computeReplacedLogicalHeightUsing(contentRenderer->style()->logicalHeight()));
 }