Title: [133500] branches/safari-536.28-branch/Source/WebCore
- Revision
- 133500
- Author
- [email protected]
- Date
- 2012-11-05 10:59:59 -0800 (Mon, 05 Nov 2012)
Log Message
Merged r125353. <rdar://problem/12536410>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (133499 => 133500)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-05 18:56:05 UTC (rev 133499)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-05 18:59:59 UTC (rev 133500)
@@ -1,5 +1,20 @@
2012-11-05 Lucas Forschler <[email protected]>
+ Merge r125353
+
+ 2012-08-11 Abhishek Arya <[email protected]>
+
+ Unreviewed.
+
+ Removing newly added assert in r125351 since it is exposing
+ legitimate layout bugs in few tests. We will re-add the assert
+ after fixing those bugs. Failures are tracked in webkit bug 93766.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::removeFromTrackedRendererMaps):
+
+2012-11-05 Lucas Forschler <[email protected]>
+
Merge r125351
2012-08-11 Levi Weintraub <[email protected]>
@@ -206628,3 +206643,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/rendering/RenderBlock.cpp (133499 => 133500)
--- branches/safari-536.28-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-11-05 18:56:05 UTC (rev 133499)
+++ branches/safari-536.28-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-11-05 18:59:59 UTC (rev 133500)
@@ -3523,7 +3523,12 @@
HashSet<RenderBlock*>::iterator end = containerSet->end();
for (HashSet<RenderBlock*>::iterator it = containerSet->begin(); it != end; ++it) {
RenderBlock* container = *it;
- ASSERT(descendant->isDescendantOf(container));
+
+ // FIXME: Disabling this assert temporarily until we fix the layout
+ // bugs associated with positioned objects not properly cleared from
+ // their ancestor chain before being moved. See webkit bug 93766.
+ // ASSERT(descendant->isDescendantOf(container));
+
TrackedRendererListHashSet* descendantSet = descendantsMap->get(container);
ASSERT(descendantSet);
if (!descendantSet)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
