[webkit-changes] cvs commit: LayoutTests/fast/table
overflowHidden-expected.txt
Maciej
mjs at opensource.apple.com
Mon Oct 17 17:16:49 PDT 2005
mjs 05/10/17 17:16:48
Modified: . ChangeLog
khtml/rendering render_container.cpp render_container.h
render_flow.cpp render_layer.cpp render_layer.h
. ChangeLog
fast/clip 008-expected.txt
fast/css acid2-expected.txt acid2-pixel-expected.txt
fast/dom gc-3.html
fast/table overflowHidden-expected.txt
Log:
LayoutTests:
- temporarily back out hyatt's recent changes since the tree was closed
* fast/clip/008-expected.txt:
* fast/css/acid2-expected.txt:
* fast/css/acid2-pixel-expected.txt:
* fast/dom/gc-3.html:
* fast/table/overflowHidden-expected.txt:
WebCore:
- temporarily back out hyatt's recent changes since the tree was closed
* khtml/rendering/render_container.cpp:
(RenderContainer::destroy):
(RenderContainer::destroyChildren):
* khtml/rendering/render_container.h:
* khtml/rendering/render_flow.cpp:
(RenderFlow::destroy):
* khtml/rendering/render_layer.cpp:
(khtml::RenderLayer::isTransparent):
(khtml::RenderLayer::paintLayer):
(khtml::sortByZOrder):
* khtml/rendering/render_layer.h:
Revision Changes Path
1.247 +16 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog 17 Oct 2005 07:29:19 -0000 1.246
+++ ChangeLog 18 Oct 2005 00:16:42 -0000 1.247
@@ -1,3 +1,19 @@
+2005-10-17 Maciej Stachowiak <mjs at apple.com>
+
+ - temporarily back out hyatt's recent changes since the tree was closed
+
+ * khtml/rendering/render_container.cpp:
+ (RenderContainer::destroy):
+ (RenderContainer::destroyChildren):
+ * khtml/rendering/render_container.h:
+ * khtml/rendering/render_flow.cpp:
+ (RenderFlow::destroy):
+ * khtml/rendering/render_layer.cpp:
+ (khtml::RenderLayer::isTransparent):
+ (khtml::RenderLayer::paintLayer):
+ (khtml::sortByZOrder):
+ * khtml/rendering/render_layer.h:
+
2005-10-17 David Hyatt <hyatt at apple.com>
Fix for bugzilla bug 5283. Make overflow layers lose to other kinds of
1.76 +8 -3 WebCore/khtml/rendering/render_container.cpp
Index: render_container.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_container.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- render_container.cpp 17 Oct 2005 06:20:02 -0000 1.75
+++ render_container.cpp 18 Oct 2005 00:16:44 -0000 1.76
@@ -59,15 +59,20 @@
void RenderContainer::destroy()
{
- destroyLeftoverAnonymousChildren();
+ if (m_first)
+ destroyChildren();
+
RenderBox::destroy();
}
-void RenderContainer::destroyLeftoverAnonymousChildren()
+void RenderContainer::destroyChildren()
{
+ if (continuation())
+ continuation()->destroy();
+
while (m_first) {
if (m_first->isListMarker())
- m_first->remove(); // List markers are owned by their enclosing list and so don't get destroyed by this container.
+ m_first->remove();
else
m_first->destroy();
}
1.21 +1 -1 WebCore/khtml/rendering/render_container.h
Index: render_container.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_container.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- render_container.h 17 Oct 2005 06:20:02 -0000 1.20
+++ render_container.h 18 Oct 2005 00:16:44 -0000 1.21
@@ -49,7 +49,7 @@
virtual void removeChild(RenderObject *oldChild);
virtual void destroy();
- void destroyLeftoverAnonymousChildren();
+ void destroyChildren();
virtual RenderObject* removeChildNode(RenderObject* child);
virtual void appendChildNode(RenderObject* child);
1.170 +1 -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.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- render_flow.cpp 17 Oct 2005 06:20:03 -0000 1.169
+++ render_flow.cpp 18 Oct 2005 00:16:45 -0000 1.170
@@ -183,13 +183,7 @@
void RenderFlow::destroy()
{
- // Detach our continuation first.
- if (m_continuation)
- m_continuation->destroy();
-
- // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
- // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
- RenderContainer::destroyLeftoverAnonymousChildren();
+ RenderContainer::destroyChildren();
if (!documentBeingDestroyed()) {
if (m_firstLineBox) {
1.111 +14 -24 WebCore/khtml/rendering/render_layer.cpp
Index: render_layer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- render_layer.cpp 17 Oct 2005 07:29:22 -0000 1.110
+++ render_layer.cpp 18 Oct 2005 00:16:45 -0000 1.111
@@ -297,8 +297,9 @@
return curr;
}
+#if APPLE_CHANGES
bool
-RenderLayer::isTransparent() const
+RenderLayer::isTransparent()
{
return m_object->style()->opacity() < 1.0f;
}
@@ -326,6 +327,8 @@
}
}
+#endif
+
void* RenderLayer::operator new(size_t sz, RenderArena* renderArena) throw()
{
return renderArena->allocate(sz);
@@ -879,8 +882,10 @@
// Ensure our z-order lists are up-to-date.
updateZOrderLists();
+#if APPLE_CHANGES
if (isTransparent())
haveTransparency = true;
+#endif
// If this layer's renderer is a child of the paintingRoot, we render unconditionally, which
// is done by passing a nil paintingRoot down to our renderer (as if no paintingRoot was ever set).
@@ -894,9 +899,11 @@
// We want to paint our layer, but only if we intersect the damage rect.
bool shouldPaint = intersectsDamageRect(layerBounds, damageRect);
if (shouldPaint && !selectionOnly && !damageRect.isEmpty()) {
+#if APPLE_CHANGES
// Begin transparency layers lazily now that we know we have to paint something.
if (haveTransparency)
beginTransparencyLayers(p);
+#endif
// Paint our background first, before painting any child layers.
// Establish the clip used to paint our background.
@@ -926,9 +933,11 @@
// Now establish the appropriate clip and paint our child RenderObjects.
if (shouldPaint && !clipRectToApply.isEmpty()) {
+#if APPLE_CHANGES
// Begin transparency layers lazily now that we know we have to paint something.
if (haveTransparency)
beginTransparencyLayers(p);
+#endif
// Set up the clip used when painting our children.
setClip(p, paintDirtyRect, clipRectToApply);
@@ -964,11 +973,13 @@
}
}
+#if APPLE_CHANGES
// End our transparency layer
if (isTransparent() && m_usedTransparency) {
p->endTransparencyLayer();
m_usedTransparency = false;
}
+#endif
}
bool
@@ -1312,27 +1323,6 @@
}
}
-// Helpers for the sorting of layers by z-index.
-static inline bool isOverflowOnly(const RenderLayer* layer)
-{
- return layer->renderer()->hasOverflowClip() &&
- !layer->renderer()->isPositioned() &&
- !layer->renderer()->isRelPositioned() &&
- !layer->isTransparent();
-}
-
-static inline bool compare(const RenderLayer* layer1, const RenderLayer* layer2)
-{
- if (layer1->zIndex() == layer2->zIndex())
- // Layers that exist solely because of overflow clip do not technically establish a stacking context.
- // Our creation of RenderLayers for overflow regions is a convenience but is not really correct. Overflow
- // content should have just painted where it occurred in the document. Although we can't do that,
- // we will at least make sure that overflow layers lose to the other types of layers (positioned, relative positioned
- // and opacity).
- return isOverflowOnly(layer1) || !isOverflowOnly(layer2);
- return layer1->zIndex() < layer2->zIndex();
-}
-
// Sort the buffer from lowest z-index to highest. The common scenario will have
// most z-indices equal, so we optimize for that case (i.e., the list will be mostly
// sorted already).
@@ -1350,7 +1340,7 @@
for (uint j = start; j < i; j++) {
RenderLayer* elt = buffer->at(j);
RenderLayer* elt2 = buffer->at(j+1);
- if (!compare(elt, elt2)) {
+ if (elt->zIndex() > elt2->zIndex()) {
sorted = false;
buffer->insert(j, elt2);
buffer->insert(j+1, elt);
@@ -1371,7 +1361,7 @@
// Handle the fast common case (of equal z-indices). The list may already
// be completely sorted.
- if (compare(elt, elt2))
+ if (elt->zIndex() <= elt2->zIndex())
return;
// We have to merge sort. Ensure our merge buffer is big enough to hold
1.51 +3 -1 WebCore/khtml/rendering/render_layer.h
Index: render_layer.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- render_layer.h 17 Oct 2005 07:29:22 -0000 1.50
+++ render_layer.h 18 Oct 2005 00:16:45 -0000 1.51
@@ -187,9 +187,11 @@
Marquee* marquee() const { return m_marquee; }
void suspendMarquees();
- bool isTransparent() const;
+#if APPLE_CHANGES
+ bool isTransparent();
RenderLayer* transparentAncestor();
void beginTransparencyLayers(QPainter* p);
+#endif
RenderLayer* root() {
RenderLayer* curr = this;
1.38 +10 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 14 Oct 2005 06:10:01 -0000 1.37
+++ ChangeLog 18 Oct 2005 00:16:46 -0000 1.38
@@ -1,3 +1,13 @@
+2005-10-17 Maciej Stachowiak <mjs at apple.com>
+
+ - temporarily back out hyatt's recent changes since the tree was closed
+
+ * fast/clip/008-expected.txt:
+ * fast/css/acid2-expected.txt:
+ * fast/css/acid2-pixel-expected.txt:
+ * fast/dom/gc-3.html:
+ * fast/table/overflowHidden-expected.txt:
+
2005-10-13 Eric Seidel <eseidel at apple.com>
Committed file w/ extra newline by mistake.
1.7 +2 -2 LayoutTests/fast/clip/008-expected.txt
Index: 008-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/clip/008-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 008-expected.txt 17 Oct 2005 07:35:59 -0000 1.6
+++ 008-expected.txt 18 Oct 2005 00:16:47 -0000 1.7
@@ -11,9 +11,9 @@
text run at (293,18) width 446: "a containing block model, and that a fixed positioned element inside an"
text run at (0,36) width 353: "absolute positioned element is not considered overflow. "
RenderText {TEXT} at (0,0) size 0x0
-layer at (200,200) size 100x100
- RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#008000]
layer at (8,62) size 100x100
RenderBlock (positioned) {DIV} at (8,62) size 100x100
layer at (100,100) size 200x200
RenderBlock (positioned) {DIV} at (100,100) size 100x100
+layer at (200,200) size 100x100
+ RenderBlock {DIV} at (100,100) size 100x100 [bgcolor=#008000]
1.3 +7 -7 LayoutTests/fast/css/acid2-expected.txt
Index: acid2-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/css/acid2-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acid2-expected.txt 17 Oct 2005 07:36:37 -0000 1.2
+++ acid2-expected.txt 18 Oct 2005 00:16:47 -0000 1.3
@@ -45,13 +45,6 @@
RenderBlock (positioned) {P} at (132,108) size 48x18 [bgcolor=#000000] [border: none (6px solid #FFFF00) none]
layer at (132,144) size 48x15
RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
-layer at (48,2842) size 740x10 scrollHeight 276
- RenderBlock {DIV} at (12,204) size 740x10
- RenderTable {TABLE} at (0,0) size 64x276
- RenderTableSection {TBODY} at (0,0) size 0x276
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 64x276 [r=0 c=0 rs=1 cs=1]
- RenderImage {IMG} at (0,152) size 64x64
layer at (108,2686) size 96x12
RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
@@ -70,6 +63,13 @@
RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
RenderBlock {STRONG} at (0,12) size 72x0
+layer at (48,2842) size 740x10 scrollHeight 276
+ RenderBlock {DIV} at (12,204) size 740x10
+ RenderTable {TABLE} at (0,0) size 64x276
+ RenderTableSection {TBODY} at (0,0) size 0x276
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 64x276 [r=0 c=0 rs=1 cs=1]
+ RenderImage {IMG} at (0,152) size 64x64
layer at (48,84) size 704x82
RenderBlock (relative positioned) zI: 2 {DIV} at (48,0) size 704x82 [color=#000000] [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {H1} at (13,13) size 678x28
1.3 +7 -7 LayoutTests/fast/css/acid2-pixel-expected.txt
Index: acid2-pixel-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/css/acid2-pixel-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acid2-pixel-expected.txt 17 Oct 2005 07:36:37 -0000 1.2
+++ acid2-pixel-expected.txt 18 Oct 2005 00:16:47 -0000 1.3
@@ -48,13 +48,6 @@
layer at (108,120) size 96x12
RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
-layer at (48,276) size 740x10 scrollHeight 276
- RenderBlock {DIV} at (12,204) size 740x10
- RenderTable {TABLE} at (0,0) size 64x276
- RenderTableSection {TBODY} at (0,0) size 0x276
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 64x276 [r=0 c=0 rs=1 cs=1]
- RenderImage {IMG} at (0,152) size 64x64
layer at (84,144) size 144x24
RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 144x0
@@ -70,3 +63,10 @@
RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
RenderBlock {STRONG} at (0,12) size 72x0
+layer at (48,276) size 740x10 scrollHeight 276
+ RenderBlock {DIV} at (12,204) size 740x10
+ RenderTable {TABLE} at (0,0) size 64x276
+ RenderTableSection {TBODY} at (0,0) size 0x276
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 64x276 [r=0 c=0 rs=1 cs=1]
+ RenderImage {IMG} at (0,152) size 64x64
1.2 +1 -1 LayoutTests/fast/dom/gc-3.html
Index: gc-3.html
===================================================================
RCS file: /cvs/root/LayoutTests/fast/dom/gc-3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gc-3.html 31 May 2005 01:20:46 -0000 1.1
+++ gc-3.html 18 Oct 2005 00:16:47 -0000 1.2
@@ -2,7 +2,7 @@
<script>
function doit()
{
- var B = document.getElementById("span-B");
+ B = document.getElementById("span-B");
B.customProperty = "B";
document.getElementById("div").innerHTML = "<span>replacement content</span>";
1.3 +6 -6 LayoutTests/fast/table/overflowHidden-expected.txt
Index: overflowHidden-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/table/overflowHidden-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- overflowHidden-expected.txt 17 Oct 2005 07:37:01 -0000 1.2
+++ overflowHidden-expected.txt 18 Oct 2005 00:16:48 -0000 1.3
@@ -133,12 +133,12 @@
RenderBlock {DIV} at (1,1) size 100x100 [bgcolor=#800080]
layer at (12,12) size 302x104 clip at (13,13) size 300x102
RenderTableCell {TD} at (2,52) size 302x4 [bgcolor=#808080] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-layer at (12,160) size 604x104 clip at (13,161) size 602x102
- RenderTableCell {TD} at (2,43) size 604x22 [bgcolor=#808080] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
layer at (14,90) size 600x18
RenderBlock (positioned) {DIV} at (14,90) size 600x18 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 209x18
text run at (0,0) width 209: "With absolute positioning on div."
+layer at (12,160) size 604x104 clip at (13,161) size 602x102
+ RenderTableCell {TD} at (2,43) size 604x22 [bgcolor=#808080] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
layer at (14,203) size 600x18
RenderBlock {DIV} at (2,2) size 600x18 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 129x18
@@ -174,6 +174,10 @@
text run at (0,0) width 51: "Reverse"
layer at (12,1006) size 604x104 clip at (13,1007) size 602x102
RenderTableCell {TD} at (2,43) size 604x22 [bgcolor=#808080] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+layer at (14,1049) size 600x18
+ RenderBlock (relative positioned) {DIV} at (2,2) size 600x18 [bgcolor=#FFA500]
+ RenderText {TEXT} at (0,0) size 203x18
+ text run at (0,0) width 203: "With relative positioning on div."
layer at (12,1154) size 604x104 clip at (13,1155) size 602x102
RenderTableCell {TD} at (2,43) size 604x22 [bgcolor=#808080] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (2,2) size 600x18 [bgcolor=#FFC0CB]
@@ -196,10 +200,6 @@
RenderBlock {DIV} at (0,0) size 600x18 [bgcolor=#FFA500]
RenderText {TEXT} at (0,0) size 278x18
text run at (0,0) width 278: "With display:table-cell + relative positioning"
-layer at (14,1049) size 600x18
- RenderBlock (relative positioned) {DIV} at (2,2) size 600x18 [bgcolor=#FFA500]
- RenderText {TEXT} at (0,0) size 203x18
- text run at (0,0) width 203: "With relative positioning on div."
layer at (8,1718) size 605x107 clip at (11,1721) size 602x102
RenderTableCell {TD} at (0,41) size 605x25 [bgcolor=#808080] [border: (3px inset #808080)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (4,4) size 600x18 [bgcolor=#FFFF00]
More information about the webkit-changes
mailing list