Diff
Modified: trunk/ChangeLog (148024 => 148025)
--- trunk/ChangeLog 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/ChangeLog 2013-04-09 14:50:09 UTC (rev 148025)
@@ -1,3 +1,20 @@
+2013-04-09 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Declare TEST_THEME_DIR in a single place.
+ https://bugs.webkit.org/show_bug.cgi?id=114285
+
+ Reviewed by Anders Carlsson.
+
+ Instead of adding the `THEME_DIR' preprocessor variable in many
+ different CMakeList.txt files in the tree, declare it in
+ OptionsEfl.cmake so that we avoid needlessly duplicating code around.
+
+ While here, rename it to `TEST_THEME_DIR', which is the name used our
+ WebKit2 infrastructure, to better reflect the purpose of this value.
+
+ * Source/cmake/OptionsEfl.cmake: Add the TEST_THEME_DIR preprocessor
+ definition.
+
2013-04-09 ChangSeok Oh <[email protected]>
[GTK][AC] upversion of clutter and its dependecy
Modified: trunk/Source/WebKit2/ChangeLog (148024 => 148025)
--- trunk/Source/WebKit2/ChangeLog 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-09 14:50:09 UTC (rev 148025)
@@ -1,3 +1,13 @@
+2013-04-09 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Declare TEST_THEME_DIR in a single place.
+ https://bugs.webkit.org/show_bug.cgi?id=114285
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformEfl.cmake: Remove definition of `TEST_THEME_DIR', which is
+ now defined in OptionsEfl.cmake.
+
2013-04-09 Rafael Brandao <[email protected]>
[CoordinatedGraphics] serviceScriptedAnimations expects time in seconds
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (148024 => 148025)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2013-04-09 14:50:09 UTC (rev 148025)
@@ -383,7 +383,6 @@
add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
-DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
- -DTEST_THEME_DIR=\"${THEME_BINARY_DIR}\"
-DGTEST_LINKED_AS_SHARED_LIBRARY=1
-DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\"
-DWEBPROCESSNAME=\"${WebProcess_EXECUTABLE_NAME}\"
Modified: trunk/Source/cmake/OptionsEfl.cmake (148024 => 148025)
--- trunk/Source/cmake/OptionsEfl.cmake 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-04-09 14:50:09 UTC (rev 148025)
@@ -47,7 +47,8 @@
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}")
+add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
+ -DTEST_THEME_DIR="${THEME_BINARY_DIR}")
set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
Modified: trunk/Tools/ChangeLog (148024 => 148025)
--- trunk/Tools/ChangeLog 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/ChangeLog 2013-04-09 14:50:09 UTC (rev 148025)
@@ -1,3 +1,33 @@
+2013-04-09 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Declare TEST_THEME_DIR in a single place.
+ https://bugs.webkit.org/show_bug.cgi?id=114285
+
+ Reviewed by Anders Carlsson.
+
+ Adapt to the renaming of `THEME_DIR' to `TEST_THEME_DIR'.
+
+ * DumpRenderTree/efl/CMakeLists.txt:
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::createView):
+ (DumpRenderTreeChrome::createInspectorView):
+ (DumpRenderTreeChrome::initialize):
+ (DumpRenderTreeChrome::onDownloadRequest):
+ * EWebLauncher/CMakeLists.txt:
+ * EWebLauncher/main.c:
+ (findThemePath):
+ * EWebLauncher/url_bar.c:
+ (url_bar_add):
+ * MiniBrowser/efl/CMakeLists.txt:
+ * MiniBrowser/efl/main.c:
+ (window_create):
+ * TestWebKitAPI/PlatformEfl.cmake:
+ * TestWebKitAPI/efl/PlatformWebView.cpp:
+ (TestWebKitAPI::PlatformWebView::PlatformWebView):
+ * WebKitTestRunner/PlatformEfl.cmake:
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+
2013-04-09 ChangSeok Oh <[email protected]>
[GTK][AC] upversion of clutter and its dependecy
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (148024 => 148025)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-04-09 14:50:09 UTC (rev 148025)
@@ -133,8 +133,7 @@
# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
- -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
- -DDATA_DIR="${THEME_BINARY_DIR}")
+ -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (148024 => 148025)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2013-04-09 14:50:09 UTC (rev 148025)
@@ -102,7 +102,7 @@
if (!view)
return 0;
- ewk_view_theme_set(view, DATA_DIR"/default.edj");
+ ewk_view_theme_set(view, TEST_THEME_DIR "/default.edj");
evas_object_smart_callback_add(view, "download,request", onDownloadRequest, 0);
evas_object_smart_callback_add(view, "load,resource,failed", onResourceLoadFailed, 0);
@@ -153,7 +153,7 @@
const bool ignoreMessages = true;
evas_object_data_set(inspectorView, "ignore-console-messages", &ignoreMessages);
- ewk_view_theme_set(inspectorView, DATA_DIR"/default.edj");
+ ewk_view_theme_set(inspectorView, TEST_THEME_DIR "/default.edj");
Evas_Object* mainFrame = ewk_view_frame_main_get(inspectorView);
evas_object_smart_callback_add(mainFrame, "load,finished", onInspectorFrameLoadFinished, 0);
@@ -208,7 +208,7 @@
if (!m_mainView)
return false;
- ewk_view_theme_set(m_mainView, DATA_DIR"/default.edj");
+ ewk_view_theme_set(m_mainView, TEST_THEME_DIR "/default.edj");
evas_object_name_set(m_mainView, "m_mainView");
evas_object_move(m_mainView, 0, 0);
@@ -859,7 +859,7 @@
return;
Ewk_Download* download = static_cast<Ewk_Download*>(eventInfo);
- ewk_view_theme_set(newView, DATA_DIR"/default.edj");
+ ewk_view_theme_set(newView, TEST_THEME_DIR "/default.edj");
ewk_view_uri_set(newView, download->url);
browser->m_extraViews.append(newView);
Modified: trunk/Tools/EWebLauncher/CMakeLists.txt (148024 => 148025)
--- trunk/Tools/EWebLauncher/CMakeLists.txt 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/EWebLauncher/CMakeLists.txt 2013-04-09 14:50:09 UTC (rev 148025)
@@ -39,8 +39,6 @@
${LIBSOUP_INCLUDE_DIRS}
)
-add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
-
include_directories(${EWebLauncher_INCLUDE_DIRECTORIES})
add_executable(EWebLauncher ${EWebLauncher_SOURCES})
target_link_libraries(EWebLauncher ${EWebLauncher_LIBRARIES})
Modified: trunk/Tools/EWebLauncher/main.c (148024 => 148025)
--- trunk/Tools/EWebLauncher/main.c 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/EWebLauncher/main.c 2013-04-09 14:50:09 UTC (rev 148025)
@@ -911,7 +911,7 @@
static char *
findThemePath(const char *theme)
{
- const char *default_theme = THEME_DIR"/default.edj";
+ const char *default_theme = TEST_THEME_DIR "/default.edj";
char *rpath;
struct stat st;
Modified: trunk/Tools/EWebLauncher/url_bar.c (148024 => 148025)
--- trunk/Tools/EWebLauncher/url_bar.c 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/EWebLauncher/url_bar.c 2013-04-09 14:50:09 UTC (rev 148025)
@@ -103,7 +103,7 @@
evas_object_color_set(url_bar->area, 255, 255, 255, 255);
url_bar->entry = edje_object_add(evas);
- Eina_Bool ret = edje_object_file_set(url_bar->entry, THEME_DIR"/entry.edj", "control/entry/base/default");
+ Eina_Bool ret = edje_object_file_set(url_bar->entry, TEST_THEME_DIR "/entry.edj", "control/entry/base/default");
if (!ret) {
evas_object_del(url_bar->area);
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (148024 => 148025)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2013-04-09 14:50:09 UTC (rev 148025)
@@ -54,8 +54,6 @@
${SQLITE_LIBRARIES}
)
-add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
-
if (ELEMENTARY_FOUND)
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
Modified: trunk/Tools/MiniBrowser/efl/main.c (148024 => 148025)
--- trunk/Tools/MiniBrowser/efl/main.c 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/MiniBrowser/efl/main.c 2013-04-09 14:50:09 UTC (rev 148025)
@@ -1431,7 +1431,7 @@
Ewk_Page_Group *pageGroup = opener ? ewk_view_page_group_get(opener) : ewk_page_group_create("");
window->ewk_view = ewk_view_smart_add(evas, smart, context, pageGroup);
}
- ewk_view_theme_set(window->ewk_view, THEME_DIR "/default.edj");
+ ewk_view_theme_set(window->ewk_view, TEST_THEME_DIR "/default.edj");
if (device_pixel_ratio)
ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
ewk_view_source_mode_set(window->ewk_view, view_mode);
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (148024 => 148025)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2013-04-09 14:50:09 UTC (rev 148025)
@@ -108,8 +108,6 @@
WKPageGetScaleFactorNotZero
)
-add_definitions(-DTHEME_DIR="${THEME_BINARY_DIR}")
-
# Tests disabled because of missing features on the test harness:
#
# ResponsivenessTimerDoesntFireEarly
Modified: trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp (148024 => 148025)
--- trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2013-04-09 14:50:09 UTC (rev 148025)
@@ -69,7 +69,7 @@
m_view = EWKViewCreate(contextRef, pageGroupRef, ecore_evas_get(m_window), /* smart */ 0);
- WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(THEME_DIR "/default.edj"));
+ WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(TEST_THEME_DIR "/default.edj"));
WKViewSetThemePath(EWKViewGetWKView(m_view), wkTheme.get());
evas_object_smart_callback_add(m_view, "webprocess,crashed", onWebProcessCrashed, 0);
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (148024 => 148025)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-04-09 14:50:09 UTC (rev 148025)
@@ -65,8 +65,7 @@
# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
- -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
- -DTHEME_DIR="${THEME_BINARY_DIR}")
+ -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
if (ENABLE_ACCESSIBILITY)
list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (148024 => 148025)
--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2013-04-09 14:48:17 UTC (rev 148024)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2013-04-09 14:50:09 UTC (rev 148025)
@@ -68,7 +68,7 @@
if (m_usingFixedLayout)
resizeTo(800, 600);
- ewk_view_theme_set(m_view, THEME_DIR"/default.edj");
+ ewk_view_theme_set(m_view, TEST_THEME_DIR "/default.edj");
m_windowIsKey = false;
evas_object_show(m_view);
}
