[EFL] Rename TEST_THEME_DIR macro
authorgyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Sep 2014 22:54:23 +0000 (22:54 +0000)
committergyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Sep 2014 22:54:23 +0000 (22:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137244

Reviewed by Csaba Osztrogonác.

.:

* Source/cmake/OptionsEfl.cmake: Rename TEST_THEME_DIR to DEFAULT_THEME_DIR.

Source/WebKit2:

TEST_THEME_DIR is to get a path for default theme though, it has used TEST_ prefix.
DEFAULT_THEME_DIR is better than it.

* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp:
(EWK2UnitTest::EWK2UnitTestEnvironment::defaultTheme):
(EWK2UnitTest::EWK2UnitTestEnvironment::pathForTheme):
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):

Tools:

TEST_THEME_DIR is to get a path for default theme though, it has used TEST_ prefix.
DEFAULT_THEME_DIR is better than it.

* MiniBrowser/efl/main.c:
(window_create):
* TestWebKitAPI/efl/PlatformWebView.cpp:
(TestWebKitAPI::PlatformWebView::PlatformWebView):
* WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
(WTR::PlatformWebView::PlatformWebView):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp
Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp
Source/cmake/OptionsEfl.cmake
Tools/ChangeLog
Tools/MiniBrowser/efl/main.c
Tools/TestWebKitAPI/efl/PlatformWebView.cpp
Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

index 6831020..372e6e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-09-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Rename TEST_THEME_DIR macro
+        https://bugs.webkit.org/show_bug.cgi?id=137244
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/cmake/OptionsEfl.cmake: Rename TEST_THEME_DIR to DEFAULT_THEME_DIR.
+
 2014-09-27  Dan Bernstein  <mitz@apple.com>
 
         WebKit top of tree sources won't build in 10.9 w/ Xcode 6.0.1
index be824dc..1c13447 100644 (file)
@@ -1,3 +1,19 @@
+2014-09-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Rename TEST_THEME_DIR macro
+        https://bugs.webkit.org/show_bug.cgi?id=137244
+
+        Reviewed by Csaba Osztrogonác.
+
+        TEST_THEME_DIR is to get a path for default theme though, it has used TEST_ prefix.
+        DEFAULT_THEME_DIR is better than it.
+
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp:
+        (EWK2UnitTest::EWK2UnitTestEnvironment::defaultTheme):
+        (EWK2UnitTest::EWK2UnitTestEnvironment::pathForTheme):
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+
 2014-09-30  Christophe Dumez  <cdumez@apple.com>
 
         Generalize is<>() / downcast<>() support to all types
index 8377481..059f012 100644 (file)
@@ -40,7 +40,7 @@ const char* EWK2UnitTestEnvironment::defaultTestPageUrl() const
 
 const char* EWK2UnitTestEnvironment::defaultTheme() const
 {
-    return TEST_THEME_DIR "/default.edj";
+    return DEFAULT_THEME_DIR "/default.edj";
 }
 
 const char* EWK2UnitTestEnvironment::injectedBundleSample() const
@@ -64,7 +64,7 @@ CString EWK2UnitTestEnvironment::pathForResource(const char* resource)
 CString EWK2UnitTestEnvironment::pathForTheme(const char* theme)
 {
     StringBuilder builder;
-    builder.appendLiteral(TEST_THEME_DIR "/");
+    builder.appendLiteral(DEFAULT_THEME_DIR "/");
     builder.append(theme);
     return builder.toString().utf8();
 }
index 091217a..775e160 100644 (file)
@@ -110,7 +110,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
     m_inspectorView = EWKViewCreate(wkContext, wkPageGroup, ecore_evas_get(m_inspectorWindow), /* smart */ 0);
     WKViewRef wkView = EWKViewGetWKView(m_inspectorView);
 
-    WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(TEST_THEME_DIR "/default.edj"));
+    WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(DEFAULT_THEME_DIR "/default.edj"));
     WKViewSetThemePath(wkView, wkTheme.get());
 
     WKPreferencesRef wkPreferences = WKPageGroupGetPreferences(wkPageGroup);
index e692a44..1dd1503 100644 (file)
@@ -50,7 +50,7 @@ set(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebCore/platform/efl/DefaultTheme)
 file(MAKE_DIRECTORY ${THEME_BINARY_DIR})
 
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
-                -DTEST_THEME_DIR="${THEME_BINARY_DIR}")
+                -DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
 
 WEBKIT_OPTION_BEGIN()
 
index 0225a8e..cc08614 100644 (file)
@@ -1,3 +1,20 @@
+2014-09-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Rename TEST_THEME_DIR macro
+        https://bugs.webkit.org/show_bug.cgi?id=137244
+
+        Reviewed by Csaba Osztrogonác.
+
+        TEST_THEME_DIR is to get a path for default theme though, it has used TEST_ prefix.
+        DEFAULT_THEME_DIR is better than it.
+
+        * MiniBrowser/efl/main.c:
+        (window_create):
+        * TestWebKitAPI/efl/PlatformWebView.cpp:
+        (TestWebKitAPI::PlatformWebView::PlatformWebView):
+        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+        (WTR::PlatformWebView::PlatformWebView):
+
 2014-09-30  Alexey Proskuryakov  <ap@apple.com>
 
         Windows EWS went purple when it failed to build
index e55acdb..e6a6003 100644 (file)
@@ -2158,7 +2158,7 @@ static Browser_Window *window_create(Evas_Object *opener, int width, int height)
 
     ewk_favicon_database_icon_change_callback_add(ewk_context_favicon_database_get(context), on_icon_changed_cb, window);
 
-    ewk_view_theme_set(window->ewk_view, TEST_THEME_DIR "/default.edj");
+    ewk_view_theme_set(window->ewk_view, DEFAULT_THEME_DIR "/default.edj");
     if (device_pixel_ratio)
         ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
     ewk_view_user_agent_set(window->ewk_view, user_agent_string);
index 54daad8..2de7efa 100644 (file)
@@ -70,7 +70,7 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGro
 
     m_view = EWKViewCreate(contextRef, pageGroupRef, ecore_evas_get(m_window), /* smart */ 0);
 
-    WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(TEST_THEME_DIR "/default.edj"));
+    WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(DEFAULT_THEME_DIR "/default.edj"));
     WKViewSetThemePath(EWKViewGetWKView(m_view), wkTheme.get());
 
     evas_object_smart_callback_add(m_view, "webprocess,crashed", onWebProcessCrashed, 0);
index 718f090..c8c4f3e 100644 (file)
@@ -69,7 +69,7 @@ PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup,
     if (m_usingFixedLayout)
         resizeTo(800, 600);
 
-    ewk_view_theme_set(m_view, TEST_THEME_DIR "/default.edj");
+    ewk_view_theme_set(m_view, DEFAULT_THEME_DIR "/default.edj");
     m_windowIsKey = false;
     evas_object_show(m_view);
 }