projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fedfee4)
2010-12-26 Abhishek Arya <inferno@chromium.org>
authorinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 26 Dec 2010 16:04:58 +0000 (16:04 +0000)
committerinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 26 Dec 2010 16:04:58 +0000 (16:04 +0000)
        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@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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/multicol/renderer-positioned-assert-crash.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/rendering/RenderLayer.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3c0027a..967f3e8 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-26  Abhishek Arya  <inferno@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@google.com>
 
         Unreviewed, Chromium test expectations update.
diff --git a/LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt b/LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt
new file mode 100644 (file)
index 0000000..7ef22e9
--- /dev/null
+++ b/LayoutTests/fast/multicol/renderer-positioned-assert-crash-expected.txt
@@ -0,0 +1 @@
+PASS
diff --git a/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
new file mode 100644 (file)
index 0000000..4336081
--- /dev/null
+++ b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
@@ -0,0 +1,17 @@
+<html>\r
+    <script>\r
+        if (window.layoutTestController)\r
+            layoutTestController.dumpAsText();\r
+    </script>\r
+    <style>\r
+        .box\r
+        {\r
+            position: absolute;\r
+            -webkit-columns: 1px;\r
+        }\r
+    </style>\r
+    <div class="box">\r
+        PASS\r
+        <video>\r
+    </div>\r
+</html>\r
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aacb440..7c76dca 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-26  Abhishek Arya  <inferno@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@gmail.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 92e45bd..88533c4 100644 (file)
--- 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()) {
Domain: Web Framework / Uncategorized;