Changeset 133723 in webkit

Timestamp:

Nov 6, 2012 10:31:20 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] API test crash with accelerated compositing on.
​https://bugs.webkit.org/show_bug.cgi?id=101384

Patch by Viatcheslav Ostapenko <​v.ostapenko@samsung.com> on 2012-11-06
Reviewed by Gyuyoung Kim.

If accelerated compositing is enabled API tests should create GL evas engine
instead of default one.
Also, in API tests first window resize and display often comes earlier
than enterAcceleratedCompositingMode call, so let's create GL surface in
_ewk_view_smart_calculate on first window resize.

• UIProcess/API/efl/ewk_view.cpp:

(_ewk_view_smart_calculate):

• UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:

(EWK2UnitTest::EWK2UnitTestBase::SetUp):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/ewk_view.cpp (modified) (1 diff)
• UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-06  Viatcheslav Ostapenko  <v.ostapenko@samsung.com>
+
+        [EFL][WK2] API test crash with accelerated compositing on.
+        https://bugs.webkit.org/show_bug.cgi?id=101384
+
+        Reviewed by Gyuyoung Kim.
+
+        If accelerated compositing is enabled API tests should create GL evas engine
+        instead of default one.
+        Also, in API tests first window resize and display often comes earlier
+        than enterAcceleratedCompositingMode call, so let's create GL surface in
+        _ewk_view_smart_calculate on first window resize.
+
+        * UIProcess/API/efl/ewk_view.cpp:
+        (_ewk_view_smart_calculate):
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
+        (EWK2UnitTest::EWK2UnitTestBase::SetUp):
+
 2012-11-06  Anders Carlsson  <andersca@apple.com>
 

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

@@ -388 +388 @@
 #if USE(ACCELERATED_COMPOSITING)
         // Recreate surface if needed.
-        if (impl->evasGLSurface()) {
+        if (impl->evasGLSurface())
             impl->clearEvasGLSurface();
-            impl->createGLSurface(IntSize(width, height));
-        }
+
+        impl->createGLSurface(IntSize(width, height));
 #endif
 #if USE(TILED_BACKING_STORE)

trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp

@@ -49 +49 @@
     unsigned int height = environment->defaultHeight();
 
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+    const char* engine = "opengl_x11";
+    m_ecoreEvas = ecore_evas_new(engine, 0, 0, width, height, 0);
+#else
     m_ecoreEvas = ecore_evas_new(0, 0, 0, width, height, 0);
+#endif
 
     ecore_evas_show(m_ecoreEvas);