Permalink
Browse files

stable branch compliance.

  • Loading branch information...
zdobersek committed Apr 9, 2018
1 parent fb2b6d4 commit a66b9cf5ec4965303b328ab93f6757d75e64cc72
@@ -336,7 +336,6 @@ if (EXPORT_DEPRECATED_WEBKIT2_C_API)
${WEBKIT_DIR}/Shared/API/c/WKUserScriptInjectionTime.h
${WEBKIT_DIR}/Shared/API/c/wpe/WKBaseWPE.h
${WEBKIT_DIR}/Shared/API/c/wpe/WebKit.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundle.h
${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
@@ -430,6 +429,15 @@ if (EXPORT_DEPRECATED_WEBKIT2_C_API)
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/WebKit"
COMPONENT "Development"
)
set(WPE_INSTALLED_WEBKIT_HEADERS_INCLUDE
${WEBKIT_DIR}/Shared/API/c/wpe/WebKit.h
)
install(FILES ${WPE_INSTALLED_WEBKIT_HEADERS_INCLUDE}
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE"
COMPONENT "Development"
)
endif()
target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES})
@@ -441,6 +449,6 @@ install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
)
install(FILES ${WPE_API_INSTALLED_HEADERS}
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/wpe"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/webkit"
COMPONENT "Development"
)
@@ -40,7 +40,12 @@ template<> struct ClientTraits<WKViewClientBase> {
};
}
WKViewRef WKViewCreate(struct wpe_view_backend* backend, WKPageConfigurationRef configuration)
WKViewRef WKViewCreate(WKPageConfigurationRef configuration)
{
return toAPI(WKWPE::View::create(nullptr, *toImpl(configuration)));
}
WKViewRef WKViewCreateWithViewBackend(struct wpe_view_backend* backend, WKPageConfigurationRef configuration)
{
return toAPI(WKWPE::View::create(backend, *toImpl(configuration)));
}
@@ -35,7 +35,8 @@ extern "C" {
struct wpe_view_backend;
WK_EXPORT WKViewRef WKViewCreate(struct wpe_view_backend*, WKPageConfigurationRef);
WK_EXPORT WKViewRef WKViewCreate(WKPageConfigurationRef);
WK_EXPORT WKViewRef WKViewCreateWithViewBackend(struct wpe_view_backend*, WKPageConfigurationRef);
WK_EXPORT WKPageRef WKViewGetPage(WKViewRef);

0 comments on commit a66b9cf

Please sign in to comment.