Changeset 132483 in webkit

Timestamp:

Oct 25, 2012 7:48:41 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2][AC] Regression(132392) infinite loop when displaying certain animations.
​https://bugs.webkit.org/show_bug.cgi?id=100288

Patch by Yael Aharon <​yael.aharon@intel.com> on 2012-10-25
Reviewed by Kenneth Rohde Christiansen.

When PageClientImpl::setViewNeedsDisplay is called, start a 0 length timer.
That breaks the synchronous loop we were experiencing when ewk_view_display
was called directly.

• UIProcess/API/efl/EwkViewImpl.cpp:

(EwkViewImpl::EwkViewImpl):
(EwkViewImpl::displayTimerFired):
(EwkViewImpl::redrawRegion):

• UIProcess/API/efl/EwkViewImpl.h:

(EwkViewImpl):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/EwkViewImpl.cpp (modified) (3 diffs)
• UIProcess/API/efl/EwkViewImpl.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-10-25  Yael Aharon  <yael.aharon@intel.com>
+
+        [EFL][WK2][AC] Regression(132392) infinite loop when displaying certain animations.
+        https://bugs.webkit.org/show_bug.cgi?id=100288
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        When PageClientImpl::setViewNeedsDisplay is called, start a 0 length timer.
+        That breaks the synchronous loop we were experiencing when ewk_view_display
+        was called directly.
+
+        * UIProcess/API/efl/EwkViewImpl.cpp:
+        (EwkViewImpl::EwkViewImpl):
+        (EwkViewImpl::displayTimerFired):
+        (EwkViewImpl::redrawRegion):
+        * UIProcess/API/efl/EwkViewImpl.h:
+        (EwkViewImpl):
+
 2012-10-25  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp

@@ -156 +156 @@
 #endif
     , m_view(view)
+    , m_displayTimer(this, &EwkViewImpl::displayTimerFired)
 {
     ASSERT(view);
@@ -247 +248 @@
 }
 
-void EwkViewImpl::redrawRegion(const IntRect& rect)
+void EwkViewImpl::displayTimerFired(WebCore::Timer<EwkViewImpl>*)
 {
     Ewk_View_Smart_Data* sd = smartData();
@@ -256 +257 @@
 #if USE(COORDINATED_GRAPHICS)
     EWK_VIEW_IMPL_GET_OR_RETURN(sd, viewImpl);
-
-    evas_gl_make_current(viewImpl->evasGl, viewImpl->evasGlSurface, viewImpl->evasGlContext);
-    viewImpl->pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
-#endif
-
-    evas_object_image_data_update_add(sd->image, rect.x(), rect.y(), rect.width(), rect.height());
+#endif
+
+    Region dirtyRegion;
+    for (Vector<IntRect>::iterator it = m_dirtyRects.begin(); it != m_dirtyRects.end(); ++it)
+        dirtyRegion.unite(*it);
+
+    m_dirtyRects.clear();
+
+    Vector<IntRect> rects = dirtyRegion.rects();
+    Vector<IntRect>::iterator end = rects.end();
+
+    for (Vector<IntRect>::iterator it = rects.begin(); it != end; ++it) {
+        IntRect rect = *it;
+#if USE(COORDINATED_GRAPHICS)
+        evas_gl_make_current(viewImpl->evasGl, viewImpl->evasGlSurface, viewImpl->evasGlContext);
+        viewImpl->pageViewportControllerClient->display(rect, IntPoint(sd->view.x, sd->view.y));
+#endif
+
+        evas_object_image_data_update_add(sd->image, rect.x(), rect.y(), rect.width(), rect.height());
+    }
+}
+
+void EwkViewImpl::redrawRegion(const IntRect& rect)
+{
+    if (!m_displayTimer.isActive())
+        m_displayTimer.startOneShot(0);
+    m_dirtyRects.append(rect);
 }
 

trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h

@@ -29 +29 @@
 #include <Evas.h>
 #include <WebCore/TextDirection.h>
+#include <WebCore/Timer.h>
 #include <WebKit2/WKBase.h>
 #include <wtf/HashMap.h>
@@ -229 +230 @@
 private:
     Ewk_View_Smart_Data* smartData();
+    void displayTimerFired(WebCore::Timer<EwkViewImpl>*);
 
     Evas_Object* m_view;
     typedef HashMap<WKPageRef, const Evas_Object*> PageViewMap;
     static PageViewMap pageViewMap;
+    WebCore::Timer<EwkViewImpl> m_displayTimer;
+    WTF::Vector <WebCore::IntRect> m_dirtyRects;
 };