Changeset 148025 in webkit


Ignore:
Timestamp:
Apr 9, 2013 7:50:09 AM (11 years ago)
Author:
rakuco@webkit.org
Message:

[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.

Source/WebKit2:

  • PlatformEfl.cmake: Remove definition of `TEST_THEME_DIR', which is

now defined in OptionsEfl.cmake.

Tools:

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):

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r148018 r148025  
     12013-04-09  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
     2
     3        [EFL] Declare TEST_THEME_DIR in a single place.
     4        https://bugs.webkit.org/show_bug.cgi?id=114285
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Instead of adding the `THEME_DIR' preprocessor variable in many
     9        different CMakeList.txt files in the tree, declare it in
     10        OptionsEfl.cmake so that we avoid needlessly duplicating code around.
     11
     12        While here, rename it to `TEST_THEME_DIR', which is the name used our
     13        WebKit2 infrastructure, to better reflect the purpose of this value.
     14
     15        * Source/cmake/OptionsEfl.cmake: Add the TEST_THEME_DIR preprocessor
     16        definition.
     17
    1182013-04-09  ChangSeok Oh  <changseok.oh@collabora.com>
    219

  • trunk/Source/WebKit2/ChangeLog

    r148022 r148025  
     12013-04-09  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
     2
     3        [EFL] Declare TEST_THEME_DIR in a single place.
     4        https://bugs.webkit.org/show_bug.cgi?id=114285
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * PlatformEfl.cmake: Remove definition of `TEST_THEME_DIR', which is
     9        now defined in OptionsEfl.cmake.
     10
    1112013-04-09  Rafael Brandao  <rafael.lobo@openbossa.org>
    212

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r147998 r148025  
    384384add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
    385385    -DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
    386     -DTEST_THEME_DIR=\"${THEME_BINARY_DIR}\"
    387386    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
    388387    -DLIBEXECDIR=\"${CMAKE_INSTALL_PREFIX}/${EXEC_INSTALL_DIR}\"

  • trunk/Source/cmake/OptionsEfl.cmake

    r147998 r148025  
    4848file(MAKE_DIRECTORY ${THEME_BINARY_DIR})
    4949
    50 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
     50add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
     51                -DTEST_THEME_DIR="${THEME_BINARY_DIR}")
    5152
    5253set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")

  • trunk/Tools/ChangeLog

    r148018 r148025  
     12013-04-09  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
     2
     3        [EFL] Declare TEST_THEME_DIR in a single place.
     4        https://bugs.webkit.org/show_bug.cgi?id=114285
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Adapt to the renaming of `THEME_DIR' to `TEST_THEME_DIR'.
     9
     10        * DumpRenderTree/efl/CMakeLists.txt:
     11        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
     12        (DumpRenderTreeChrome::createView):
     13        (DumpRenderTreeChrome::createInspectorView):
     14        (DumpRenderTreeChrome::initialize):
     15        (DumpRenderTreeChrome::onDownloadRequest):
     16        * EWebLauncher/CMakeLists.txt:
     17        * EWebLauncher/main.c:
     18        (findThemePath):
     19        * EWebLauncher/url_bar.c:
     20        (url_bar_add):
     21        * MiniBrowser/efl/CMakeLists.txt:
     22        * MiniBrowser/efl/main.c:
     23        (window_create):
     24        * TestWebKitAPI/PlatformEfl.cmake:
     25        * TestWebKitAPI/efl/PlatformWebView.cpp:
     26        (TestWebKitAPI::PlatformWebView::PlatformWebView):
     27        * WebKitTestRunner/PlatformEfl.cmake:
     28        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
     29        (WTR::PlatformWebView::PlatformWebView):
     30
    1312013-04-09  ChangSeok Oh  <changseok.oh@collabora.com>
    232

  • trunk/Tools/DumpRenderTree/efl/CMakeLists.txt

    r145014 r148025  
    134134# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
    135135add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
    136                 -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
    137                 -DDATA_DIR="${THEME_BINARY_DIR}")
     136                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
    138137
    139138include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})

  • trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

    r147867 r148025  
    103103        return 0;
    104104
    105     ewk_view_theme_set(view, DATA_DIR"/default.edj");
     105    ewk_view_theme_set(view, TEST_THEME_DIR "/default.edj");
    106106
    107107    evas_object_smart_callback_add(view, "download,request", onDownloadRequest, 0);
    … …  
    154154    evas_object_data_set(inspectorView, "ignore-console-messages", &ignoreMessages);
    155155
    156     ewk_view_theme_set(inspectorView, DATA_DIR"/default.edj");
     156    ewk_view_theme_set(inspectorView, TEST_THEME_DIR "/default.edj");
    157157
    158158    Evas_Object* mainFrame = ewk_view_frame_main_get(inspectorView);
    … …  
    209209        return false;
    210210
    211     ewk_view_theme_set(m_mainView, DATA_DIR"/default.edj");
     211    ewk_view_theme_set(m_mainView, TEST_THEME_DIR "/default.edj");
    212212
    213213    evas_object_name_set(m_mainView, "m_mainView");
    … …  
    860860
    861861    Ewk_Download* download = static_cast<Ewk_Download*>(eventInfo);
    862     ewk_view_theme_set(newView, DATA_DIR"/default.edj");
     862    ewk_view_theme_set(newView, TEST_THEME_DIR "/default.edj");
    863863    ewk_view_uri_set(newView, download->url);
    864864 

  • trunk/Tools/EWebLauncher/CMakeLists.txt

    r138326 r148025  
    4040)
    4141
    42 add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
    43 
    4442include_directories(${EWebLauncher_INCLUDE_DIRECTORIES})
    4543add_executable(EWebLauncher ${EWebLauncher_SOURCES})

  • trunk/Tools/EWebLauncher/main.c

    r134743 r148025  
    912912findThemePath(const char *theme)
    913913{
    914     const char *default_theme = THEME_DIR"/default.edj";
     914    const char *default_theme = TEST_THEME_DIR "/default.edj";
    915915    char *rpath;
    916916    struct stat st;

  • trunk/Tools/EWebLauncher/url_bar.c

    r130887 r148025  
    104104
    105105    url_bar->entry = edje_object_add(evas);
    106     Eina_Bool ret = edje_object_file_set(url_bar->entry, THEME_DIR"/entry.edj", "control/entry/base/default");
     106    Eina_Bool ret = edje_object_file_set(url_bar->entry, TEST_THEME_DIR "/entry.edj", "control/entry/base/default");
    107107    if (!ret) {
    108108        evas_object_del(url_bar->area);

  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r144842 r148025  
    5555)
    5656
    57 add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
    58 
    5957if (ELEMENTARY_FOUND)
    6058    include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})

  • trunk/Tools/MiniBrowser/efl/main.c

    r147410 r148025  
    14321432        window->ewk_view = ewk_view_smart_add(evas, smart, context, pageGroup);
    14331433    }
    1434     ewk_view_theme_set(window->ewk_view, THEME_DIR "/default.edj");
     1434    ewk_view_theme_set(window->ewk_view, TEST_THEME_DIR "/default.edj");
    14351435    if (device_pixel_ratio)
    14361436        ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r147998 r148025  
    109109)
    110110
    111 add_definitions(-DTHEME_DIR="${THEME_BINARY_DIR}")
    112 
    113111# Tests disabled because of missing features on the test harness:
    114112#

  • trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp

    r146265 r148025  
    7070    m_view = EWKViewCreate(contextRef, pageGroupRef, ecore_evas_get(m_window), /* smart */ 0);
    7171
    72     WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(THEME_DIR "/default.edj"));
     72    WKRetainPtr<WKStringRef> wkTheme = adoptWK(WKStringCreateWithUTF8CString(TEST_THEME_DIR "/default.edj"));
    7373    WKViewSetThemePath(EWKViewGetWKView(m_view), wkTheme.get());
    7474

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r144842 r148025  
    6666# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
    6767add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
    68                 -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
    69                 -DTHEME_DIR="${THEME_BINARY_DIR}")
     68                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
    7069
    7170if (ENABLE_ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

    r146265 r148025  
    6969        resizeTo(800, 600);
    7070
    71     ewk_view_theme_set(m_view, THEME_DIR"/default.edj");
     71    ewk_view_theme_set(m_view, TEST_THEME_DIR "/default.edj");
    7272    m_windowIsKey = false;
    7373    evas_object_show(m_view);
Note: See TracChangeset for help on using the changeset viewer.