[webkit-changes] [151251] trunk/Source/WebKit2

Wed, 05 Jun 2013 19:37:05 -0700

Title: [151251] trunk/Source/WebKit2
Revision
151251
Author
[email protected]
Date
2013-06-05 19:38:09 -0700 (Wed, 05 Jun 2013)

Log Message

[EFL][WK2] Fix test_ewk2_view unit test timed out issue
https://bugs.webkit.org/show_bug.cgi?id=117251

Reviewed by Christophe Dumez.

'ewk_view_contents_size_changed' unit test case has been timed out since r150802 because
same size is filtered by WebView class. So create one different test html string that has
different size to continue unit tests.

* UIProcess/API/efl/tests/test_ewk2_view.cpp:
(onContentsSizeChangedPortrait):
(onContentsSizeChangedLandscape):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (151250 => 151251)


--- trunk/Source/WebKit2/ChangeLog	2013-06-06 02:13:34 UTC (rev 151250)
+++ trunk/Source/WebKit2/ChangeLog	2013-06-06 02:38:09 UTC (rev 151251)
@@ -1,3 +1,19 @@
+2013-06-05  Kangil Han  <[email protected]>
+
+        [EFL][WK2] Fix test_ewk2_view unit test timed out issue
+        https://bugs.webkit.org/show_bug.cgi?id=117251
+
+        Reviewed by Christophe Dumez.
+
+        'ewk_view_contents_size_changed' unit test case has been timed out since r150802 because
+        same size is filtered by WebView class. So create one different test html string that has
+        different size to continue unit tests.
+
+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+        (onContentsSizeChangedPortrait):
+        (onContentsSizeChangedLandscape):
+        (TEST_F):
+
 2013-06-05  Bear Travis  <[email protected]>
 
         [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (151250 => 151251)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp	2013-06-06 02:13:34 UTC (rev 151250)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp	2013-06-06 02:38:09 UTC (rev 151251)
@@ -894,40 +894,53 @@
     ASSERT_FALSE(data.didReceiveCancelVibration);
 }
 
-static void onContentsSizeChanged(void* userData, Evas_Object*, void* eventInfo)
+static void onContentsSizeChangedPortrait(void* userData, Evas_Object*, void* eventInfo)
 {
     bool* result = static_cast<bool*>(userData);
     Ewk_CSS_Size* size = static_cast<Ewk_CSS_Size*>(eventInfo);
-
     if (size->w == 2000 && size->h == 3000)
         *result = true;
 }
 
+static void onContentsSizeChangedLandscape(void* userData, Evas_Object*, void* eventInfo)
+{
+    bool* result = static_cast<bool*>(userData);
+    Ewk_CSS_Size* size = static_cast<Ewk_CSS_Size*>(eventInfo);
+    if (size->w == 3000 && size->h == 2000)
+        *result = true;
+}
+
 TEST_F(EWK2UnitTestBase, ewk_view_contents_size_changed)
 {
-    const char contentsSizeHTML[] =
+    const char contentsSizeHTMLPortrait[] =
         "<!DOCTYPE html>"
         "<body style=\"margin:0px;width:2000px;height:3000px\"></body>";
+    const char contentsSizeHTMLLandscape[] =
+        "<!DOCTYPE html>"
+        "<body style=\"margin:0px;width:3000px;height:2000px\"></body>";
 
     bool sizeChanged = false;
-    evas_object_smart_callback_add(webView(), "contents,size,changed", onContentsSizeChanged, &sizeChanged);
-    ewk_view_html_string_load(webView(), contentsSizeHTML, 0, 0);
+    evas_object_smart_callback_add(webView(), "contents,size,changed", onContentsSizeChangedPortrait, &sizeChanged);
+    ewk_view_html_string_load(webView(), contentsSizeHTMLPortrait, 0, 0);
     while (!sizeChanged)
         ecore_main_loop_iterate();
+    evas_object_smart_callback_del(webView(), "contents,size,changed", onContentsSizeChangedPortrait);
 
+    evas_object_smart_callback_add(webView(), "contents,size,changed", onContentsSizeChangedLandscape, &sizeChanged);
     ewk_view_device_pixel_ratio_set(webView(), 2);
-    ewk_view_html_string_load(webView(), contentsSizeHTML, 0, 0);
+    ewk_view_html_string_load(webView(), contentsSizeHTMLLandscape, 0, 0);
     sizeChanged = false;
     while (!sizeChanged)
         ecore_main_loop_iterate();
+    evas_object_smart_callback_del(webView(), "contents,size,changed", onContentsSizeChangedLandscape);
 
+    evas_object_smart_callback_add(webView(), "contents,size,changed", onContentsSizeChangedPortrait, &sizeChanged);
     ewk_view_scale_set(webView(), 3, 0, 0);
-    ewk_view_html_string_load(webView(), contentsSizeHTML, 0, 0);
+    ewk_view_html_string_load(webView(), contentsSizeHTMLPortrait, 0, 0);
     sizeChanged = false;
     while (!sizeChanged)
         ecore_main_loop_iterate();
-
-    evas_object_smart_callback_del(webView(), "contents,size,changed", onContentsSizeChanged);
+    evas_object_smart_callback_del(webView(), "contents,size,changed", onContentsSizeChangedPortrait);
 }
 
 static bool obtainedPageContents = false;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to