Source/WebCore/ChangeLog

 12011-06-01 MustafizurRahaman <mustaf.here@gmail.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 Fix LayoutTests/canvas/philip/tests/2d.composite.operation.highlight.html
 6 https://bugs.webkit.org/show_bug.cgi?id=48290
 7
 8 "highlight" is not a valid globalComposite operation
 9 as per http://www.w3.org/TR/2011/WD-2dcontext-20110525/#compositing
 10 Therefore, removed the option from the source code.
 11
 12 Tests: No new tests required.
 13 LayoutTests\canvas\philip\tests\2d.composite.operation.highlight.html can be used for testing.
 14
 15 * css/CSSPrimitiveValueMappings.h:
 16 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
 17 (WebCore::CSSPrimitiveValue::operator CompositeOperator):
 18 * html/canvas/CanvasRenderingContext2D.cpp:
 19 (WebCore::CanvasRenderingContext2D::setFont):
 20 * platform/graphics/GraphicsTypes.cpp:
 21 * platform/graphics/GraphicsTypes.h:
 22 * platform/graphics/cairo/CairoUtilities.cpp:
 23 (WebCore::toCairoOperator):
 24 * platform/graphics/cg/GraphicsContextCG.cpp:
 25 (WebCore::GraphicsContext::setPlatformCompositeOperation):
 26 * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
 27 (WebCore::SharedGraphicsContext3D::applyCompositeOperator):
 28 * platform/graphics/openvg/PainterOpenVG.cpp:
 29 (WebCore::PlatformPainterState::applyBlending):
 30 * platform/graphics/qt/GraphicsContextQt.cpp:
 31 (WebCore::toQtCompositionMode):
 32 * platform/graphics/skia/SkiaUtils.cpp:
 33
1342011-06-01 Levi Weintraub <leviw@chromium.org>
235
336 Reviewed by Eric Seidel.
87842

Source/WebCore/css/CSSPrimitiveValueMappings.h

@@template<> inline CSSPrimitiveValue::CSS
131131 case CompositePlusDarker:
132132 m_value.ident = CSSValuePlusDarker;
133133 break;
134  case CompositeHighlight:
135  m_value.ident = CSSValueHighlight;
136  break;
137134 case CompositePlusLighter:
138135 m_value.ident = CSSValuePlusLighter;
139136 break;

@@template<> inline CSSPrimitiveValue::ope
167164 return CompositeXOR;
168165 case CSSValuePlusDarker:
169166 return CompositePlusDarker;
170  case CSSValueHighlight:
171  return CompositeHighlight;
172167 case CSSValuePlusLighter:
173168 return CompositePlusLighter;
174169 default:
87836

Source/WebCore/platform/graphics/GraphicsTypes.cpp

@@static const char* const compositeOperat
4444 "destination-atop",
4545 "xor",
4646 "darker",
47  "highlight",
4847 "lighter"
4948};
5049const int numCompositeOperatorNames = WTF_ARRAY_LENGTH(compositeOperatorNames);
87836

Source/WebCore/platform/graphics/GraphicsTypes.h

@@namespace WebCore {
4646 CompositeDestinationAtop,
4747 CompositeXOR,
4848 CompositePlusDarker,
49  CompositeHighlight,
5049 CompositePlusLighter
5150 };
5251
87836

Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

@@cairo_operator_t toCairoOperator(Composi
111111#else
112112 return CAIRO_OPERATOR_SATURATE;
113113#endif
114  case CompositeHighlight:
115  // There is no Cairo equivalent for CompositeHighlight.
116  return CAIRO_OPERATOR_OVER;
117114 case CompositePlusLighter:
118115 return CAIRO_OPERATOR_ADD;
119116 default:
87836

Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@void GraphicsContext::setPlatformComposi
15001500 case CompositePlusDarker:
15011501 target = kCGBlendModePlusDarker;
15021502 break;
1503  case CompositeHighlight:
1504  // currently unsupported
1505  break;
15061503 case CompositePlusLighter:
15071504 target = kCGBlendModePlusLighter;
15081505 break;
87836

Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

@@void SharedGraphicsContext3D::applyCompo
335335 m_context->blendFunc(GraphicsContext3D::ONE_MINUS_DST_ALPHA, GraphicsContext3D::ONE_MINUS_SRC_ALPHA);
336336 break;
337337 case CompositePlusDarker:
338  case CompositeHighlight:
339338 // unsupported
340339 m_context->disable(GraphicsContext3D::BLEND);
341340 break;
87836

Source/WebCore/platform/graphics/openvg/PainterOpenVG.cpp

@@struct PlatformPainterState {
279279 case CompositePlusDarker:
280280 blendMode = VG_BLEND_DARKEN;
281281 break;
282  case CompositeHighlight:
283  notImplemented();
284  break;
285282 case CompositePlusLighter:
286283 blendMode = VG_BLEND_LIGHTEN;
287284 break;
87836

Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@static inline QPainter::CompositionMode
9595 case CompositePlusDarker:
9696 // there is no exact match, but this is the closest
9797 return QPainter::CompositionMode_Darken;
98  case CompositeHighlight:
99  return QPainter::CompositionMode_SourceOver;
10098 case CompositePlusLighter:
10199 return QPainter::CompositionMode_Plus;
102100 default:
87836

Source/WebCore/platform/graphics/skia/SkiaUtils.cpp

@@static const struct CompositOpToXfermode
5757 { CompositeDestinationAtop, SkXfermode::kDstATop_Mode },
5858 { CompositeXOR, SkXfermode::kXor_Mode },
5959 { CompositePlusDarker, SkXfermode::kDarken_Mode },
60  { CompositeHighlight, SkXfermode::kSrcOver_Mode }, // TODO
6160 { CompositePlusLighter, SkXfermode::kPlus_Mode }
6261};
6362
87836