Changeset 121893 in webkit


Ignore:
Timestamp:
Jul 5, 2012 1:47:49 AM (12 years ago)
Author:
ryuan.choi@samsung.com
Message:

[Wk2][EFL] EFL needs a WebKitTestRunner
​https://bugs.webkit.org/show_bug.cgi?id=87659

Reviewed by Kenneth Rohde Christiansen.

.:

  • Source/CMakeLists.txt:

Set compiler flags for WebCoreTestSupport to be linked into TestRunnerInjectedBundle
shared library.

  • Source/cmake/WebKitMacros.cmake: Remove unnecessary dependency.

Source/WebKit2:

  • PlatformEfl.cmake: Added WKImageCairo.cpp in source list.

Tools:

Add an implementation of WebKitTestRunner for Efl port.

  • CMakeLists.txt: Includes WebKitTestRunner build script.
  • Scripts/build-webkittestrunner: Added knowledge of WebKitTestRunner/Efl.
  • Scripts/webkitpy/layout_tests/port/efl.py: Ditto.

(EflPort.setup_environ_for_server):

  • WebKitTestRunner/CMakeLists.txt: Added.
  • WebKitTestRunner/InjectedBundle/LayoutTestController.h:
  • WebKitTestRunner/InjectedBundle/efl/ActivateFontsEfl.cpp: Added.
  • WebKitTestRunner/InjectedBundle/efl/InjectedBundleEfl.cpp: Added.
  • WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: Added.
  • WebKitTestRunner/PlatformEfl.cmake: Added.
  • WebKitTestRunner/PlatformWebView.h:
  • WebKitTestRunner/TestController.cpp:
  • WebKitTestRunner/config.h: Added knowledge of WebKitTestRunner/Efl.
  • WebKitTestRunner/efl/PlatformWebViewEfl.cpp: Added.
  • WebKitTestRunner/efl/TestControllerEfl.cpp: Added.
  • WebKitTestRunner/efl/main.cpp: Added.

(main):

Location:
trunk
Files:
10 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r121861 r121893  
     12012-07-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [Wk2][EFL] EFL needs a WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=87659
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        * Source/CMakeLists.txt:
     9        Set compiler flags for WebCoreTestSupport to be linked into TestRunnerInjectedBundle
     10        shared library.
     11        * Source/cmake/WebKitMacros.cmake: Remove unnecessary dependency.
     12
    1132012-07-04  John Mellor  <johnme@chromium.org>
    214

  • trunk/Source/CMakeLists.txt

    r111799 r121893  
    2323WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
    2424WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME})
     25WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCoreTestSupport_LIBRARY_NAME})
    2526
    2627IF (ENABLE_WEBCORE)

  • trunk/Source/WebKit2/ChangeLog

    r121892 r121893  
     12012-07-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [Wk2][EFL] EFL needs a WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=87659
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        * PlatformEfl.cmake: Added WKImageCairo.cpp in source list.
     9
    1102012-07-05  Hyerim Bae  <hyerim.bae@samsung.com>
    211

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r121889 r121893  
    1414    Platform/CoreIPC/unix/ConnectionUnix.cpp
    1515    Platform/CoreIPC/unix/AttachmentUnix.cpp
     16
     17    Shared/API/c/cairo/WKImageCairo.cpp
    1618
    1719    Shared/API/c/gtk/WKGraphicsContextGtk.cpp

  • trunk/Source/cmake/WebKitMacros.cmake

    r121857 r121893  
    4949            OUTPUT ${_destination}/${_prefix}${_name}.cpp ${_destination}/${_prefix}${_name}.h
    5050            MAIN_DEPENDDENCY ${_file}
    51             DEPENDS ${BINDING_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${_generator}.pm ${_supplemental_dependency_file}
     51            DEPENDS ${BINDING_GENERATOR} ${SCRIPTS_BINDINGS} ${_supplemental_dependency_file}
    5252            COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${_supplemental_dependency} ${_file}
    5353            WORKING_DIRECTORY ${_base_dir}

  • trunk/Tools/CMakeLists.txt

    r120130 r121893  
     1IF (ENABLE_WEBKIT2)
     2    ADD_SUBDIRECTORY(WebKitTestRunner)
     3ENDIF ()
     4
    15IF ("${PORT}" STREQUAL "Efl")
    26    IF (ENABLE_WEBKIT)

  • trunk/Tools/ChangeLog

    r121890 r121893  
     12012-07-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [Wk2][EFL] EFL needs a WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=87659
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add an implementation of WebKitTestRunner for Efl port.
     9
     10        * CMakeLists.txt: Includes WebKitTestRunner build script.
     11        * Scripts/build-webkittestrunner: Added knowledge of WebKitTestRunner/Efl.
     12        * Scripts/webkitpy/layout_tests/port/efl.py: Ditto.
     13        (EflPort.setup_environ_for_server):
     14        * WebKitTestRunner/CMakeLists.txt: Added.
     15        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
     16        * WebKitTestRunner/InjectedBundle/efl/ActivateFontsEfl.cpp: Added.
     17        * WebKitTestRunner/InjectedBundle/efl/InjectedBundleEfl.cpp: Added.
     18        * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: Added.
     19        * WebKitTestRunner/PlatformEfl.cmake: Added.
     20        * WebKitTestRunner/PlatformWebView.h:
     21        * WebKitTestRunner/TestController.cpp:
     22        * WebKitTestRunner/config.h: Added knowledge of WebKitTestRunner/Efl.
     23        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp: Added.
     24        * WebKitTestRunner/efl/TestControllerEfl.cpp: Added.
     25        * WebKitTestRunner/efl/main.cpp: Added.
     26        (main):
     27
    1282012-07-05  Christophe Dumez  <christophe.dumez@intel.com>
    229

  • trunk/Tools/Scripts/build-webkittestrunner

    r87760 r121893  
    6464} elsif (isAppleWinWebKit()) {
    6565    $result = buildVisualStudioProject("WebKitTestRunner.sln", $clean);
    66 } elsif (isQt() || isGtk()) {
     66} elsif (isQt() || isGtk() || isEfl()) {
    6767    # Qt and GTK+ build everything in one shot. No need to build anything here.
    6868    $result = 0;

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py

    r118311 r121893  
    5353        self._unload_pulseaudio_module()
    5454
     55    def setup_environ_for_server(self, server_name=None):
     56        env = super(EflPort, self).setup_environ_for_server(server_name)
     57        env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
     58        env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib')
     59        return env
     60
    5561    def clean_up_test_run(self):
    5662        self._restore_pulseaudio_module()

  • trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

    r121308 r121893  
    4444#elif PLATFORM(GTK)
    4545typedef unsigned int PlatformTimerRef;
     46#elif PLATFORM(EFL)
     47typedef struct _Ecore_Timer Ecore_Timer;
     48typedef Ecore_Timer* PlatformTimerRef;
    4649#endif
    4750

  • trunk/Tools/WebKitTestRunner/PlatformWebView.h

    r103228 r121893  
    5252typedef WKViewRef PlatformWKView;
    5353typedef GtkWidget* PlatformWindow;
     54#elif PLATFORM(EFL)
     55typedef struct _Evas_Object Evas_Object;
     56typedef struct _Ecore_Evas Ecore_Evas;
     57typedef Evas_Object* PlatformWKView;
     58typedef Ecore_Evas* PlatformWindow;
    5459#endif
    5560

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r120301 r121893  
    4343#endif
    4444
    45 #if PLATFORM(MAC) || PLATFORM(QT) || PLATFORM(GTK)
     45#if PLATFORM(MAC) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
    4646#include "EventSenderProxy.h"
    4747#endif

  • trunk/Tools/WebKitTestRunner/config.h

    r102849 r121893  
    2626#define WebKitTestRunner_config_h
    2727
     28#if defined (BUILDING_WITH_CMAKE)
     29#include "cmakeconfig.h"
     30#endif
     31
    2832#include <wtf/Platform.h>
    2933#include <wtf/ExportMacros.h>
    … …  
    3135#include <runtime/JSExportMacros.h>
    3236#endif
     37
     38#include <WebKit2/WebKit2.h>
    3339
    3440#if PLATFORM(WIN)
Note: See TracChangeset for help on using the changeset viewer.