Changeset 116656 in webkit

Timestamp:

May 10, 2012 9:54:02 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][DRT] ewk_view_paint_contents may trigger assertion failure
​https://bugs.webkit.org/show_bug.cgi?id=85058

Patch by Dominik Röttsches <​dominik.rottsches@intel.com> on 2012-05-10
Reviewed by Gustavo Noronha Silva.

Source/WebKit/efl:

Fixing assertion failure triggered in media/media-fragment cases.
The assertion is hit because of a race between scheduleRelayout() and
the EWK's idle tiling painting. This is exposed by test cases
that rapidly insert child nodes to the document which lead to
scheduleRelayout() calls. Using the general purpose defensive
layout function, not causing any extra relayout work if there's
nothing to be done, but still avoiding the assertion failure if
layout is needed.

• ewk/ewk_view.cpp:

(ewk_view_paint):
(ewk_view_paint_contents):

LayoutTests:

Unskipping media-fragments that pass after the assertion failure was fixed.

• platform/efl/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/ewk/ewk_view.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-10  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [EFL][DRT] ewk_view_paint_contents may trigger assertion failure
+        https://bugs.webkit.org/show_bug.cgi?id=85058
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Unskipping media-fragments that pass after the assertion failure was fixed.
+
+        * platform/efl/Skipped:
+
 2012-05-10  Erik Arvidsson  <arv@chromium.org>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -1039 +1039 @@
 media/media-element-play-after-eos.html
 media/media-extension-with-fragment.html
-media/media-fragments/TC0001-TC0009.html
-media/media-fragments/TC0010-TC0019.html
-media/media-fragments/TC0020-TC0029.html
-media/media-fragments/TC0030-TC0039.html
-media/media-fragments/TC0040-TC0049.html
-media/media-fragments/TC0050-TC0059.html
-media/media-fragments/TC0060-TC0069.html
-media/media-fragments/TC0070-TC0079.html
-media/media-fragments/TC0080-TC0089.html
-media/media-fragments/TC0090-TC0099.html
 media/media-initialTime.html
 media/media-load-event.html

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-05-10  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [EFL][DRT] ewk_view_paint_contents may trigger assertion failure
+        https://bugs.webkit.org/show_bug.cgi?id=85058
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Fixing assertion failure triggered in media/media-fragment cases.
+        The assertion is hit because of a race between scheduleRelayout() and
+        the EWK's idle tiling painting. This is exposed by test cases
+        that rapidly insert child nodes to the document which lead to
+        scheduleRelayout() calls. Using the general purpose defensive
+        layout function, not causing any extra relayout work if there's
+        nothing to be done, but still avoiding the assertion failure if
+        layout is needed.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_paint):
+        (ewk_view_paint_contents):
+
 2012-05-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -2779 +2779 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);
 
-    if (view->needsLayout())
-        view->forceLayout();
+    view->updateLayoutAndStyleIfNeededRecursive();
     WebCore::GraphicsContext graphicsContext(cr);
     WebCore::IntRect rect(*area);
@@ -2807 +2806 @@
     WebCore::IntRect rect(*area);
 
+    view->updateLayoutAndStyleIfNeededRecursive();
     cairo_save(cr);
     graphicsContext.save();