Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (130372 => 130373)
--- trunk/Source/WebKit/efl/ChangeLog 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-10-04 08:50:14 UTC (rev 130373)
@@ -1,3 +1,22 @@
+2012-10-04 Christophe Dumez <[email protected]>
+
+ Regression(r130363): Broke unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=98341
+
+ Reviewed by Gyuyoung Kim.
+
+ Fix WebKitEFL unit tests to use X11 as
+ well.
+
+ * tests/UnitTestUtils/EWKTestBase.cpp:
+ (EWKUnitTests::EWKTestBase::SetUp):
+ * tests/UnitTestUtils/EWKTestEnvironment.h:
+ (EWKTestEnvironment):
+ * tests/UnitTestUtils/EWKTestView.cpp:
+ (EWKUnitTests::EWKTestView::init):
+ * tests/UnitTestUtils/EWKTestView.h:
+ (EWKTestView):
+
2012-10-03 Ryuan Choi <[email protected]>
[EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
Modified: trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.cpp (130372 => 130373)
--- trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -39,7 +39,7 @@
void EWKTestBase::SetUp()
{
- ASSERT_TRUE(m_ewkTestView.init(environment->useX11Window()));
+ ASSERT_TRUE(m_ewkTestView.init());
}
void EWKTestBase::onLoadFinished(void* data, Evas_Object* webView, void* eventInfo)
Modified: trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestEnvironment.h (130372 => 130373)
--- trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestEnvironment.h 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestEnvironment.h 2012-10-04 08:50:14 UTC (rev 130373)
@@ -27,7 +27,6 @@
public:
explicit EWKTestEnvironment(bool useX11Window);
- bool useX11Window() const { return m_useX11Window; }
virtual void SetUp();
virtual void TearDown();
private:
Modified: trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.cpp (130372 => 130373)
--- trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -30,15 +30,11 @@
{
}
-bool EWKTestView::init(int useX11Window, EwkViewType testViewType, int width, int height)
+bool EWKTestView::init(EwkViewType testViewType, int width, int height)
{
m_webView = nullptr;
- if (useX11Window)
- m_ecoreEvas = adoptPtr(ecore_evas_new(0, 0, 0, width, height, 0));
- else
- m_ecoreEvas = adoptPtr(ecore_evas_buffer_new(width, height));
-
+ m_ecoreEvas = adoptPtr(ecore_evas_new(0, 0, 0, width, height, 0));
if (!m_ecoreEvas)
return false;
Modified: trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.h (130372 => 130373)
--- trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.h 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit/efl/tests/UnitTestUtils/EWKTestView.h 2012-10-04 08:50:14 UTC (rev 130373)
@@ -38,7 +38,7 @@
Evas_Object* webView() { return m_webView.get(); }
- bool init(int useX11Window = 0, EwkViewType testViewType = TiledView, int width = Config::defaultViewWidth, int height = Config::defaultViewHeight);
+ bool init(EwkViewType testViewType = TiledView, int width = Config::defaultViewWidth, int height = Config::defaultViewHeight);
private:
EWKTestView(const EWKTestView&);
EWKTestView& operator=(const EWKTestView&);
Modified: trunk/Source/WebKit2/ChangeLog (130372 => 130373)
--- trunk/Source/WebKit2/ChangeLog 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-04 08:50:14 UTC (rev 130373)
@@ -1,3 +1,23 @@
+2012-10-04 Christophe Dumez <[email protected]>
+
+ Regression(r130363): Broke unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=98341
+
+ Reviewed by Gyuyoung Kim.
+
+ Fix WebKit2 EFL to use X11 as well.
+
+ * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
+ (EWK2UnitTest::EWK2UnitTestBase::SetUp):
+ * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp:
+ (EWK2UnitTest::EWK2UnitTestEnvironment::EWK2UnitTestEnvironment):
+ * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.h:
+ (EWK2UnitTestEnvironment):
+ * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestMain.cpp:
+ (main):
+ * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+ (checkFullScreenProperty):
+
2012-10-03 Christophe Dumez <[email protected]>
[EFL] Enable use of X11 in DumpRenderTree / WebKitTestRunner
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp (130372 => 130373)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -50,10 +50,7 @@
unsigned int width = environment->defaultWidth();
unsigned int height = environment->defaultHeight();
- if (environment->useX11Window())
- m_ecoreEvas = ecore_evas_new(0, 0, 0, width, height, 0);
- else
- m_ecoreEvas = ecore_evas_buffer_new(width, height);
+ m_ecoreEvas = ecore_evas_new(0, 0, 0, width, height, 0);
ecore_evas_show(m_ecoreEvas);
Evas* evas = ecore_evas_get(m_ecoreEvas);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp (130372 => 130373)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -26,10 +26,9 @@
namespace EWK2UnitTest {
-EWK2UnitTestEnvironment::EWK2UnitTestEnvironment(bool useX11Window)
+EWK2UnitTestEnvironment::EWK2UnitTestEnvironment()
: m_defaultWidth(800)
, m_defaultHeight(600)
- , m_useX11Window(useX11Window)
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.h (130372 => 130373)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.h 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.h 2012-10-04 08:50:14 UTC (rev 130373)
@@ -27,9 +27,8 @@
class EWK2UnitTestEnvironment : public ::testing::Environment {
public:
- EWK2UnitTestEnvironment(bool useX11Window);
+ EWK2UnitTestEnvironment();
- bool useX11Window() const { return m_useX11Window; }
const char* defaultTestPageUrl() const;
const char* defaultTheme() const;
const char* injectedBundleSample() const;
@@ -42,8 +41,6 @@
private:
unsigned int m_defaultWidth;
unsigned int m_defaultHeight;
-
- bool m_useX11Window;
};
} // namespace EWK2UnitTest
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestMain.cpp (130372 => 130373)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestMain.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestMain.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -26,27 +26,11 @@
EWK2UnitTestEnvironment* environment = 0;
-static bool parseArguments(int argc, char** argv)
-{
- int useX11Window = 0;
-
- static const option options[] = {
- {"useX11Window", no_argument, &useX11Window, 1},
- {0, 0, 0, 0}
- };
-
- while (getopt_long(argc, argv, "", options, 0) != -1) { }
-
- return useX11Window;
-}
-
int main(int argc, char** argv)
{
- bool useX11Window = parseArguments(argc, argv);
-
::testing::InitGoogleTest(&argc, argv);
- environment = new EWK2UnitTestEnvironment(useX11Window);
+ environment = new EWK2UnitTestEnvironment();
testing::AddGlobalTestEnvironment(environment);
return RUN_ALL_TESTS();
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (130372 => 130373)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2012-10-04 08:46:01 UTC (rev 130372)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2012-10-04 08:50:14 UTC (rev 130373)
@@ -312,14 +312,12 @@
static void checkFullScreenProperty(Evas_Object* webView, bool expectedState)
{
- if (environment->useX11Window()) {
- Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(webView));
- Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(smartData->base.evas);
- bool windowState = false;
- while (((windowState = ecore_evas_fullscreen_get(ecoreEvas)) != expectedState))
- ecore_main_loop_iterate();
- ASSERT_TRUE(expectedState == windowState);
- }
+ Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(webView));
+ Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(smartData->base.evas);
+ bool windowState = false;
+ while (((windowState = ecore_evas_fullscreen_get(ecoreEvas)) != expectedState))
+ ecore_main_loop_iterate();
+ ASSERT_TRUE(expectedState == windowState);
}
TEST_F(EWK2UnitTestBase, ewk_view_full_screen_enter)
