Changeset 162341 in webkit
- Timestamp:
- Jan 20, 2014 8:15:45 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r162340 r162341 1 2014-01-20 Mihai Tica <mitica@adobe.com> 2 3 Background-blend-mode doesn't work for an element with an 4 SVG image as background and border-style or padding set. 5 Tests now use rectangles instead of circles for SVGs. 6 https://bugs.webkit.org/show_bug.cgi?id=118894 7 8 Reviewed by Dirk Schulze. 9 10 * css3/compositing/background-blend-mode-data-uri-svg-image-expected.html: 11 * css3/compositing/background-blend-mode-data-uri-svg-image.html: 12 * platform/efl/TestExpectations: pass tests for efl, blendMode is not implemented. 13 * platform/mac/TestExpectations: marking test as ImageOnlyFailure due to slight pixel inconsistencies between the result and the formula. 14 1 15 2014-01-20 Zalan Bujtas <zalan@apple.com> 2 16 -
trunk/LayoutTests/platform/efl/TestExpectations
r162338 r162341 498 498 webkit.org/b/99200 css3/compositing/blend-mode-simple.html [ Skip ] 499 499 webkit.org/b/99200 css3/compositing/blend-mode-should-not-have-compositing-layer.html [ Skip ] 500 webkit.org/b/118894 css3/compositing/background-blend-mode-data-uri-svg-image-expected.html [ Skip ] 500 501 501 502 # No concept of secure text input -
trunk/LayoutTests/platform/mac/TestExpectations
r162340 r162341 616 616 compositing/overflow/scrolling-without-painting.html 617 617 618 # Blend mode result is slightly different than the applied formula. 619 css3/compositing/background-blend-mode-data-uri-svg-image-expected.html [ ImageOnlyFailure Pass ] 620 618 621 # https://bugs.webkit.org/show_bug.cgi?id=110871 619 622 compositing/overlap-blending/reflection-opacity-huge.html -
trunk/Source/WebCore/ChangeLog
r162340 r162341 1 2014-01-20 Mihai Tica <mitica@adobe.com> 2 3 Background-blend-mode doesn't work for an element with an 4 SVG image as background and border-style or padding set. 5 The problem consisted in the drawing path using the default 6 blending parameter at all times. 7 https://bugs.webkit.org/show_bug.cgi?id=118894 8 9 Reviewed by Dirk Schulze. 10 11 Test: css3/compositing/background-blend-mode-data-uri-svg-image.html 12 13 * svg/graphics/SVGImage.cpp: 14 (WebCore::SVGImage::drawPatternForContainer): Pass blendMode to Image::drawPattern. 15 * svg/graphics/SVGImage.h: Add a blendMode parameter to drawPatternForContainer. 16 * svg/graphics/SVGImageForContainer.cpp: 17 (WebCore::SVGImageForContainer::drawPattern): Pass blendMode to drawPatternForContainer call. 18 1 19 2014-01-20 Zalan Bujtas <zalan@apple.com> 2 20 -
trunk/Source/WebCore/svg/graphics/SVGImage.cpp
r162080 r162341 183 183 184 184 void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize containerSize, float zoom, const FloatRect& srcRect, 185 const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect )185 const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode) 186 186 { 187 187 FloatRect zoomedContainerRect = FloatRect(FloatPoint(), containerSize); … … 214 214 215 215 context->setDrawLuminanceMask(false); 216 image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect );216 image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect, blendMode); 217 217 } 218 218 -
trunk/Source/WebCore/svg/graphics/SVGImage.h
r162158 r162341 93 93 void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode); 94 94 void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace, 95 CompositeOperator, const FloatRect& );95 CompositeOperator, const FloatRect&, BlendMode); 96 96 97 97 std::unique_ptr<SVGImageChromeClient> m_chromeClient; -
trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp
r162080 r162341 44 44 45 45 void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, 46 const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode )46 const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode) 47 47 { 48 48 m_image->setSpaceSize(spaceSize()); 49 m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, colorSpace, compositeOp, dstRect );49 m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, colorSpace, compositeOp, dstRect, blendMode); 50 50 } 51 51
Note: See TracChangeset
for help on using the changeset viewer.