Diff
Modified: trunk/LayoutTests/ChangeLog (88143 => 88144)
--- trunk/LayoutTests/ChangeLog 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/LayoutTests/ChangeLog 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1,3 +1,16 @@
+2011-06-06 Mustafizur Rahaman <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=48290
+ Removed LayoutTests/canvas/philip/tests/2d.composite.operation.highlight.html
+ from failed/skipped test list
+
+ * platform/chromium/test_expectations.txt:
+ * platform/gtk/Skipped:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+
2011-06-05 Csaba Osztrogonác <[email protected]>
[Qt][WK2] Unreviewed. Update platform specific expected files after r88020.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (88143 => 88144)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1977,7 +1977,6 @@
BUGWK48288 : canvas/philip/tests/2d.composite.operation.clear.html = TEXT
BUGWK48289 : canvas/philip/tests/2d.composite.operation.darker.html = TEXT
-BUGWK48290 : canvas/philip/tests/2d.composite.operation.highlight.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.copy.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html = TEXT
BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html = TEXT
Modified: trunk/LayoutTests/platform/gtk/Skipped (88143 => 88144)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1070,7 +1070,6 @@
#without our vendor prefix since it was around in canvas before the spec was written.
canvas/philip/tests/2d.composite.operation.clear.html
canvas/philip/tests/2d.composite.operation.darker.html
-canvas/philip/tests/2d.composite.operation.highlight.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
Modified: trunk/LayoutTests/platform/mac/Skipped (88143 => 88144)
--- trunk/LayoutTests/platform/mac/Skipped 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/LayoutTests/platform/mac/Skipped 2011-06-06 07:27:29 UTC (rev 88144)
@@ -153,7 +153,6 @@
# drawing model being different than the spec's current model. There is a current
# effort out to change the spec to the webkit canvas model.
canvas/philip/tests/2d.composite.operation.darker.html
-canvas/philip/tests/2d.composite.operation.highlight.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
Modified: trunk/LayoutTests/platform/qt/Skipped (88143 => 88144)
--- trunk/LayoutTests/platform/qt/Skipped 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1857,7 +1857,6 @@
# ============================================================================= #
canvas/philip/tests/2d.composite.operation.clear.html
canvas/philip/tests/2d.composite.operation.darker.html
-canvas/philip/tests/2d.composite.operation.highlight.html
canvas/philip/tests/2d.composite.uncovered.fill.copy.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-atop.html
canvas/philip/tests/2d.composite.uncovered.fill.destination-in.html
Modified: trunk/Source/WebCore/ChangeLog (88143 => 88144)
--- trunk/Source/WebCore/ChangeLog 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/ChangeLog 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1,3 +1,34 @@
+2011-06-06 Mustafizur Rahaman <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ Fix LayoutTests/canvas/philip/tests/2d.composite.operation.highlight.html
+ https://bugs.webkit.org/show_bug.cgi?id=48290
+
+ "highlight" is not a valid globalComposite operation
+ as per http://www.w3.org/TR/2011/WD-2dcontext-20110525/#compositing
+ Therefore, removed the option from the source code.
+
+ Tests: No new tests required.
+ LayoutTests\canvas\philip\tests\2d.composite.operation.highlight.html can be used for testing.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator CompositeOperator):
+ * platform/graphics/GraphicsTypes.cpp:
+ * platform/graphics/GraphicsTypes.h:
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::toCairoOperator):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::setPlatformCompositeOperation):
+ * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+ (WebCore::SharedGraphicsContext3D::applyCompositeOperator):
+ * platform/graphics/openvg/PainterOpenVG.cpp:
+ (WebCore::PlatformPainterState::applyBlending):
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::toQtCompositionMode):
+ * platform/graphics/skia/SkiaUtils.cpp:
+
2011-06-04 Abhishek Arya <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (88143 => 88144)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2011-06-06 07:27:29 UTC (rev 88144)
@@ -131,9 +131,6 @@
case CompositePlusDarker:
m_value.ident = CSSValuePlusDarker;
break;
- case CompositeHighlight:
- m_value.ident = CSSValueHighlight;
- break;
case CompositePlusLighter:
m_value.ident = CSSValuePlusLighter;
break;
@@ -167,8 +164,6 @@
return CompositeXOR;
case CSSValuePlusDarker:
return CompositePlusDarker;
- case CSSValueHighlight:
- return CompositeHighlight;
case CSSValuePlusLighter:
return CompositePlusLighter;
default:
Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -44,7 +44,6 @@
"destination-atop",
"xor",
"darker",
- "highlight",
"lighter"
};
const int numCompositeOperatorNames = WTF_ARRAY_LENGTH(compositeOperatorNames);
Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.h (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2011-06-06 07:27:29 UTC (rev 88144)
@@ -46,7 +46,6 @@
CompositeDestinationAtop,
CompositeXOR,
CompositePlusDarker,
- CompositeHighlight,
CompositePlusLighter
};
Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -111,9 +111,6 @@
#else
return CAIRO_OPERATOR_SATURATE;
#endif
- case CompositeHighlight:
- // There is no Cairo equivalent for CompositeHighlight.
- return CAIRO_OPERATOR_OVER;
case CompositePlusLighter:
return CAIRO_OPERATOR_ADD;
default:
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -1501,9 +1501,6 @@
case CompositePlusDarker:
target = kCGBlendModePlusDarker;
break;
- case CompositeHighlight:
- // currently unsupported
- break;
case CompositePlusLighter:
target = kCGBlendModePlusLighter;
break;
Modified: trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -335,7 +335,6 @@
m_context->blendFunc(GraphicsContext3D::ONE_MINUS_DST_ALPHA, GraphicsContext3D::ONE_MINUS_SRC_ALPHA);
break;
case CompositePlusDarker:
- case CompositeHighlight:
// unsupported
m_context->disable(GraphicsContext3D::BLEND);
break;
Modified: trunk/Source/WebCore/platform/graphics/openvg/PainterOpenVG.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/openvg/PainterOpenVG.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/openvg/PainterOpenVG.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -279,9 +279,6 @@
case CompositePlusDarker:
blendMode = VG_BLEND_DARKEN;
break;
- case CompositeHighlight:
- notImplemented();
- break;
case CompositePlusLighter:
blendMode = VG_BLEND_LIGHTEN;
break;
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -95,8 +95,6 @@
case CompositePlusDarker:
// there is no exact match, but this is the closest
return QPainter::CompositionMode_Darken;
- case CompositeHighlight:
- return QPainter::CompositionMode_SourceOver;
case CompositePlusLighter:
return QPainter::CompositionMode_Plus;
default:
Modified: trunk/Source/WebCore/platform/graphics/skia/SkiaUtils.cpp (88143 => 88144)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaUtils.cpp 2011-06-06 06:12:05 UTC (rev 88143)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaUtils.cpp 2011-06-06 07:27:29 UTC (rev 88144)
@@ -57,7 +57,6 @@
{ CompositeDestinationAtop, SkXfermode::kDstATop_Mode },
{ CompositeXOR, SkXfermode::kXor_Mode },
{ CompositePlusDarker, SkXfermode::kDarken_Mode },
- { CompositeHighlight, SkXfermode::kSrcOver_Mode }, // TODO
{ CompositePlusLighter, SkXfermode::kPlus_Mode }
};
