[webkit-changes] cvs commit: LayoutTests/fast/overflow
overflow-focus-ring-expected.checksum
overflow-focus-ring-expected.png
overflow-focus-ring-expected.txt overflow-focus-ring.html
Adele
adele at opensource.apple.com
Thu Dec 15 13:06:52 PST 2005
adele 05/12/15 13:06:51
Modified: . ChangeLog
khtml/rendering render_flow.cpp
. ChangeLog
Added: fast/overflow overflow-focus-ring-expected.checksum
overflow-focus-ring-expected.png
overflow-focus-ring-expected.txt
overflow-focus-ring.html
Log:
LayoutTests:
Test for <rdar://problem/4381360>, http://bugzilla.opendarwin.org/show_bug.cgi?id=6100
REGRESSION: Focus ring on contenteditable div outlines text in overflow area instead of div (6100)
* fast/overflow/overflow-focus-ring-expected.checksum: Added.
* fast/overflow/overflow-focus-ring-expected.png: Added.
* fast/overflow/overflow-focus-ring-expected.txt: Added.
* fast/overflow/overflow-focus-ring.html: Added.
WebCore:
Reviewed by Darin and Hyatt.
Fixed <rdar://problem/4381360> REGRESSION: Focus ring on contenteditable div outlines text in overflow area instead of div (6100)
http://bugzilla.opendarwin.org/show_bug.cgi?id=6100
Test: fast/overflow/overflow-focus-ring.html
* khtml/rendering/render_flow.cpp:
(RenderFlow::addFocusRingRects): For overflow, we don't need to compute the rects for the children.
Revision Changes Path
1.535 +12 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- ChangeLog 15 Dec 2005 20:19:59 -0000 1.534
+++ ChangeLog 15 Dec 2005 21:06:43 -0000 1.535
@@ -1,3 +1,15 @@
+2005-12-15 Adele Peterson <adele at apple.com>
+
+ Reviewed by Darin and Hyatt.
+
+ Fixed <rdar://problem/4381360> REGRESSION: Focus ring on contenteditable div outlines text in overflow area instead of div (6100)
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=6100
+
+ Test: fast/overflow/overflow-focus-ring.html
+
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::addFocusRingRects): For overflow, we don't need to compute the rects for the children.
+
2005-12-15 Darin Adler <darin at apple.com>
Reviewed by Tim Hatcher.
1.177 +9 -7 WebCore/khtml/rendering/render_flow.cpp
Index: render_flow.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_flow.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- render_flow.cpp 14 Dec 2005 23:31:55 -0000 1.176
+++ render_flow.cpp 15 Dec 2005 21:06:49 -0000 1.177
@@ -660,13 +660,15 @@
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 (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling())
- if (!curr->isText())
- curr->addFocusRingRects(p, _tx + curr->xPos(), _ty + curr->yPos());
-
+ if (!hasOverflowClip()) {
+ 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())
+ if (!curr->isText())
+ curr->addFocusRingRects(p, _tx + curr->xPos(), _ty + curr->yPos());
+ }
+
if (continuation())
continuation()->addFocusRingRects(p,
_tx - containingBlock()->xPos() + continuation()->xPos(),
1.155 +10 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog 15 Dec 2005 17:14:21 -0000 1.154
+++ ChangeLog 15 Dec 2005 21:06:49 -0000 1.155
@@ -1,3 +1,13 @@
+2005-12-15 Adele Peterson <adele at apple.com>
+
+ Test for <rdar://problem/4381360>, http://bugzilla.opendarwin.org/show_bug.cgi?id=6100
+ REGRESSION: Focus ring on contenteditable div outlines text in overflow area instead of div (6100)
+
+ * fast/overflow/overflow-focus-ring-expected.checksum: Added.
+ * fast/overflow/overflow-focus-ring-expected.png: Added.
+ * fast/overflow/overflow-focus-ring-expected.txt: Added.
+ * fast/overflow/overflow-focus-ring.html: Added.
+
2005-12-15 Darin Adler <darin at apple.com>
- updated test result -- this test now succeeds due to some recent change
1.1 LayoutTests/fast/overflow/overflow-focus-ring-expected.checksum
Index: overflow-focus-ring-expected.checksum
===================================================================
55221f173a95b8e34e811c306c9d58a0
1.1 LayoutTests/fast/overflow/overflow-focus-ring-expected.png
<<Binary file>>
1.1 LayoutTests/fast/overflow/overflow-focus-ring-expected.txt
Index: overflow-focus-ring-expected.txt
===================================================================
EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
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,8) size 784x584
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 507x18
text run at (0,0) width 507: "The focus ring of the following div should not extend beyond the size of the div."
layer at (8,26) size 500x400 scrollWidth 17712
RenderBlock {DIV} at (0,18) size 500x400
RenderText {TEXT} at (0,0) size 17712x18
text run at (0,0) width 17712: "......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."
1.1 LayoutTests/fast/overflow/overflow-focus-ring.html
Index: overflow-focus-ring.html
===================================================================
<html>
<body onload="document.getElementById('elm').focus()">
The focus ring of the following div should not extend beyond the size of the div.
<div style="overflow:hidden; height:400px; width:500px;" id="elm" contentEditable="true">...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................</div>
</body>
</html>
More information about the webkit-changes
mailing list