https://bugs.webkit.org/show_bug.cgi?id=83693
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/OptionsEfl.cmake: Define BUILDING_SOUP__ to build WebKit2/Efl.
Source/WebCore:
* CMakeLists.txt: Add GestureTapHighlighter.cpp.
Source/WebKit2:
* CMakeLists.txt: Move IDL generator codes to generate port specific *.messages.in.
* PlatformEfl.cmake: Add soup related files after r115411 and includes to fix build break.
* UIProcess/API/efl/PageClientImpl.cpp: Fix build break with ENABLE_TOUCH_EVENTS.
(WebKit):
(WebKit::PageClientImpl::doneWithTouchEvent):
* UIProcess/API/efl/PageClientImpl.h:
(PageClientImpl):
* WebProcess/WebCoreSupport/WebChromeClient.cpp: Fix build break with ENABLE_INPUT_TYPE_COLOR and ENABLE_REGISTER_PROTOCOL_HANDLER.
(WebKit):
(WebKit::WebChromeClient::createColorChooser):
* WebProcess/WebCoreSupport/WebChromeClient.h:
(WebChromeClient):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Fix build break with ENABLE_WEB_INTENTS
(WebKit):
(WebKit::WebFrameLoaderClient::dispatchIntent):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebCore):
(WebFrameLoaderClient):
* WebProcess/WebProcess.cpp: Guard PLATFORM_STRATEGIES codes.
(WebKit::WebProcess::didGetPlugins):
* WebProcess/soup/WebSoupRequestManager.cpp: Try to share with EFL port.
(WebKit::WebSoupRequestManager::didHandleURIRequest):
Tools:
* CMakeLists.txt: Guard Webkit1 related codes with ENABLE_WEBKIT.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@118914
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-05-30 Mariusz Grzegorczyk <mariusz.g@samsung.com>, Ryuan Choi <ryuan.choi@samsung.com>
+
+ [EFL][WK2] Fix WebKit2-EFL build
+ https://bugs.webkit.org/show_bug.cgi?id=83693
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsEfl.cmake: Define BUILDING_SOUP__ to build WebKit2/Efl.
+
2012-05-29 Jonathan Dong <jonathan.dong@torchmobile.com.cn>
[BlackBerry] Loading media data with http authentication
page/FrameTree.cpp
page/FrameView.cpp
page/GroupSettings.cpp
+ page/GestureTapHighlighter.cpp
page/History.cpp
page/Location.cpp
page/MemoryInfo.cpp
+2012-05-30 Mariusz Grzegorczyk <mariusz.g@samsung.com>, Ryuan Choi <ryuan.choi@samsung.com>
+
+ [EFL][WK2] Fix WebKit2-EFL build
+ https://bugs.webkit.org/show_bug.cgi?id=83693
+
+ Reviewed by Carlos Garcia Campos.
+
+ * CMakeLists.txt: Add GestureTapHighlighter.cpp.
+
2012-05-29 Antti Koivisto <antti@apple.com>
Rename Foo::addSubresourceStyleURLs and Node::addSubresourceAttributeURLs
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
"${WEBKIT2_DIR}/WebProcess/WebPage"
"${WEBCORE_DIR}"
+ "${WEBCORE_DIR}/Modules/intents"
"${WEBCORE_DIR}/accessibility"
"${WEBCORE_DIR}/bindings/js"
"${WEBCORE_DIR}/bindings"
"${WEBCORE_DIR}/editing"
"${WEBCORE_DIR}/history"
"${WEBCORE_DIR}/html"
+ "${WEBCORE_DIR}/html/track"
"${WEBCORE_DIR}/inspector"
"${WEBCORE_DIR}/loader"
"${WEBCORE_DIR}/loader/icon"
WebProcess/WebPage/WebPage.messages.in
)
+SET(WebProcess_NAME bin/WebProcess)
+
+SET(WebProcess_LIBRARIES
+ ${JavaScriptCore_LIBRARY_NAME}
+ ${WebCore_LIBRARY_NAME}
+ ${WebKit2_LIBRARY_NAME}
+)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+
# Create JavaScript C++ code given an IDL input
FOREACH (_file ${WebKit2_MESSAGES_IN_FILES})
GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
${WebCore_LIBRARY_NAME}
)
-SET(WebProcess_NAME ../bin/WebProcess)
-SET(WebProcess_SOURCES "")
-
-SET(WebProcess_LIBRARIES
- ${JavaScriptCore_LIBRARY_NAME}
- ${WebCore_LIBRARY_NAME}
- ${WebKit2_LIBRARY_NAME}
-)
-
-SET(ForwardingHeaders_NAME )
-SET(ForwardingNetworkHeaders_NAME )
-WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
ADD_DEFINITIONS(-DBUILDING_WEBKIT)
INCLUDE_DIRECTORIES(${WebKit2_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
ADD_EXECUTABLE(${WebProcess_NAME} ${WebProcess_SOURCES})
TARGET_LINK_LIBRARIES(${WebProcess_NAME} ${WebProcess_LIBRARIES})
SET_TARGET_PROPERTIES(${WebProcess_NAME} PROPERTIES FOLDER "WebKit")
+SET_TARGET_PROPERTIES(${WebProcess_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
IF (WebKit2_LINK_FLAGS)
+2012-05-30 Mariusz Grzegorczyk <mariusz.g@samsung.com>, Ryuan Choi <ryuan.choi@samsung.com>
+
+ [EFL][WK2] Fix WebKit2-EFL build
+ https://bugs.webkit.org/show_bug.cgi?id=83693
+
+ Reviewed by Carlos Garcia Campos.
+
+ * CMakeLists.txt: Move IDL generator codes to generate port specific *.messages.in.
+ * PlatformEfl.cmake: Add soup related files after r115411 and includes to fix build break.
+ * UIProcess/API/efl/PageClientImpl.cpp: Fix build break with ENABLE_TOUCH_EVENTS.
+ (WebKit):
+ (WebKit::PageClientImpl::doneWithTouchEvent):
+ * UIProcess/API/efl/PageClientImpl.h:
+ (PageClientImpl):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: Fix build break with ENABLE_INPUT_TYPE_COLOR and ENABLE_REGISTER_PROTOCOL_HANDLER.
+ (WebKit):
+ (WebKit::WebChromeClient::createColorChooser):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: Fix build break with ENABLE_WEB_INTENTS
+ (WebKit):
+ (WebKit::WebFrameLoaderClient::dispatchIntent):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ (WebCore):
+ (WebFrameLoaderClient):
+ * WebProcess/WebProcess.cpp: Guard PLATFORM_STRATEGIES codes.
+ (WebKit::WebProcess::didGetPlugins):
+ * WebProcess/soup/WebSoupRequestManager.cpp: Try to share with EFL port.
+ (WebKit::WebSoupRequestManager::didHandleURIRequest):
+
2012-05-30 Kenneth Rohde Christiansen <kenneth@webkit.org>
[Qt] Variable renaming as preparation of further refactoring.
Shared/efl/WebEventFactory.cpp
Shared/efl/WebCoreArgumentCodersEfl.cpp
+ UIProcess/API/C/soup/WKContextSoup.cpp
+ UIProcess/API/C/soup/WKSoupRequestManager.cpp
+
UIProcess/API/efl/PageClientImpl.cpp
UIProcess/API/efl/ewk_view.cpp
UIProcess/efl/WebPageProxyEfl.cpp
UIProcess/efl/WebPreferencesEfl.cpp
+ UIProcess/soup/WebSoupRequestManagerClient.cpp
+ UIProcess/soup/WebSoupRequestManagerProxy.cpp
+
UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
UIProcess/Launcher/efl/ThreadLauncherEfl.cpp
- UIProcess/Plugins/efl/PluginInfoStoreEfl.cpp
- UIProcess/Plugins/efl/PluginProcessProxyEfl.cpp
+ UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
WebProcess/WebPage/efl/WebInspectorEfl.cpp
WebProcess/WebPage/efl/WebPageEfl.cpp
+
+ WebProcess/soup/WebSoupRequestManager.cpp
+ WebProcess/soup/WebKitSoupRequestGeneric.cpp
+ WebProcess/soup/WebKitSoupRequestInputStream.cpp
+)
+
+LIST(APPEND WebKit2_MESSAGES_IN_FILES
+ UIProcess/soup/WebSoupRequestManagerProxy.messages.in
+ WebProcess/soup/WebSoupRequestManager.messages.in
)
LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${JAVASCRIPTCORE_DIR}/wtf/gobject"
+ "${JAVASCRIPTCORE_DIR}/llint"
"${WEBCORE_DIR}/platform/efl"
"${WEBCORE_DIR}/platform/graphics/cairo"
"${WEBCORE_DIR}/platform/network/soup"
+ "${WEBCORE_DIR}/svg/graphics"
"${WEBKIT2_DIR}/Shared/efl"
- "${WEBKIT2_DIR}/UIProcess/API/efl/"
+ "${WEBKIT2_DIR}/UIProcess/API/C/soup"
+ "${WEBKIT2_DIR}/UIProcess/API/efl"
+ "${WEBKIT2_DIR}/UIProcess/soup"
"${WEBKIT2_DIR}/WebProcess/Downloads/efl"
"${WEBKIT2_DIR}/WebProcess/efl"
+ "${WEBKIT2_DIR}/WebProcess/soup"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
+ "${WTF_DIR}/wtf/gobject"
${CAIRO_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
${Glib_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
+ ${WTF_DIR}
)
LIST(APPEND WebKit2_LIBRARIES
notImplemented();
}
+#if ENABLE(TOUCH_EVENTS)
+void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled)
+{
+ notImplemented();
+}
+#endif
+
PassRefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy*)
{
notImplemented();
virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&);
virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool);
+#if ENABLE(TOUCH_EVENTS)
+ virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
+#endif
virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);
#include "WebProcess.h"
#include "WebSearchPopupMenu.h"
#include <WebCore/AXObjectCache.h>
+#include <WebCore/ColorChooser.h>
#include <WebCore/DatabaseTracker.h>
#include <WebCore/FileChooser.h>
#include <WebCore/FileIconLoader.h>
return true;
}
+#if ENABLE(INPUT_TYPE_COLOR)
+PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient*, const Color&)
+{
+ notImplemented();
+ return nullptr;
+}
+#endif
+
void WebChromeClient::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
{
if (m_page->activeOpenPanelResultListener())
virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE;
+#if ENABLE(INPUT_TYPE_COLOR)
+ virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
+#endif
+
virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>) OVERRIDE;
virtual void loadIconForFiles(const Vector<String>&, WebCore::FileIconLoader*) OVERRIDE;
virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE;
virtual void numTouchEventHandlersChanged(unsigned) OVERRIDE { }
+#if ENABLE(REGISTER_PROTOCOL_HANDLER)
+ virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) OVERRIDE { }
+#endif
+
String m_cachedToolTip;
mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
mutable bool m_cachedMainFrameHasHorizontalScrollbar;
#include <WebCore/Widget.h>
#include <WebCore/WindowFeatures.h>
+#if ENABLE(WEB_INTENTS)
+#include <WebCore/IntentRequest.h>
+#endif
+
using namespace WebCore;
namespace WebKit {
}
#endif // PLATFORM(WIN) && USE(CFNETWORK)
+#if ENABLE(WEB_INTENTS)
+void WebFrameLoaderClient::dispatchIntent(PassRefPtr<IntentRequest>)
+{
+ notImplemented();
+}
+#endif
+
bool WebFrameLoaderClient::shouldUsePluginDocument(const String& /*mimeType*/) const
{
notImplemented();
#include <WebCore/FrameLoaderClient.h>
+namespace WebCore {
+#if ENABLE(WEB_INTENTS)
+class IntentRequest;
+#endif
+}
+
namespace WebKit {
class PluginView;
// FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
virtual bool shouldCacheResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&, const unsigned char* data, unsigned long long length) OVERRIDE;
#endif
-
+
+#if ENABLE(WEB_INTENTS)
+ virtual void dispatchIntent(PassRefPtr<WebCore::IntentRequest>) OVERRIDE;
+#endif
+
virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const OVERRIDE;
virtual void didChangeScrollOffset() OVERRIDE;
void WebProcess::didGetPlugins(CoreIPC::Connection*, uint64_t requestID, const Vector<WebCore::PluginInfo>& plugins)
{
+#if USE(PLATFORM_STRATEGIES)
// Pass this to WebPlatformStrategies.cpp.
handleDidGetPlugins(requestID, plugins);
+#endif
}
} // namespace WebKit
#include "DataReference.h"
#include "MessageID.h"
+#include "WebErrors.h"
#include "WebKitSoupRequestGeneric.h"
#include "WebKitSoupRequestInputStream.h"
#include "WebProcess.h"
#include "WebSoupRequestManagerProxyMessages.h"
-#include <WebCore/ErrorsGtk.h>
#include <WebCore/ResourceHandle.h>
#include <WebCore/ResourceRequest.h>
#include <libsoup/soup-requester.h>
} else {
GOwnPtr<char> uriString(soup_uri_to_string(soup_request_get_uri(SOUP_REQUEST(request.get())), FALSE));
WebCore::ResourceRequest resourceRequest(String::fromUTF8(uriString.get()));
- WebCore::ResourceError resourceError(WebCore::cannotShowURLError(resourceRequest));
+ WebCore::ResourceError resourceError(cannotShowURLError(resourceRequest));
g_simple_async_result_set_error(result.get(), g_quark_from_string(resourceError.domain().utf8().data()),
resourceError.errorCode(), "%s", resourceError.localizedDescription().utf8().data());
}
SET(WTF_USE_SOUP 1)
ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
+ADD_DEFINITIONS(-DBUILDING_SOUP__=1)
ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
IF ("${PORT}" STREQUAL "Efl")
- ADD_SUBDIRECTORY(DumpRenderTree/efl)
- ADD_SUBDIRECTORY(EWebLauncher)
+ IF (ENABLE_WEBKIT)
+ ADD_SUBDIRECTORY(DumpRenderTree/efl)
+ ADD_SUBDIRECTORY(EWebLauncher)
+ ENDIF ()
ELSEIF ("${PORT}" STREQUAL "WinCE")
ADD_SUBDIRECTORY(WinCELauncher)
ENDIF()
+2012-05-30 Mariusz Grzegorczyk <mariusz.g@samsung.com>, Ryuan Choi <ryuan.choi@samsung.com>
+
+ [EFL][WK2] Fix WebKit2-EFL build
+ https://bugs.webkit.org/show_bug.cgi?id=83693
+
+ Reviewed by Carlos Garcia Campos.
+
+ * CMakeLists.txt: Guard Webkit1 related codes with ENABLE_WEBKIT.
+
2012-05-29 János Badics <jbadics@inf.u-szeged.hu>
[Qt] Modified ORWT and NRWT to check for test expectations in platform/qt-5.0-wk1 too