Diff
Modified: trunk/LayoutTests/ChangeLog (95959 => 95960)
--- trunk/LayoutTests/ChangeLog 2011-09-26 17:13:09 UTC (rev 95959)
+++ trunk/LayoutTests/ChangeLog 2011-09-26 17:34:08 UTC (rev 95960)
@@ -1,3 +1,23 @@
+2011-09-26 Antaryami Pandia <antaryami.pan...@motorola.com>
+
+ Groove/inset/outset borders show solid if the color is black.
+ https://bugs.webkit.org/show_bug.cgi?id=58608
+
+ Reviewed by Simon Fraser.
+
+ * fast/borders/border-groove-expected.png: Added.
+ * fast/borders/border-groove-expected.txt: Added.
+ * fast/borders/border-groove.html: Added.
+ * fast/borders/border-inset-expected.png: Added.
+ * fast/borders/border-inset-expected.txt: Added.
+ * fast/borders/border-inset.html: Added.
+ * fast/borders/border-outset-expected.png: Added.
+ * fast/borders/border-outset-expected.txt: Added.
+ * fast/borders/border-outset.html: Added.
+ * fast/borders/border-ridge-expected.png: Added.
+ * fast/borders/border-ridge-expected.txt: Added.
+ * fast/borders/border-ridge.html: Added.
+
2011-09-26 Abhishek Arya <infe...@chromium.org>
Delete retired custom font data only on document
Added: trunk/LayoutTests/fast/borders/border-groove-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/fast/borders/border-groove-expected.txt (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-groove-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/borders/border-groove-expected.txt 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 400x400 [bgcolor=#008000] [border: (100px groove #000000)]
Property changes on: trunk/LayoutTests/fast/borders/border-groove-expected.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-groove.html (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-groove.html (rev 0)
+++ trunk/LayoutTests/fast/borders/border-groove.html 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,16 @@
+<html>
+<head>
+ <style type="text/css">
+ div {
+ width: 200px;
+ height: 200px;
+ border: 100px groove black;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ </div>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/borders/border-groove.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-inset-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/fast/borders/border-inset-expected.txt (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-inset-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/borders/border-inset-expected.txt 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 400x400 [bgcolor=#008000] [border: (100px inset #000000)]
Property changes on: trunk/LayoutTests/fast/borders/border-inset-expected.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-inset.html (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-inset.html (rev 0)
+++ trunk/LayoutTests/fast/borders/border-inset.html 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,16 @@
+<html>
+<head>
+ <style type="text/css">
+ div {
+ width: 200px;
+ height: 200px;
+ border: 100px inset black;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ </div>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/borders/border-inset.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-outset-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/fast/borders/border-outset-expected.txt (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-outset-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/borders/border-outset-expected.txt 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 400x400 [bgcolor=#008000] [border: (100px outset #000000)]
Property changes on: trunk/LayoutTests/fast/borders/border-outset-expected.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-outset.html (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-outset.html (rev 0)
+++ trunk/LayoutTests/fast/borders/border-outset.html 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,16 @@
+<html>
+<head>
+ <style type="text/css">
+ div {
+ width: 200px;
+ height: 200px;
+ border: 100px outset black;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ </div>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/borders/border-outset.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-ridge-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/fast/borders/border-ridge-expected.txt (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-ridge-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/borders/border-ridge-expected.txt 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 400x400 [bgcolor=#008000] [border: (100px ridge #000000)]
Property changes on: trunk/LayoutTests/fast/borders/border-ridge-expected.txt
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Added: trunk/LayoutTests/fast/borders/border-ridge.html (0 => 95960)
--- trunk/LayoutTests/fast/borders/border-ridge.html (rev 0)
+++ trunk/LayoutTests/fast/borders/border-ridge.html 2011-09-26 17:34:08 UTC (rev 95960)
@@ -0,0 +1,16 @@
+<html>
+<head>
+ <style type="text/css">
+ div {
+ width: 200px;
+ height: 200px;
+ border: 100px ridge black;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ </div>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/borders/border-ridge.html
___________________________________________________________________
Added: svn:mime-type
Added: svn:keywords
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (95959 => 95960)
--- trunk/Source/WebCore/ChangeLog 2011-09-26 17:13:09 UTC (rev 95959)
+++ trunk/Source/WebCore/ChangeLog 2011-09-26 17:34:08 UTC (rev 95960)
@@ -1,3 +1,21 @@
+2011-09-26 Antaryami Pandia <antaryami.pan...@motorola.com>
+
+ Groove/inset/outset borders show solid if the color is black.
+ https://bugs.webkit.org/show_bug.cgi?id=58608
+
+ Reviewed by Simon Fraser.
+
+ Lightened the border side colors when drawing borders with styles as
+ Outset/Inset/Groove/Ridge.
+
+ Tests: fast/borders/border-groove.html
+ fast/borders/border-inset.html
+ fast/borders/border-outset.html
+ fast/borders/border-ridge.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+
2011-09-26 Abhishek Arya <infe...@chromium.org>
Delete retired custom font data only on document
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (95959 => 95960)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-09-26 17:13:09 UTC (rev 95959)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-09-26 17:34:08 UTC (rev 95960)
@@ -934,14 +934,19 @@
break;
}
case INSET:
- // FIXME: Maybe we should lighten the colors on one side like Firefox.
- // https://bugs.webkit.org/show_bug.cgi?id=58608
- if (side == BSTop || side == BSLeft)
- color = color.dark();
// fall through
case OUTSET:
- if (style == OUTSET && (side == BSBottom || side == BSRight))
- color = color.dark();
+ if (style == INSET) {
+ if (side == BSTop || side == BSLeft)
+ color = color.dark();
+ else if (side == BSBottom || side == BSRight)
+ color = color.light();
+ } else if (style == OUTSET) {
+ if (side == BSTop || side == BSLeft)
+ color = color.light();
+ else if (side == BSBottom || side == BSRight)
+ color = color.dark();
+ }
// fall through
case SOLID: {
StrokeStyle oldStrokeStyle = graphicsContext->strokeStyle();
