Title: [144542] trunk
- Revision
- 144542
- Author
- [email protected]
- Date
- 2013-03-02 07:02:45 -0800 (Sat, 02 Mar 2013)
Log Message
Text overflow ellipsis wrong color when using webkit-text-fill-color
https://bugs.webkit.org/show_bug.cgi?id=54841
Reviewed by David Hyatt.
Source/WebCore:
Take -webkit-text-fill-color into account for ellipsis painting.
Test: fast/css/text-overflow-ellipsis-color.html
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paint):
LayoutTests:
Add reftest for using -webkit-text-fill-color in combination with text-overflow:ellipsis.
* fast/css/text-overflow-ellipsis-color-expected.html: Added.
* fast/css/text-overflow-ellipsis-color.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (144541 => 144542)
--- trunk/LayoutTests/ChangeLog 2013-03-02 14:39:08 UTC (rev 144541)
+++ trunk/LayoutTests/ChangeLog 2013-03-02 15:02:45 UTC (rev 144542)
@@ -1,3 +1,15 @@
+2013-03-02 Rob Buis <[email protected]>
+
+ Text overflow ellipsis wrong color when using webkit-text-fill-color
+ https://bugs.webkit.org/show_bug.cgi?id=54841
+
+ Reviewed by David Hyatt.
+
+ Add reftest for using -webkit-text-fill-color in combination with text-overflow:ellipsis.
+
+ * fast/css/text-overflow-ellipsis-color-expected.html: Added.
+ * fast/css/text-overflow-ellipsis-color.html: Added.
+
2013-03-02 Raphael Kubo da Costa <[email protected]>
[EFL] Unskip some passing tests.
Added: trunk/LayoutTests/fast/css/text-overflow-ellipsis-color-expected.html (0 => 144542)
--- trunk/LayoutTests/fast/css/text-overflow-ellipsis-color-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/text-overflow-ellipsis-color-expected.html 2013-03-02 15:02:45 UTC (rev 144542)
@@ -0,0 +1,24 @@
+<html>
+<head>
+<style>
+.testDiv {
+ width: 200px;
+ height: 20px;
+ border: 1px solid black;
+ white-space: nowrap;
+ overflow: hidden;
+ margin: 0 0 20px 0;
+ font-size: 16px;
+ font-family: 'Ahem';
+}
+</style>
+</head>
+<body>
+<div class="testDiv" style="color:green">
+The ellipsis should be green …
+</div>
+<div class="testDiv" style="color:green">
+The ellipsis should be green …
+</div>
+</body>
+</html>
Added: trunk/LayoutTests/fast/css/text-overflow-ellipsis-color.html (0 => 144542)
--- trunk/LayoutTests/fast/css/text-overflow-ellipsis-color.html (rev 0)
+++ trunk/LayoutTests/fast/css/text-overflow-ellipsis-color.html 2013-03-02 15:02:45 UTC (rev 144542)
@@ -0,0 +1,28 @@
+<html>
+<head>
+<style>
+.testDiv {
+ width: 200px;
+ height: 20px;
+ border: 1px solid black;
+ white-space: nowrap;
+ overflow: hidden;
+ margin: 0 0 20px 0;
+ font-size: 16px;
+ font-family: 'Ahem';
+}
+
+.ellipsis {
+ text-overflow:ellipsis;
+}
+</style>
+</head>
+<body>
+<div class="testDiv ellipsis" style="color:green">
+The ellipsis should be green thispartwillbeclippedout
+</div>
+<div class="testDiv ellipsis" style="-webkit-text-fill-color:green">
+The ellipsis should be green thispartwillbeclippedout
+</div>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (144541 => 144542)
--- trunk/Source/WebCore/ChangeLog 2013-03-02 14:39:08 UTC (rev 144541)
+++ trunk/Source/WebCore/ChangeLog 2013-03-02 15:02:45 UTC (rev 144542)
@@ -1,3 +1,17 @@
+2013-03-02 Rob Buis <[email protected]>
+
+ Text overflow ellipsis wrong color when using webkit-text-fill-color
+ https://bugs.webkit.org/show_bug.cgi?id=54841
+
+ Reviewed by David Hyatt.
+
+ Take -webkit-text-fill-color into account for ellipsis painting.
+
+ Test: fast/css/text-overflow-ellipsis-color.html
+
+ * rendering/EllipsisBox.cpp:
+ (WebCore::EllipsisBox::paint):
+
2013-03-02 Ryosuke Niwa <[email protected]>
Fix a typo in my previous commit (r144534).
Modified: trunk/Source/WebCore/rendering/EllipsisBox.cpp (144541 => 144542)
--- trunk/Source/WebCore/rendering/EllipsisBox.cpp 2013-03-02 14:39:08 UTC (rev 144541)
+++ trunk/Source/WebCore/rendering/EllipsisBox.cpp 2013-03-02 15:02:45 UTC (rev 144542)
@@ -36,7 +36,7 @@
{
GraphicsContext* context = paintInfo.context;
RenderStyle* style = m_renderer->style(isFirstLineStyle());
- Color textColor = style->visitedDependentColor(CSSPropertyColor);
+ Color textColor = style->visitedDependentColor(CSSPropertyWebkitTextFillColor);
if (textColor != context->fillColor())
context->setFillColor(textColor, style->colorSpace());
bool setShadow = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
