-LIST(APPEND WebKit2_LINK_FLAGS
- ${CAIRO_LDFLAGS}
- ${ECORE_X_LDFLAGS}
- ${EDJE_LDFLAGS}
- ${EFLDEPS_LDFLAGS}
- ${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
-)
-
LIST(APPEND WebKit2StaticForDebug_SOURCES
Platform/efl/LoggingEfl.cpp
Platform/efl/ModuleEfl.cpp
Shared/soup/WebCoreArgumentCodersSoup.cpp
UIProcess/API/C/efl/WKView.cpp
+
+ UIProcess/API/cpp/efl/WKEinaSharedString.cpp
UIProcess/API/C/soup/WKContextSoup.cpp
UIProcess/API/C/soup/WKSoupRequestManager.cpp
UIProcess/API/efl/NetworkInfoProvider.cpp
UIProcess/API/efl/PageClientImpl.cpp
UIProcess/API/efl/VibrationProvider.cpp
+ UIProcess/API/efl/ewk_back_forward_list.cpp
+ UIProcess/API/efl/ewk_back_forward_list_item.cpp
UIProcess/API/efl/ewk_context.cpp
- UIProcess/API/efl/ewk_context_download_client.cpp
- UIProcess/API/efl/ewk_context_request_manager_client.cpp
UIProcess/API/efl/ewk_cookie_manager.cpp
UIProcess/API/efl/ewk_download_job.cpp
+ UIProcess/API/efl/ewk_error.cpp
+ UIProcess/API/efl/ewk_favicon_database.cpp
UIProcess/API/efl/ewk_form_submission_request.cpp
UIProcess/API/efl/ewk_intent.cpp
UIProcess/API/efl/ewk_intent_service.cpp
UIProcess/API/efl/ewk_main.cpp
+ UIProcess/API/efl/ewk_navigation_data.cpp
UIProcess/API/efl/ewk_navigation_policy_decision.cpp
UIProcess/API/efl/ewk_popup_menu_item.cpp
+ UIProcess/API/efl/ewk_resource.cpp
UIProcess/API/efl/ewk_settings.cpp
UIProcess/API/efl/ewk_text_checker.cpp
UIProcess/API/efl/ewk_url_request.cpp
UIProcess/API/efl/ewk_url_response.cpp
UIProcess/API/efl/ewk_url_scheme_request.cpp
UIProcess/API/efl/ewk_view.cpp
- UIProcess/API/efl/ewk_view_form_client.cpp
- UIProcess/API/efl/ewk_view_loader_client.cpp
- UIProcess/API/efl/ewk_view_policy_client.cpp
- UIProcess/API/efl/ewk_view_resource_load_client.cpp
- UIProcess/API/efl/ewk_web_error.cpp
- UIProcess/API/efl/ewk_web_resource.cpp
UIProcess/cairo/BackingStoreCairo.cpp
+ UIProcess/efl/ContextHistoryClientEfl.cpp
+ UIProcess/efl/DownloadManagerEfl.cpp
+ UIProcess/efl/FindClientEfl.cpp
+ UIProcess/efl/FormClientEfl.cpp
+ UIProcess/efl/InputMethodContextEfl.cpp
+ UIProcess/efl/PageLoadClientEfl.cpp
+ UIProcess/efl/PagePolicyClientEfl.cpp
+ UIProcess/efl/PageUIClientEfl.cpp
+ UIProcess/efl/RequestManagerClientEfl.cpp
+ UIProcess/efl/ResourceLoadClientEfl.cpp
UIProcess/efl/TextCheckerEfl.cpp
UIProcess/efl/WebContextEfl.cpp
UIProcess/efl/WebFullScreenManagerProxyEfl.cpp
WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp
WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp
WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
- WebProcess/WebCoreSupport/efl/WebInspectorServerEfl.cpp
WebProcess/WebCoreSupport/efl/WebPopupMenuEfl.cpp
WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
"${WEBKIT2_DIR}/Shared/soup"
"${WEBKIT2_DIR}/UIProcess/API/C/efl"
"${WEBKIT2_DIR}/UIProcess/API/C/soup"
+ "${WEBKIT2_DIR}/UIProcess/API/cpp/efl"
"${WEBKIT2_DIR}/UIProcess/API/efl"
+ "${WEBKIT2_DIR}/UIProcess/efl"
"${WEBKIT2_DIR}/UIProcess/soup"
"${WEBKIT2_DIR}/WebProcess/Downloads/soup"
"${WEBKIT2_DIR}/WebProcess/efl"
"${WEBKIT2_DIR}/WebProcess/soup"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
+ "${WTF_DIR}/wtf/efl/"
"${WTF_DIR}/wtf/gobject"
${CAIRO_INCLUDE_DIRS}
- ${ECORE_X_INCLUDE_DIRS}
+ ${ECORE_INCLUDE_DIRS}
+ ${ECORE_EVAS_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
- ${EFLDEPS_INCLUDE_DIRS}
+ ${EFREET_INCLUDE_DIRS}
+ ${EINA_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${WTF_DIR}
${CAPI_INCLUDE_DIRS}
)
LIST(APPEND WebKit2_LIBRARIES
${CAIRO_LIBRARIES}
- ${ECORE_X_LIBRARIES}
- ${EFLDEPS_LIBRARIES}
+ ${ECORE_LIBRARIES}
+ ${ECORE_EVAS_LIBRARIES}
+ ${EDJE_LIBRARIES}
+ ${EFREET_LIBRARIES}
+ ${EINA_LIBRARIES}
+ ${EVAS_LIBRARIES}
${Freetype_LIBRARIES}
+ ${HARFBUZZ_LIBRARIES}
${LIBXML2_LIBRARIES}
${SQLITE_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${PNG_LIBRARY}
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
- ${Glib_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GIO_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
${CAPI_LIBRARIES}
)
LIST (APPEND WebProcess_LIBRARIES
${CAIRO_LIBRARIES}
+ ${ECORE_IMF_LIBRARIES}
${ECORE_X_LIBRARIES}
${EDJE_LIBRARIES}
${EFLDEPS_LIBRARIES}
${SQLITE_LIBRARIES}
)
-ADD_DEFINITIONS(-DDEFAULT_THEME_PATH=\"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/themes\")
-
ADD_CUSTOM_TARGET(forwarding-headerEfl
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
)
SET (EWebKit2_HEADERS
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/EWebKit2.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_auth_challenge.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_back_forward_list.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_back_forward_list_item.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_certificate.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_cookie_manager.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_download_job.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_error.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_favicon_database.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_form_submission_request.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intent_service.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_main.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_data.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_policy_decision.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_resource.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_settings.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_text_checker.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_touch.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_url_request.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_url_response.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_url_scheme_request.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_view.h"
- "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_web_error.h"
- "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_web_resource.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context_menu.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_custom_handlers.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_enums.h"
- "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_error.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_form_data.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_frame.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_history.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_settings.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_text_style.h"
"${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_user_media.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_web_application_icon_data.h"
)
INSTALL(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig)
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
${EVAS_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GIO_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
gtest
)
IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND EWK2UnitTests_LIBRARIES
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
)
ENDIF()
SET(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests")
SET(TEST_RESOURCES_DIR ${WEBKIT2_EFL_TEST_DIR}/resources)
+SET(TEST_INJECTED_BUNDLE_DIR ${WEBKIT2_EFL_TEST_DIR}/InjectedBundle)
ADD_DEFINITIONS(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
-DTEST_THEME_DIR=\"${THEME_BINARY_DIR}\"
# The "ewk" on the test name needs to be suffixed with "2", otherwise it
# will clash with tests from the WebKit 1 test suite.
SET(EWK2UnitTests_BINARIES
+ test_ewk2_back_forward_list
test_ewk2_context
+ test_ewk2_context_history_callbacks
test_ewk2_cookie_manager
test_ewk2_download_job
+ test_ewk2_eina_shared_string
+ test_ewk2_favicon_database
+ test_ewk2_intents
test_ewk2_settings
test_ewk2_view
)
SET_TESTS_PROPERTIES(${testName} PROPERTIES TIMEOUT 60)
TARGET_LINK_LIBRARIES(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils)
ENDFOREACH ()
+
+ ADD_LIBRARY(ewk2UnitTestInjectedBundleSample SHARED ${TEST_INJECTED_BUNDLE_DIR}/injected_bundle_sample.cpp)
+ SET_TARGET_PROPERTIES(ewk2UnitTestInjectedBundleSample PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${TEST_RESOURCES_DIR}")
ENDIF ()
IF (ENABLE_SPELLCHECK)