Changeset 86920 in webkit
- Timestamp:
- May 19, 2011 7:01:05 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 added
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86914 r86920 1 2011-05-19 Mike Lawther <mikelawther@chromium.org> 2 3 Reviewed by Simon Fraser. 4 5 implement image-rendering: optimize-contrast (with a vendor prefix) as defined in CSS3 image values 6 https://bugs.webkit.org/show_bug.cgi?id=56627 7 8 * css3/images/optimize-contrast-canvas-expected.checksum: Added. 9 * css3/images/optimize-contrast-canvas-expected.png: Added. 10 * css3/images/optimize-contrast-canvas-expected.txt: Added. 11 * css3/images/optimize-contrast-canvas.html: Added. 12 * css3/images/optimize-contrast-image-expected.checksum: Added. 13 * css3/images/optimize-contrast-image-expected.png: Added. 14 * css3/images/optimize-contrast-image-expected.txt: Added. 15 * css3/images/optimize-contrast-image.html: Added. 16 1 17 2011-05-19 Justin Schuh <jschuh@chromium.org> 2 18 -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
r81696 r86920 44 44 font-weight: normal; 45 45 height: 576px; 46 image-rendering: auto; 46 47 left: auto; 47 48 letter-spacing: normal; … … 201 202 fill-opacity: 1; 202 203 fill-rule: nonzero; 203 image-rendering: auto;204 204 marker-end: none; 205 205 marker-mid: none; -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r80645 r86920 43 43 font-weight: normal 44 44 height: 100px 45 image-rendering: auto 45 46 left: auto 46 47 letter-spacing: normal … … 191 192 fill-opacity: 1 192 193 fill-rule: nonzero 193 image-rendering: auto194 194 marker-end: none 195 195 marker-mid: none -
trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r81697 r86920 43 43 font-weight: normal 44 44 height: 100px 45 image-rendering: auto 45 46 left: auto 46 47 letter-spacing: normal … … 200 201 fill-opacity: 1 201 202 fill-rule: nonzero 202 image-rendering: auto203 203 marker-end: none 204 204 marker-mid: none -
trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r81769 r86920 43 43 font-weight: normal 44 44 height: 100px 45 image-rendering: auto 45 46 left: auto 46 47 letter-spacing: normal … … 200 201 fill-opacity: 1 201 202 fill-rule: nonzero 202 image-rendering: auto203 203 marker-end: none 204 204 marker-mid: none -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r81699 r86920 85 85 rect: style.getPropertyValue(height) : 0px 86 86 rect: style.getPropertyCSSValue(height) : [object CSSPrimitiveValue] 87 rect: style.getPropertyValue(image-rendering) : auto 88 rect: style.getPropertyCSSValue(image-rendering) : [object CSSPrimitiveValue] 87 89 rect: style.getPropertyValue(left) : auto 88 90 rect: style.getPropertyCSSValue(left) : [object CSSPrimitiveValue] … … 399 401 rect: style.getPropertyValue(fill-rule) : nonzero 400 402 rect: style.getPropertyCSSValue(fill-rule) : [object CSSPrimitiveValue] 401 rect: style.getPropertyValue(image-rendering) : auto402 rect: style.getPropertyCSSValue(image-rendering) : [object CSSPrimitiveValue]403 403 rect: style.getPropertyValue(marker-end) : none 404 404 rect: style.getPropertyCSSValue(marker-end) : [object CSSPrimitiveValue] … … 531 531 g: style.getPropertyValue(height) : 0px 532 532 g: style.getPropertyCSSValue(height) : [object CSSPrimitiveValue] 533 g: style.getPropertyValue(image-rendering) : auto 534 g: style.getPropertyCSSValue(image-rendering) : [object CSSPrimitiveValue] 533 535 g: style.getPropertyValue(left) : auto 534 536 g: style.getPropertyCSSValue(left) : [object CSSPrimitiveValue] … … 845 847 g: style.getPropertyValue(fill-rule) : nonzero 846 848 g: style.getPropertyCSSValue(fill-rule) : [object CSSPrimitiveValue] 847 g: style.getPropertyValue(image-rendering) : auto848 g: style.getPropertyCSSValue(image-rendering) : [object CSSPrimitiveValue]849 849 g: style.getPropertyValue(marker-end) : none 850 850 g: style.getPropertyCSSValue(marker-end) : [object CSSPrimitiveValue] -
trunk/Source/WebCore/ChangeLog
r86905 r86920 1 2011-05-19 Mike Lawther <mikelawther@chromium.org> 2 3 Reviewed by Simon Fraser. 4 5 implement image-rendering: optimize-contrast (with a vendor prefix) as defined in CSS3 image values 6 https://bugs.webkit.org/show_bug.cgi?id=56627 7 8 Tests: css3/images/optimize-contrast-canvas.html 9 css3/images/optimize-contrast-image.html 10 11 * WebCore.xcodeproj/project.pbxproj: 12 * css/CSSComputedStyleDeclaration.cpp: 13 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 14 * css/CSSParser.cpp: 15 (WebCore::CSSParser::parseValue): 16 * css/CSSPrimitiveValueMappings.h: 17 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 18 (WebCore::CSSPrimitiveValue::operator EImageRendering): 19 * css/CSSPropertyNames.in: 20 * css/CSSStyleSelector.cpp: 21 (WebCore::CSSStyleSelector::applyProperty): 22 * css/CSSValueKeywords.in: 23 * css/SVGCSSComputedStyleDeclaration.cpp: 24 (WebCore::CSSComputedStyleDeclaration::getSVGPropertyCSSValue): 25 * css/SVGCSSPropertyNames.in: 26 * css/SVGCSSStyleSelector.cpp: 27 (WebCore::CSSStyleSelector::applySVGProperty): 28 * css/SVGCSSValueKeywords.in: 29 * html/HTMLCanvasElement.cpp: 30 (WebCore::HTMLCanvasElement::paint): 31 * html/HTMLCanvasElement.h: 32 * platform/graphics/ImageRenderingMode.h: Added. 33 * rendering/RenderBoxModelObject.cpp: 34 (WebCore::ImageQualityController::shouldPaintAtLowQuality): 35 * rendering/RenderHTMLCanvas.cpp: 36 (WebCore::RenderHTMLCanvas::paintReplaced): 37 * rendering/style/RenderStyle.cpp: 38 (WebCore::RenderStyle::diff): 39 * rendering/style/RenderStyle.h: 40 (WebCore::InheritedFlags::imageRendering): 41 (WebCore::InheritedFlags::setImageRendering): 42 (WebCore::InheritedFlags::initialImageRendering): 43 * rendering/style/RenderStyleConstants.h: 44 * rendering/style/SVGRenderStyle.cpp: 45 (WebCore::SVGRenderStyle::diff): 46 * rendering/style/SVGRenderStyle.h: 47 (WebCore::SVGRenderStyle::InheritedFlags::operator==): 48 (WebCore::SVGRenderStyle::setBitDefaults): 49 * rendering/style/SVGRenderStyleDefs.h: 50 * rendering/svg/SVGRenderTreeAsText.cpp: 51 (WebCore::writeStyle): 52 1 53 2011-05-18 Kenneth Russell <kbr@google.com> 2 54 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r86879 r86920 996 996 490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */; }; 997 997 492863991253B8FC00F792D6 /* ResourceLoadInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 492863981253B8FC00F792D6 /* ResourceLoadInfo.h */; settings = {ATTRIBUTES = (Private, ); }; }; 998 49291E4B134172C800E753DE /* ImageRenderingMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 49291E4A134172C800E753DE /* ImageRenderingMode.h */; }; 998 999 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 493E5E0812D6420500020081 /* PlatformCALayerClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 999 1000 49484FC1102CF23C00187DD3 /* CanvasGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49484FB3102CF23C00187DD3 /* CanvasGradient.cpp */; }; … … 7495 7496 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANGLEWebKitBridge.h; sourceTree = "<group>"; }; 7496 7497 492863981253B8FC00F792D6 /* ResourceLoadInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadInfo.h; sourceTree = "<group>"; }; 7498 49291E4A134172C800E753DE /* ImageRenderingMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageRenderingMode.h; sourceTree = "<group>"; }; 7497 7499 493E5E0812D6420500020081 /* PlatformCALayerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCALayerClient.h; path = ca/PlatformCALayerClient.h; sourceTree = "<group>"; }; 7498 7500 49484FB3102CF23C00187DD3 /* CanvasGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CanvasGradient.cpp; path = canvas/CanvasGradient.cpp; sourceTree = "<group>"; }; … … 17723 17725 22BD9F7D1353625C009BD102 /* ImageBufferData.h */, 17724 17726 BC7F44A70B9E324E00A9D081 /* ImageObserver.h */, 17727 49291E4A134172C800E753DE /* ImageRenderingMode.h */, 17725 17728 B27535430B053814002CE64F /* ImageSource.h */, 17726 17729 B27535440B053814002CE64F /* IntPoint.h */, … … 21224 21227 089582560E857A7E00F82C83 /* ImageLoader.h in Headers */, 21225 21228 BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */, 21229 49291E4B134172C800E753DE /* ImageRenderingMode.h in Headers */, 21226 21230 B27535710B053814002CE64F /* ImageSource.h in Headers */, 21227 21231 4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */, -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r85418 r86920 100 100 CSSPropertyFontWeight, 101 101 CSSPropertyHeight, 102 CSSPropertyImageRendering, 102 103 CSSPropertyLeft, 103 104 CSSPropertyLetterSpacing, … … 264 265 CSSPropertyFillOpacity, 265 266 CSSPropertyFillRule, 266 CSSPropertyImageRendering,267 267 CSSPropertyMarkerEnd, 268 268 CSSPropertyMarkerMid, … … 1157 1157 return primitiveValueCache->createIdentifierValue(CSSValueBorder); 1158 1158 return primitiveValueCache->createIdentifierValue(CSSValueLines); 1159 case CSSPropertyImageRendering: 1160 return CSSPrimitiveValue::create(style->imageRendering()); 1159 1161 case CSSPropertyLeft: 1160 1162 return getPositionOffsetValue(style.get(), CSSPropertyLeft, primitiveValueCache); … … 1783 1785 case CSSPropertyFillOpacity: 1784 1786 case CSSPropertyFillRule: 1785 case CSSPropertyImageRendering:1786 1787 case CSSPropertyMarker: 1787 1788 case CSSPropertyMarkerEnd: -
trunk/Source/WebCore/css/CSSParser.cpp
r86830 r86920 1717 1717 validPrimitive = true; 1718 1718 break; 1719 1719 case CSSPropertyImageRendering: // auto | optimizeContrast 1720 if (id == CSSValueAuto || id == CSSValueWebkitOptimizeContrast) 1721 validPrimitive = true; 1722 break; 1720 1723 // End of CSS3 properties 1721 1724 -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r86120 r86920 2950 2950 { 2951 2951 switch (e) { 2952 case IR_AUTO: 2953 m_value.ident = CSSValueAuto; 2954 break; 2955 case IR_OPTIMIZESPEED: 2956 m_value.ident = CSSValueOptimizespeed; 2957 break; 2958 case IR_OPTIMIZEQUALITY: 2959 m_value.ident = CSSValueOptimizequality; 2960 break; 2952 case ImageRenderingAuto: 2953 m_value.ident = CSSValueAuto; 2954 break; 2955 case ImageRenderingOptimizeSpeed: 2956 m_value.ident = CSSValueOptimizespeed; 2957 break; 2958 case ImageRenderingOptimizeQuality: 2959 m_value.ident = CSSValueOptimizequality; 2960 break; 2961 case ImageRenderingOptimizeContrast: 2962 m_value.ident = CSSValueWebkitOptimizeContrast; 2963 break; 2961 2964 } 2962 2965 } … … 2965 2968 { 2966 2969 switch (m_value.ident) { 2967 case CSSValueAuto: 2968 return IR_AUTO; 2969 case CSSValueOptimizespeed: 2970 return IR_OPTIMIZESPEED; 2971 case CSSValueOptimizequality: 2972 return IR_OPTIMIZEQUALITY; 2973 default: 2974 ASSERT_NOT_REACHED(); 2975 return IR_AUTO; 2970 case CSSValueAuto: 2971 return ImageRenderingAuto; 2972 case CSSValueOptimizespeed: 2973 return ImageRenderingOptimizeSpeed; 2974 case CSSValueOptimizequality: 2975 return ImageRenderingOptimizeQuality; 2976 case CSSValueWebkitOptimizeContrast: 2977 return ImageRenderingOptimizeContrast; 2978 default: 2979 ASSERT_NOT_REACHED(); 2980 return ImageRenderingAuto; 2976 2981 } 2977 2982 } -
trunk/Source/WebCore/css/CSSPropertyNames.in
r85257 r86920 94 94 font-stretch 95 95 height 96 image-rendering 96 97 left 97 98 letter-spacing -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r86771 r86920 4696 4696 HANDLE_INHERIT_AND_INITIAL(outlineOffset, OutlineOffset) 4697 4697 m_style->setOutlineOffset(primitiveValue->computeLengthInt(style(), m_rootElementStyle, zoomFactor)); 4698 return; 4699 case CSSPropertyImageRendering: 4700 if (!primitiveValue) 4701 return; 4702 m_style->setImageRendering(*primitiveValue); 4698 4703 return; 4699 4704 case CSSPropertyTextRendering: { -
trunk/Source/WebCore/css/CSSValueKeywords.in
r82482 r86920 804 804 replaced 805 805 806 806 # image-rendering 807 #auto 808 #optimizeSpeed 809 optimizeQuality 810 -webkit-optimize-contrast -
trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp
r79985 r86920 104 104 case CSSPropertyColorRendering: 105 105 return CSSPrimitiveValue::create(svgStyle->colorRendering()); 106 case CSSPropertyImageRendering:107 return CSSPrimitiveValue::create(svgStyle->imageRendering());108 106 case CSSPropertyShapeRendering: 109 107 return CSSPrimitiveValue::create(svgStyle->shapeRendering()); -
trunk/Source/WebCore/css/SVGCSSPropertyNames.in
r60885 r86920 24 24 fill-rule 25 25 #font-size-adjust 26 image-rendering26 #image-rendering 27 27 marker 28 28 marker-end -
trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp
r85603 r86920 215 215 break; 216 216 } 217 case CSSPropertyImageRendering:218 {219 HANDLE_INHERIT_AND_INITIAL(imageRendering, ImageRendering)220 if (primitiveValue)221 svgstyle->setImageRendering(*primitiveValue);222 break;223 }224 217 case CSSPropertyShapeRendering: 225 218 { -
trunk/Source/WebCore/css/SVGCSSValueKeywords.in
r67667 r86920 198 198 #auto 199 199 #optimizeSpeed 200 optimizeQuality200 #optimizeQuality 201 201 202 202 ## CSS_PROP_FILL -
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
r85760 r86920 263 263 } 264 264 265 void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r )265 void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r, bool useLowQualityScale) 266 266 { 267 267 // Clear the dirty rect … … 281 281 if (imageBuffer) { 282 282 if (m_presentedImage) 283 context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, r );283 context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, r, CompositeSourceOver, useLowQualityScale); 284 284 else if (imageBuffer->drawsUsingCopy()) 285 context->drawImage(copiedImage(), ColorSpaceDeviceRGB, r );285 context->drawImage(copiedImage(), ColorSpaceDeviceRGB, r, CompositeSourceOver, useLowQualityScale); 286 286 else 287 context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, r );287 context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, r, CompositeSourceOver, useLowQualityScale); 288 288 } 289 289 } -
trunk/Source/WebCore/html/HTMLCanvasElement.h
r85760 r86920 98 98 void didDraw(const FloatRect&); 99 99 100 void paint(GraphicsContext*, const IntRect& );100 void paint(GraphicsContext*, const IntRect&, bool useLowQualityScale = false); 101 101 102 102 GraphicsContext* drawingContext() const; -
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
r86451 r86920 140 140 return false; 141 141 142 if (object->style()->imageRendering() == ImageRenderingOptimizeContrast) 143 return true; 144 142 145 // Make sure to use the unzoomed image size, since if a full page zoom is in effect, the image 143 146 // is actually being scaled. -
trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp
r79920 r86920 59 59 IntRect rect = contentBoxRect(); 60 60 rect.move(tx, ty); 61 static_cast<HTMLCanvasElement*>(node())->paint(paintInfo.context, rect); 61 bool useLowQualityScale = style()->imageRendering() == ImageRenderingOptimizeContrast; 62 static_cast<HTMLCanvasElement*>(node())->paint(paintInfo.context, rect, useLowQualityScale); 62 63 } 63 64 -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r85027 r86920 561 561 || rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor 562 562 || rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor 563 || rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill) 563 || rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill 564 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_imageRendering) 564 565 return StyleDifferenceRepaint; 565 566 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r86040 r86920 784 784 bool isFlippedBlocksWritingMode() const { return writingMode() == RightToLeftWritingMode || writingMode() == BottomToTopWritingMode; } 785 785 786 EImageRendering imageRendering() const { return static_cast<EImageRendering>(rareInheritedData->m_imageRendering); } 787 786 788 ESpeak speak() { return static_cast<ESpeak>(rareInheritedData->speak); } 787 789 … … 935 937 void setZoom(float f) { SET_VAR(visual, m_zoom, f); setEffectiveZoom(effectiveZoom() * zoom()); } 936 938 void setEffectiveZoom(float f) { SET_VAR(rareInheritedData, m_effectiveZoom, f) } 939 void setImageRendering(EImageRendering v) { SET_VAR(rareInheritedData, m_imageRendering, v) } 937 940 938 941 void setWhiteSpace(EWhiteSpace v) { inherited_flags._white_space = v; } … … 1318 1321 static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmphasisPositionOver; } 1319 1322 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; } 1323 static EImageRendering initialImageRendering() { return ImageRenderingAuto; } 1320 1324 1321 1325 // Keep these at the end. -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r85811 r86920 427 427 enum TextEmphasisPosition { TextEmphasisPositionOver, TextEmphasisPositionUnder }; 428 428 429 enum EImageRendering { ImageRenderingAuto, ImageRenderingOptimizeSpeed, ImageRenderingOptimizeQuality, ImageRenderingOptimizeContrast }; 430 429 431 } // namespace WebCore 430 432 -
trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp
r86331 r86920 204 204 // Changes of these flags only cause repaints. 205 205 if (svg_inherited_flags._colorRendering != other->svg_inherited_flags._colorRendering 206 || svg_inherited_flags._imageRendering != other->svg_inherited_flags._imageRendering207 206 || svg_inherited_flags._shapeRendering != other->svg_inherited_flags._shapeRendering 208 207 || svg_inherited_flags._clipRule != other->svg_inherited_flags._clipRule -
trunk/Source/WebCore/rendering/style/SVGRenderStyle.h
r79985 r86920 64 64 static EColorRendering initialColorRendering() { return CR_AUTO; } 65 65 static WindRule initialFillRule() { return RULE_NONZERO; } 66 static EImageRendering initialImageRendering() { return IR_AUTO; }67 66 static LineJoin initialJoinStyle() { return MiterJoin; } 68 67 static EShapeRendering initialShapeRendering() { return SR_AUTO; } … … 141 140 void setColorRendering(EColorRendering val) { svg_inherited_flags._colorRendering = val; } 142 141 void setFillRule(WindRule val) { svg_inherited_flags._fillRule = val; } 143 void setImageRendering(EImageRendering val) { svg_inherited_flags._imageRendering = val; }144 142 void setJoinStyle(LineJoin val) { svg_inherited_flags._joinStyle = val; } 145 143 void setShapeRendering(EShapeRendering val) { svg_inherited_flags._shapeRendering = val; } … … 298 296 EColorRendering colorRendering() const { return (EColorRendering) svg_inherited_flags._colorRendering; } 299 297 WindRule fillRule() const { return (WindRule) svg_inherited_flags._fillRule; } 300 EImageRendering imageRendering() const { return (EImageRendering) svg_inherited_flags._imageRendering; }301 298 LineJoin joinStyle() const { return (LineJoin) svg_inherited_flags._joinStyle; } 302 299 EShapeRendering shapeRendering() const { return (EShapeRendering) svg_inherited_flags._shapeRendering; } … … 347 344 { 348 345 return (_colorRendering == other._colorRendering) 349 && (_imageRendering == other._imageRendering)350 346 && (_shapeRendering == other._shapeRendering) 351 347 && (_clipRule == other._clipRule) … … 367 363 368 364 unsigned _colorRendering : 2; // EColorRendering 369 unsigned _imageRendering : 2; // EImageRendering370 365 unsigned _shapeRendering : 2; // EShapeRendering 371 366 unsigned _clipRule : 1; // WindRule … … 423 418 svg_inherited_flags._colorRendering = initialColorRendering(); 424 419 svg_inherited_flags._fillRule = initialFillRule(); 425 svg_inherited_flags._imageRendering = initialImageRendering();426 420 svg_inherited_flags._shapeRendering = initialShapeRendering(); 427 421 svg_inherited_flags._textAnchor = initialTextAnchor(); -
trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h
r79985 r86920 55 55 CR_AUTO, CR_OPTIMIZESPEED, CR_OPTIMIZEQUALITY 56 56 }; 57 58 enum EImageRendering {59 IR_AUTO, IR_OPTIMIZESPEED, IR_OPTIMIZEQUALITY60 };61 62 57 enum EShapeRendering { 63 58 SR_AUTO, SR_OPTIMIZESPEED, SR_CRISPEDGES, SR_GEOMETRICPRECISION -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
r85603 r86920 53 53 , textEmphasisPosition(TextEmphasisPositionOver) 54 54 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) 55 , m_imageRendering(RenderStyle::initialImageRendering()) 55 56 , hyphenationLimitBefore(-1) 56 57 , hyphenationLimitAfter(-1) … … 87 88 , textEmphasisPosition(o.textEmphasisPosition) 88 89 , m_lineBoxContain(o.m_lineBoxContain) 90 , m_imageRendering(o.m_imageRendering) 89 91 , hyphenationString(o.hyphenationString) 90 92 , hyphenationLimitBefore(o.hyphenationLimitBefore) … … 142 144 && locale == o.locale 143 145 && textEmphasisCustomMark == o.textEmphasisCustomMark 144 && *quotes == *o.quotes; 146 && *quotes == *o.quotes 147 && m_imageRendering == o.m_imageRendering; 145 148 } 146 149 -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r85027 r86920 86 86 unsigned textEmphasisPosition : 1; // TextEmphasisPosition 87 87 unsigned m_lineBoxContain: 7; // LineBoxContain 88 // CSS Image Values Level 3 89 unsigned m_imageRendering : 2; // EImageRendering 90 88 91 89 92 AtomicString hyphenationString; -
trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
r86765 r86920 288 288 if (!object.localTransform().isIdentity()) 289 289 writeNameValuePair(ts, "transform", object.localTransform()); 290 writeIfNotDefault(ts, "image rendering", s vgStyle->imageRendering(), SVGRenderStyle::initialImageRendering());290 writeIfNotDefault(ts, "image rendering", style->imageRendering(), RenderStyle::initialImageRendering()); 291 291 writeIfNotDefault(ts, "opacity", style->opacity(), RenderStyle::initialOpacity()); 292 292 if (object.isSVGPath()) {
Note: See TracChangeset
for help on using the changeset viewer.