[webkit-changes] cvs commit: LayoutTests/fast/css
outline-auto-location-expected.checksum
outline-auto-location-expected.png
outline-auto-location-expected.txt outline-auto-location.html
Darin
darin at opensource.apple.com
Sat Dec 10 11:56:12 PST 2005
darin 05/12/10 11:56:12
Modified: . ChangeLog
khtml/rendering render_flow.cpp
. ChangeLog
Added: fast/css outline-auto-location-expected.checksum
outline-auto-location-expected.png
outline-auto-location-expected.txt
outline-auto-location.html
Log:
LayoutTests:
New layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=3983
* fast/css/outline-auto-location-expected.checksum: Added.
* fast/css/outline-auto-location-expected.png: Added.
* fast/css/outline-auto-location-expected.txt: Added.
* fast/css/outline-auto-location.html: Added.
WebCore:
Reviewed by Hyatt, landed by Darin.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3983
outline:auto improperly puts outline around contained elements, not the actual div
* khtml/rendering/render_flow.cpp: (RenderFlow::addFocusRingRects):
Only add the rect if this is a RenderBlock.
Revision Changes Path
1.500 +10 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- ChangeLog 10 Dec 2005 18:55:56 -0000 1.499
+++ ChangeLog 10 Dec 2005 19:56:05 -0000 1.500
@@ -1,3 +1,13 @@
+2005-12-10 Graham Dennis <Graham.Dennis at gmail.com>
+
+ Reviewed by Hyatt, landed by Darin.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3983
+ outline:auto improperly puts outline around contained elements, not the actual div
+
+ * khtml/rendering/render_flow.cpp: (RenderFlow::addFocusRingRects):
+ Only add the rect if this is a RenderBlock.
+
2005-12-10 Mitz Pettel <opendarwin.org at mitzpettel.com>
Reviewed and landed by Darin.
1.175 +5 -15 WebCore/khtml/rendering/render_flow.cpp
Index: render_flow.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flow.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- render_flow.cpp 21 Nov 2005 01:20:23 -0000 1.174
+++ render_flow.cpp 10 Dec 2005 19:56:10 -0000 1.175
@@ -658,25 +658,15 @@
void RenderFlow::addFocusRingRects(QPainter *p, int _tx, int _ty)
{
- // Only paint focus ring around outermost contenteditable element.
- // But skip the body element if it is outermost.
- if (element() && element()->isContentEditable()) {
- if (element()->parentNode() && !element()->parentNode()->isContentEditable() && !element()->hasTagName(bodyTag))
- p->addFocusRingRect(_tx, _ty, width(), height());
- return;
- }
+ if (isRenderBlock())
+ p->addFocusRingRect(_tx, _ty, width(), height());
- for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
- p->addFocusRingRect(_tx + curr->xPos(),
- _ty + curr->yPos(),
- curr->width(),
- curr->height());
- }
+ for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox())
+ p->addFocusRingRect(_tx + curr->xPos(), _ty + curr->yPos(), curr->width(), curr->height());
- for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
+ for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling())
if (!curr->isText())
curr->addFocusRingRects(p, _tx + curr->xPos(), _ty + curr->yPos());
- }
if (continuation())
continuation()->addFocusRingRects(p,
1.135 +9 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog 10 Dec 2005 19:05:21 -0000 1.134
+++ ChangeLog 10 Dec 2005 19:56:11 -0000 1.135
@@ -1,3 +1,12 @@
+2005-12-10 Darin Adler <darin at apple.com>
+
+ New layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=3983
+
+ * fast/css/outline-auto-location-expected.checksum: Added.
+ * fast/css/outline-auto-location-expected.png: Added.
+ * fast/css/outline-auto-location-expected.txt: Added.
+ * fast/css/outline-auto-location.html: Added.
+
2005-12-10 Oliver Hunt <ojh16 at student.canterbury.ac.nz>
New layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=3539
1.1 LayoutTests/fast/css/outline-auto-location-expected.checksum
Index: outline-auto-location-expected.checksum
===================================================================
f16d4c3aa211365903e9f6fbf6d33f90
1.1 LayoutTests/fast/css/outline-auto-location-expected.png
<<Binary file>>
1.1 LayoutTests/fast/css/outline-auto-location-expected.txt
Index: outline-auto-location-expected.txt
===================================================================
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,20) size 784x560
RenderBlock {DIV} at (20,0) size 744x52 [bgcolor=#ADD8E6]
RenderBlock {P} at (0,0) size 744x18
RenderText {TEXT} at (0,0) size 314x18
text run at (0,0) width 314: "There should be one outline around the whole div"
RenderBlock {P} at (-20,34) size 764x18
RenderText {TEXT} at (0,0) size 158x18
text run at (0,0) width 158: "Not around each element"
RenderBlock {DIV} at (20,72) size 744x52 [bgcolor=#ADD8E6]
RenderBlock {P} at (0,0) size 744x18
RenderText {TEXT} at (0,0) size 314x18
text run at (0,0) width 314: "There should be one outline around the whole div"
RenderBlock {P} at (-20,34) size 764x18
RenderText {TEXT} at (0,0) size 158x18
text run at (0,0) width 158: "Not around each element"
1.1 LayoutTests/fast/css/outline-auto-location.html
Index: outline-auto-location.html
===================================================================
<html>
<body>
<div style="outline:solid 3px #1f5ccf; background-color: lightblue; margin: 20px">
<p>There should be one outline around the whole div</p>
<p style="margin-left: -20px">Not around each element</p>
</div>
<div style="outline-style: auto; background-color: lightblue; margin: 20px">
<p>There should be one outline around the whole div</p>
<p style="margin-left: -20px">Not around each element</p>
</div>
</body>
</html>
More information about the webkit-changes
mailing list