Changeset 148949 in webkit
- Timestamp:
- Apr 23, 2013 1:17:05 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 7 added
- 3 deleted
- 11 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r148948 r148949 1 2013-04-23 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Respect image-rendering setting for determing image-rendering quality 4 https://bugs.webkit.org/show_bug.cgi?id=113405 5 6 Reviewed by Benjamin Poulain. 7 8 Moved the two tests of image-rendering out of CSS3 since it was removed from the final recommendation. 9 Added tests of the supported values, and upgraded one test to a reference test so that it now tests 10 that -webkit-optimize-contrast gets converted to and treated as -webkit-crisp-edges. 11 12 Baselines for fast/css/image-rendering.html will be uploaded later when the bots have generated them. 13 14 * css3/images/optimize-contrast-image-expected.png: Removed. 15 * css3/images/optimize-contrast-image-expected.txt: Removed. 16 * fast/css/image-rendering-canvas-expected.png: Renamed from LayoutTests/css3/images/optimize-contrast-canvas-expected.png. 17 * fast/css/image-rendering-canvas-expected.txt: Renamed from LayoutTests/css3/images/optimize-contrast-canvas-expected.txt. 18 * fast/css/image-rendering-canvas.html: Renamed from LayoutTests/css3/images/optimize-contrast-canvas.html. 19 * fast/css/image-rendering-expected.txt: Added. 20 * fast/css/image-rendering-parsing-expected.txt: Added. 21 * fast/css/image-rendering-parsing.html: Renamed from LayoutTests/fast/css/image-set-parsing.html. 22 * fast/css/image-rendering.html: Added. 23 * fast/css/optimize-contrast-image-expected.html: Added. 24 * fast/css/optimize-contrast-image.html: Renamed from LayoutTests/css3/images/optimize-contrast-image.html. 25 * fast/css/script-tests/image-rendering-parsing.js: Added. 26 (testImageRendering): 27 1 28 2013-04-23 Zoltan Arvai <zarvai@inf.u-szeged.hu> 2 29 -
trunk/LayoutTests/fast/css/image-rendering-canvas.html
r148948 r148949 1 1 <!DOCTYPE html> 2 <html> 3 <head> 2 4 <style> 3 4 5 6 7 8 9 10 11 12 13 14 15 image-rendering: -webkit-optimize-contrast;16 5 canvas { 6 display: block; 7 position: fixed; 8 left: 0px; 9 top: 0px; 10 right: 0px; 11 bottom: 0px; 12 border: none; 13 width: 100px; 14 height: 100px; 15 margin: 0px; 16 padding: 0px; 17 image-rendering: -webkit-crisp-edges; 18 } 17 19 </style> 20 </head> 18 21 <body> 19 22 <!-- The resulting image should be 100x100, consisting of 4 50x50 blocks of solid color, with no blurring of edges --> 20 <canvas width="2" height="2"></canvas> 23 <canvas width="2" height="2"></canvas> 21 24 </body> 22 25 <script> 23 26 if (window.testRunner) 24 27 testRunner.dumpAsText(true); 25 26 var canvas;27 var imageHandle;28 canvas = document.getElementsByTagName("canvas")[0].getContext("2d");29 canvas.width = 2;30 canvas.height = 2;31 imageHandle = canvas.createImageData(2, 2);32 28 33 var index = 0; 34 var length = imageHandle.data.length; 29 var canvas; 30 var imageHandle; 31 canvas = document.getElementsByTagName("canvas")[0].getContext("2d"); 32 canvas.width = 2; 33 canvas.height = 2; 34 imageHandle = canvas.createImageData(2, 2); 35 36 var index = 0; 37 var length = imageHandle.data.length; 35 38 36 39 imageHandle.data[index++] = 255; … … 54 57 imageHandle.data[index++] = 255; 55 58 56 59 canvas.putImageData(imageHandle, 0, 0); 57 60 </script> 61 </html> -
trunk/Source/WebCore/ChangeLog
r148947 r148949 1 2013-04-23 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Respect image-rendering setting for determing image-rendering quality 4 https://bugs.webkit.org/show_bug.cgi?id=113405 5 6 Reviewed by Benjamin Poulain. 7 8 Remove the CSS4 values as they are not ready for implementation yet. 9 We still parse the -webkit-crisp-edges and SVG compatibility values to 10 be closer to the the partial support in Gecko and Presto. 11 12 Tests: fast/css/image-rendering-canvas.html 13 fast/css/image-rendering-parsing.html 14 fast/css/image-rendering.html 15 fast/css/optimize-contrast-image.html 16 17 * css/CSSParser.cpp: 18 (WebCore::isValidKeywordPropertyAndValue): 19 * css/CSSPrimitiveValueMappings.h: 20 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 21 (WebCore::CSSPrimitiveValue::operator EImageRendering): 22 * css/CSSValueKeywords.in: 23 * css/SVGCSSParser.cpp: 24 (WebCore::CSSParser::parseSVGValue): 25 * rendering/RenderBoxModelObject.cpp: 26 (WebCore::ImageQualityController::shouldPaintAtLowQuality): 27 * rendering/RenderHTMLCanvas.cpp: 28 (WebCore::RenderHTMLCanvas::paintReplaced): 29 * rendering/style/RenderStyleConstants.h: 30 1 31 2013-04-23 Commit Queue <rniwa@webkit.org> 2 32 -
trunk/Source/WebCore/css/CSSParser.cpp
r148852 r148949 728 728 return true; 729 729 break; 730 case CSSPropertyImageRendering: // auto | crisp-edges | pixelated | -webkit-smooth | optimizeSpeed | optimizeQuality | -webkit-optimize-contrast 731 #if ENABLE(CSS4_IMAGES) 732 if (valueID == CSSValueAuto || valueID == CSSValueCrispEdges || valueID == CSSValuePixelated 733 || valueID == CSSValueWebkitSmooth || valueID == CSSValueWebkitOptimizeContrast 734 || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizequality) 730 case CSSPropertyImageRendering: // auto | optimizeSpeed | optimizeQuality | -webkit-crisp-edges | -webkit-optimize-contrast 731 if (valueID == CSSValueAuto || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizequality 732 || valueID == CSSValueWebkitCrispEdges || valueID == CSSValueWebkitOptimizeContrast) 735 733 return true; 736 #else737 if (valueID == CSSValueAuto || valueID == CSSValueCrispEdges || valueID == CSSValueWebkitOptimizeContrast738 || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizequality)739 return true;740 #endif741 734 break; 742 735 case CSSPropertyListStylePosition: // inside | outside | inherit -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r148619 r148949 4033 4033 break; 4034 4034 case ImageRenderingCrispEdges: 4035 m_value.ident = CSSValueCrispEdges; 4036 break; 4037 case ImageRenderingPixelated: 4038 m_value.ident = CSSValuePixelated; 4039 break; 4040 case ImageRenderingSmooth: 4041 m_value.ident = CSSValueWebkitSmooth; 4035 m_value.ident = CSSValueWebkitCrispEdges; 4042 4036 break; 4043 4037 case ImageRenderingOptimizeSpeed: … … 4056 4050 return ImageRenderingAuto; 4057 4051 case CSSValueWebkitOptimizeContrast: 4058 case CSSValue CrispEdges:4052 case CSSValueWebkitCrispEdges: 4059 4053 return ImageRenderingCrispEdges; 4060 case CSSValuePixelated:4061 return ImageRenderingPixelated;4062 case CSSValueWebkitSmooth:4063 return ImageRenderingSmooth;4064 4054 case CSSValueOptimizespeed: 4065 4055 return ImageRenderingOptimizeSpeed; -
trunk/Source/WebCore/css/CSSValueKeywords.in
r148414 r148949 935 935 // auto 936 936 // optimizeSpeed 937 crisp-edges938 pixelated939 -webkit-smooth940 937 optimizeQuality 938 -webkit-crisp-edges 941 939 -webkit-optimize-contrast 942 940 -
trunk/Source/WebCore/css/SVGCSSParser.cpp
r147348 r148949 132 132 break; 133 133 134 case CSSPropertyImageRendering: // auto | optimizeSpeed | 135 case CSSPropertyColorRendering: // optimizeQuality | inherit 134 case CSSPropertyColorRendering: // auto | optimizeSpeed | optimizeQuality | inherit 136 135 if (id == CSSValueAuto || id == CSSValueOptimizespeed || 137 136 id == CSSValueOptimizequality) -
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
r148208 r148949 165 165 case ImageRenderingOptimizeSpeed: 166 166 case ImageRenderingCrispEdges: 167 case ImageRenderingPixelated:168 167 return true; 169 168 case ImageRenderingOptimizeQuality: 170 case ImageRenderingSmooth:171 169 return false; 172 170 case ImageRenderingAuto: -
trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp
r148208 r148949 69 69 } 70 70 71 bool useLowQualityScale = style()->imageRendering() == ImageRendering Pixelated || style()->imageRendering() == ImageRenderingCrispEdges || style()->imageRendering() == ImageRenderingOptimizeSpeed;71 bool useLowQualityScale = style()->imageRendering() == ImageRenderingCrispEdges || style()->imageRendering() == ImageRenderingOptimizeSpeed; 72 72 static_cast<HTMLCanvasElement*>(node())->paint(paintInfo.context, rect, useLowQualityScale); 73 73 } -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r148414 r148949 480 480 enum TextOverflow { TextOverflowClip = 0, TextOverflowEllipsis }; 481 481 482 enum EImageRendering { 483 ImageRenderingAuto, ImageRenderingOptimizeSpeed, ImageRenderingOptimizeQuality, 484 ImageRenderingCrispEdges, ImageRenderingPixelated, ImageRenderingSmooth 485 }; 482 enum EImageRendering { ImageRenderingAuto = 0, ImageRenderingOptimizeSpeed, ImageRenderingOptimizeQuality, ImageRenderingCrispEdges }; 486 483 487 484 enum ImageResolutionSource { ImageResolutionSpecified = 0, ImageResolutionFromImage }; -
trunk/Tools/ChangeLog
r148934 r148949 1 2013-04-23 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Respect image-rendering setting for determing image-rendering quality 4 https://bugs.webkit.org/show_bug.cgi?id=113405 5 6 Reviewed by Benjamin Poulain. 7 8 Remove CSS4 Images option. It is not ready for implementation. 9 10 * Scripts/webkitperl/FeatureList.pm: 11 1 12 2013-04-22 Mark Rowe <mrowe@apple.com> 2 13 -
trunk/Tools/Scripts/webkitperl/FeatureList.pm
r148208 r148949 200 200 define => "ENABLE_CSS3_TEXT_LINE_BREAK", default => 0, value => \$css3TextLineBreakSupport }, 201 201 202 { option => "css4-images", desc => "Toggle CSS4 Images support",203 define => "ENABLE_CSS4_IMAGES", default => 0, value => \$css4ImagesSupport },204 205 202 { option => "css-box-decoration-break", desc => "Toggle CSS box-decoration-break support", 206 203 define => "ENABLE_CSS_BOX_DECORATION_BREAK", default => 1, value => \$cssBoxDecorationBreakSupport },
Note: See TracChangeset
for help on using the changeset viewer.