Attachment 239026 Details for Bug 132983 – Patch

[patch] Patch

bug-132983-20141001233936.patch (text/plain), 5.91 KB, created by Ryuan Choi on 2014-10-01 07:39:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryuan Choi

Created: 2014-10-01 07:39:40 PDT

Size: 5.91 KB

patch

obsolete

>Subversion Revision: 174135
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 1c134475ea573e0630ce88a4c8553f113c23ed4a..2f7d2cf0dfac10ffb45124bf9605b75890219fa3 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,23 @@
>+2014-10-01  Ryuan Choi  <ryuan.choi@gmail.com>
>+
>+        [EFL][WK2] test_ewk2_view is failed
>+        https://bugs.webkit.org/show_bug.cgi?id=132983
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enables test_ewk2_view because test cases of test_ewk2_view are passed except few tests which
>+        are related device_pixel_ratio.
>+        This patch adds macro guard for ailed test case to CAIRO_SURFACE_SET_DEVICE_SCALE macro.
>+        In addition, fixed some warnings while building with test_ewk2_view.
>+
>+        * PlatformEfl.cmake: Enables test_ewk2_view.
>+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp: Added const keyword for argument to fix the warnings.
>+        (EWK2UnitTest::EWK2UnitTestBase::keyDown):
>+        (EWK2UnitTest::EWK2UnitTestBase::keyUp):
>+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:
>+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
>+        (TEST_F):
>+
> 2014-09-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
> 
>         [EFL] Rename TEST_THEME_DIR macro
>diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
>index f07fb639115eb14269cdc1672c0794c1bcd0b353..1982610879880f6ca20de6baadfa7b333547a0a9 100644
>--- a/Source/WebKit2/PlatformEfl.cmake
>+++ b/Source/WebKit2/PlatformEfl.cmake
>@@ -488,6 +488,7 @@ set(EWK2UnitTests_BINARIES
>     test_ewk2_settings
>     test_ewk2_ssl
>     test_ewk2_storage_manager
>+    test_ewk2_view
>     test_ewk2_window_features
> )
> 
>@@ -497,7 +498,6 @@ set(EWK2UnitTests_BINARIES
> # webkit.org/b/132980: test_ewk2_context_menu
> # webkit.org/b/132981: test_ewk2_download_job
> # webkit.org/b/132982: test_ewk2_text_checker
>-# webkit.org/b/132983: test_ewk2_view
> 
> if (ENABLE_API_TESTS)
>     foreach (testName ${EWK2UnitTests_BINARIES})
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
>index 3d0cd8a029a8a5ff39ec756a63a7cee1f6ab8336..15f36a011a8fd68e771312ed59de4dd4f529a463 100644
>--- a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
>@@ -323,7 +323,7 @@ void EWK2UnitTestBase::multiMove(int id, int x, int y)
>     evas_event_feed_multi_move(evas_object_evas_get(m_webView), id, x, y, 0, 0, 0, 0, 0, 0, 0, 0, 0);
> }
> 
>-void EWK2UnitTestBase::keyDown(char* keyname, char* key, char* string, char* modifier)
>+void EWK2UnitTestBase::keyDown(const char* keyname, const char* key, const char* string, const char* modifier)
> {
>     Evas* evas = evas_object_evas_get(m_webView);
>     ASSERT(evas);
>@@ -338,7 +338,7 @@ void EWK2UnitTestBase::keyDown(char* keyname, char* key, char* string, char* mod
>     evas_event_feed_key_down(evas, keyname, key, string, 0, 0, 0);
> }
> 
>-void EWK2UnitTestBase::keyUp(char* keyname, char* key, char* string)
>+void EWK2UnitTestBase::keyUp(const char* keyname, const char* key, const char* string)
> {
>     evas_event_feed_key_up(evas_object_evas_get(m_webView), keyname, key, string, 0, 0, 0);
> }
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h
>index c28cb87ee52b0bf2c0bb390780ac7316eb782295..fb5c9f5cf163f89c9025c7fc4ac493bb976d5a51 100644
>--- a/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h
>@@ -63,8 +63,8 @@ protected:
>     void multiDown(int id, int x, int y);
>     void multiUp(int id, int x, int y);
>     void multiMove(int id, int x, int y);
>-    void keyDown(char* keyname, char* key, char* string, char* modifier);
>-    void keyUp(char* keyname, char* key, char* string);
>+    void keyDown(const char* keyname, const char* key, const char* string, const char* modifier);
>+    void keyUp(const char* keyname, const char* key, const char* string);
> 
> private:
>     Evas_Object* m_webView;
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>index be34b233b763b9d8d6ead4c8289c869726a6c205..302d8ebe0fc2826d1fabf8af24c1deb37621f481 100644
>--- a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>@@ -21,6 +21,7 @@
> 
> #include "UnitTestUtils/EWK2UnitTestBase.h"
> #include "UnitTestUtils/EWK2UnitTestServer.h"
>+#include <WebCore/CairoUtilities.h>
> #include <wtf/text/CString.h>
> #include <wtf/text/WTFString.h>
> 
>@@ -278,6 +279,7 @@ TEST_F(EWK2ViewTest, ewk_view_url_get)
>     EXPECT_STREQ(environment->defaultTestPageUrl(), ewk_view_url_get(webView()));
> }
> 
>+#if HAVE(CAIRO_SURFACE_SET_DEVICE_SCALE)
> TEST_F(EWK2ViewTest, ewk_view_device_pixel_ratio)
> {
>     ASSERT_TRUE(loadUrlSync(environment->defaultTestPageUrl()));
>@@ -291,6 +293,7 @@ TEST_F(EWK2ViewTest, ewk_view_device_pixel_ratio)
>     ASSERT_TRUE(ewk_view_device_pixel_ratio_set(webView(), 1));
>     ASSERT_FLOAT_EQ(1, ewk_view_device_pixel_ratio_get(webView()));
> }
>+#endif
> 
> TEST_F(EWK2ViewTest, ewk_view_html_string_load)
> {
>@@ -1207,12 +1210,14 @@ TEST_F(EWK2ViewTest, ewk_view_contents_size_get)
>     EXPECT_EQ(environment->defaultWidth(), contentsWidth);
>     EXPECT_EQ(environment->defaultHeight(), contentsHeight);
> 
>+#if HAVE(CAIRO_SURFACE_SET_DEVICE_SCALE)
>     ewk_view_device_pixel_ratio_set(webView(), 2);
>     ASSERT_TRUE(loadUrlSync(environment->defaultTestPageUrl()));
>     ewk_view_contents_size_get(webView(), &contentsWidth, &contentsHeight);
> 
>     EXPECT_EQ(environment->defaultWidth() / 2, contentsWidth);
>     EXPECT_EQ(environment->defaultHeight() / 2, contentsHeight);
>+#endif
> 
>     const char fixedContentsSize[] =
>         "<!DOCTYPE html>"

Flags:

gyuyoung.kim: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 132983: 231565 | 239026