[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
inferno at chromium.org
inferno at chromium.org
Fri Jan 21 14:42:23 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 90edd5593ef25cc84d51ab9ab8262058b5d30369
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 26 16:04:58 2010 +0000
2010-12-26 Abhishek Arya <inferno at chromium.org>
Reviewed by Simon Fraser.
Remove the bad assert in paintPaginatedChildLayer, hitTestPaginatedChildLayer.
https://bugs.webkit.org/show_bug.cgi?id=48772
Test: fast/multicol/renderer-positioned-assert-crash.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintPaginatedChildLayer):
(WebCore::RenderLayer::hitTestPaginatedChildLayer):
2010-12-26 Abhishek Arya <inferno at chromium.org>
Reviewed by Simon Fraser.
Tests passes if it does not crash.
https://bugs.webkit.org/show_bug.cgi?id=48772
* fast/multicol/renderer-positioned-assert-crash-expected.txt: Added.
* fast/multicol/renderer-positioned-assert-crash.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3c0027a..967f3e8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-26 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Simon Fraser.
+
+ Tests passes if it does not crash.
+ https://bugs.webkit.org/show_bug.cgi?id=48772
+
+ * fast/multicol/renderer-positioned-assert-crash-expected.txt: Added.
+ * fast/multicol/renderer-positioned-assert-crash.html: Added.
+
2010-12-25 Kenneth Russell <kbr at google.com>
Unreviewed, Chromium test expectations update.
diff --git a/LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt b/LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt
similarity index 100%
copy from LayoutTests/compositing/overflow/get-transform-from-non-box-container-expected.txt
copy to LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt
diff --git a/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
new file mode 100644
index 0000000..4336081
--- /dev/null
+++ b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
@@ -0,0 +1,17 @@
+<html>
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+ <style>
+ .box
+ {
+ position: absolute;
+ -webkit-columns: 1px;
+ }
+ </style>
+ <div class="box">
+ PASS
+ <video>
+ </div>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aacb440..7c76dca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-26 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Simon Fraser.
+
+ Remove the bad assert in paintPaginatedChildLayer, hitTestPaginatedChildLayer.
+ https://bugs.webkit.org/show_bug.cgi?id=48772
+
+ Test: fast/multicol/renderer-positioned-assert-crash.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintPaginatedChildLayer):
+ (WebCore::RenderLayer::hitTestPaginatedChildLayer):
+
2010-12-25 Peter Rybin <peter.rybin at gmail.com>
Reviewed by Adam Barth.
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 92e45bd..88533c4 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -2572,12 +2572,11 @@ void RenderLayer::paintList(Vector<RenderLayer*>* list, RenderLayer* rootLayer,
}
void RenderLayer::paintPaginatedChildLayer(RenderLayer* childLayer, RenderLayer* rootLayer, GraphicsContext* context,
- const IntRect& paintDirtyRect, PaintBehavior paintBehavior,
- RenderObject* paintingRoot, OverlapTestRequestMap* overlapTestRequests,
- PaintLayerFlags paintFlags)
+ const IntRect& paintDirtyRect, PaintBehavior paintBehavior,
+ RenderObject* paintingRoot, OverlapTestRequestMap* overlapTestRequests,
+ PaintLayerFlags paintFlags)
{
// We need to do multiple passes, breaking up our child layer into strips.
- ASSERT(!renderer()->isPositioned());
Vector<RenderLayer*> columnLayers;
RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
@@ -3044,7 +3043,6 @@ RenderLayer* RenderLayer::hitTestList(Vector<RenderLayer*>* list, RenderLayer* r
RenderLayer* RenderLayer::hitTestPaginatedChildLayer(RenderLayer* childLayer, RenderLayer* rootLayer, const HitTestRequest& request, HitTestResult& result,
const IntRect& hitTestRect, const IntPoint& hitTestPoint, const HitTestingTransformState* transformState, double* zOffset)
{
- ASSERT(!renderer()->isPositioned());
Vector<RenderLayer*> columnLayers;
RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list