Changeset 147249 in webkit
- Timestamp:
- Mar 29, 2013 1:34:17 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r147245 r147249 1 2013-03-29 Hans Muller <hmuller@adobe.com> 2 3 [CSS Exclusions] Incorrect margin corner radii formula 4 https://bugs.webkit.org/show_bug.cgi?id=111186 5 6 Reviewed by Dirk Schulze. 7 8 * fast/exclusions/resources/subpixel-utils.js: 9 (SubPixelLayout): Added an initSubPixelLayout() function so that inline test code doesn't have to wait until the DOMContentLoaded event. 10 * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left-expected.txt: Added. 11 * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html: Added. 12 * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right-expected.txt: Added. 13 * fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html: Added. 14 1 15 2013-03-19 Ojan Vafai <ojan@chromium.org> 2 16 -
trunk/LayoutTests/fast/exclusions/resources/subpixel-utils.js
r133384 r147249 1 1 var SubPixelLayout = (function() { 2 2 var _subPixelLayout = null; 3 document.addEventListener('DOMContentLoaded', function() {3 function initSubPixelLayout() { 4 4 var elem = document.createElement('div'); 5 5 elem.style.setProperty('width', '4.5px'); … … 8 8 _subPixelLayout = (bounds.width != Math.floor(bounds.width)); 9 9 document.body.removeChild(elem); 10 }); 10 } 11 document.addEventListener('DOMContentLoaded', initSubPixelLayout); 11 12 return { 13 initSubPixelLayout: initSubPixelLayout, 12 14 roundLineLeft: function(f) { 13 15 if (!_subPixelLayout) -
trunk/Source/WebCore/ChangeLog
r147245 r147249 1 2013-03-29 Hans Muller <hmuller@adobe.com> 2 3 [CSS Exclusions] Incorrect margin corner radii formula 4 https://bugs.webkit.org/show_bug.cgi?id=111186 5 6 Reviewed by Dirk Schulze. 7 8 Corrected an error in the forumla for the margin ellipse's radii. 9 10 Tests: fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-left.html 11 fast/exclusions/shape-outside-floats/shape-outside-floats-ellipse-margin-right.html 12 13 * rendering/ExclusionRectangle.cpp: 14 (WebCore::FloatRoundedRect::marginBounds): 15 1 16 2013-03-19 Ojan Vafai <ojan@chromium.org> 2 17 -
trunk/Source/WebCore/rendering/ExclusionRectangle.cpp
r144258 r147249 72 72 float boundsWidth = width() + margin * 2; 73 73 float boundsHeight = height() + margin * 2; 74 float boundsRadiusX = std::max(rx(), margin);75 float boundsRadiusY = std::max(ry(), margin);74 float boundsRadiusX = rx() + margin; 75 float boundsRadiusY = ry() + margin; 76 76 return FloatRoundedRect(FloatRect(boundsX, boundsY, boundsWidth, boundsHeight), FloatSize(boundsRadiusX, boundsRadiusY)); 77 77 }
Note: See TracChangeset
for help on using the changeset viewer.