Remove EFL from WebKit2
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Feb 2017 19:10:39 +0000 (19:10 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Feb 2017 19:10:39 +0000 (19:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=168511

Reviewed by Alex Christensen.

* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::platformInvalidate):
(IPC::Connection::open):
* Platform/Module.h:
* PlatformEfl.cmake: Removed.
* PluginProcess/unix/PluginProcessMainUnix.cpp:
* Shared/API/APIObject.h:
* Shared/API/c/WKBase.h:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toImpl):
* Shared/NativeWebKeyboardEvent.h:
(WebKit::NativeWebKeyboardEvent::isFakeEventForComposition):
(WebKit::NativeWebKeyboardEvent::isFiltered): Deleted.
* Shared/NativeWebMouseEvent.h:
(WebKit::NativeWebMouseEvent::nativeEvent):
(WebKit::NativeWebMouseEvent::NativeWebMouseEvent): Deleted.
* Shared/NativeWebTouchEvent.h:
(WebKit::NativeWebTouchEvent::nativeEvent):
* Shared/NativeWebWheelEvent.h:
(WebKit::NativeWebWheelEvent::nativeEvent):
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::determineQuirks):
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/APIWebsiteDataStore.cpp:
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKTextChecker.cpp:
* UIProcess/API/C/WKTextChecker.h:
* UIProcess/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::getLaunchOptions):
* UIProcess/CoordinatedGraphics/PageViewportController.cpp:
(WebKit::PageViewportController::pixelAlignedFloatPoint):
* UIProcess/InspectorServer/WebInspectorServer.h:
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
* UIProcess/PageClient.h:
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::getPluginDisplay):
(WebKit::x11Screen):
(WebKit::displayDepth):
(WebKit::rootWindowID):
(WebKit::NetscapePluginX11::paint):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
(WebKit::WebChromeClient::pageExtendedBackgroundColorDidChange):
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::saveViewStateToItem):
(WebKit::WebFrameLoaderClient::restoreViewState):
(WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@212557 268f45cc-cd09-0410-ab3c-d52691b4dbfc

37 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp
Source/WebKit2/Platform/Module.h
Source/WebKit2/PlatformEfl.cmake [deleted file]
Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp
Source/WebKit2/Shared/API/APIObject.h
Source/WebKit2/Shared/API/c/WKBase.h
Source/WebKit2/Shared/API/c/WKSharedAPICast.h
Source/WebKit2/Shared/NativeWebKeyboardEvent.h
Source/WebKit2/Shared/NativeWebMouseEvent.h
Source/WebKit2/Shared/NativeWebTouchEvent.h
Source/WebKit2/Shared/NativeWebWheelEvent.h
Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
Source/WebKit2/Shared/WebPreferencesDefinitions.h
Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp
Source/WebKit2/UIProcess/API/C/WKAPICast.h
Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp
Source/WebKit2/UIProcess/API/C/WKTextChecker.h
Source/WebKit2/UIProcess/ChildProcessProxy.cpp
Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp
Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h
Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
Source/WebKit2/UIProcess/PageClient.h
Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
Source/WebKit2/UIProcess/WebInspectorProxy.h
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Source/WebKit2/config.h

index 0a627d6..062174b 100644 (file)
@@ -1,3 +1,73 @@
+2017-02-17  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Remove EFL from WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=168511
+
+        Reviewed by Alex Christensen.
+
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+        (IPC::Connection::platformInvalidate):
+        (IPC::Connection::open):
+        * Platform/Module.h:
+        * PlatformEfl.cmake: Removed.
+        * PluginProcess/unix/PluginProcessMainUnix.cpp:
+        * Shared/API/APIObject.h:
+        * Shared/API/c/WKBase.h:
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toImpl):
+        * Shared/NativeWebKeyboardEvent.h:
+        (WebKit::NativeWebKeyboardEvent::isFakeEventForComposition):
+        (WebKit::NativeWebKeyboardEvent::isFiltered): Deleted.
+        * Shared/NativeWebMouseEvent.h:
+        (WebKit::NativeWebMouseEvent::nativeEvent):
+        (WebKit::NativeWebMouseEvent::NativeWebMouseEvent): Deleted.
+        * Shared/NativeWebTouchEvent.h:
+        (WebKit::NativeWebTouchEvent::nativeEvent):
+        * Shared/NativeWebWheelEvent.h:
+        (WebKit::NativeWebWheelEvent::nativeEvent):
+        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+        (WebKit::NetscapePluginModule::determineQuirks):
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/API/APIWebsiteDataStore.cpp:
+        * UIProcess/API/C/WKAPICast.h:
+        * UIProcess/API/C/WKTextChecker.cpp:
+        * UIProcess/API/C/WKTextChecker.h:
+        * UIProcess/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::getLaunchOptions):
+        * UIProcess/CoordinatedGraphics/PageViewportController.cpp:
+        (WebKit::PageViewportController::pixelAlignedFloatPoint):
+        * UIProcess/InspectorServer/WebInspectorServer.h:
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
+        * UIProcess/PageClient.h:
+        * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+        (WebKit::PluginProcessProxy::scanPlugin):
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/WebPageProxy.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::getPluginDisplay):
+        (WebKit::x11Screen):
+        (WebKit::displayDepth):
+        (WebKit::rootWindowID):
+        (WebKit::NetscapePluginX11::paint):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::selectItemWritingDirectionIsNatural):
+        (WebKit::WebChromeClient::pageExtendedBackgroundColorDidChange):
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::saveViewStateToItem):
+        (WebKit::WebFrameLoaderClient::restoreViewState):
+        (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+        * config.h:
+
 2017-02-15  Brady Eidson  <beidson@apple.com>
 
         Stop backing up localStorage databases to iCloud by default.
index b1365cb..fcd1047 100644 (file)
@@ -149,8 +149,6 @@ void Connection::platformInvalidate()
 
 #if PLATFORM(GTK)
     m_socketMonitor.stop();
-#elif PLATFORM(EFL)
-    m_connectionQueue->unregisterSocketEventHandler(m_socketDescriptor);
 #endif
 
     m_socketDescriptor = -1;
@@ -382,11 +380,6 @@ bool Connection::open()
         ASSERT_NOT_REACHED();
         return G_SOURCE_REMOVE;
     });
-#elif PLATFORM(EFL)
-    m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
-        [protectedThis] {
-            protectedThis->readyReadHandler();
-        });
 #endif
 
     // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal handler.
index af652a9..53bed92 100644 (file)
 typedef struct _GModule GModule;
 #endif
 
-#if PLATFORM(EFL)
-#include <Eina.h>
-#include <wtf/efl/UniquePtrEfl.h>
-#endif
-
 namespace WebKit {
 
 class Module {
@@ -76,8 +71,6 @@ private:
 #endif
 #elif PLATFORM(GTK)
     GModule* m_handle;
-#elif PLATFORM(EFL)
-    EflUniquePtr<Eina_Module> m_module;
 #endif
 };
 
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
deleted file mode 100644 (file)
index 00a35c7..0000000
+++ /dev/null
@@ -1,568 +0,0 @@
-list(APPEND WebKit2_SOURCES
-    DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
-
-    NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
-
-    NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp
-
-    NetworkProcess/cache/NetworkCacheCodersSoup.cpp
-    NetworkProcess/cache/NetworkCacheDataSoup.cpp
-    NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
-
-    NetworkProcess/efl/NetworkProcessMainEfl.cpp
-
-    NetworkProcess/soup/NetworkDataTaskSoup.cpp
-    NetworkProcess/soup/NetworkProcessSoup.cpp
-    NetworkProcess/soup/NetworkSessionSoup.cpp
-    NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
-
-    Platform/IPC/unix/AttachmentUnix.cpp
-    Platform/IPC/unix/ConnectionUnix.cpp
-
-    Platform/efl/ModuleEfl.cpp
-
-    Platform/unix/LoggingUnix.cpp
-    Platform/unix/SharedMemoryUnix.cpp
-
-    PluginProcess/unix/PluginControllerProxyUnix.cpp
-    PluginProcess/unix/PluginProcessMainUnix.cpp
-    PluginProcess/unix/PluginProcessUnix.cpp
-
-    Shared/API/c/cairo/WKImageCairo.cpp
-
-    Shared/API/c/efl/WKArrayEfl.cpp
-
-    Shared/Authentication/soup/AuthenticationManagerSoup.cpp
-
-    Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp
-    Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
-    Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
-    Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
-
-    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
-
-    Shared/Plugins/unix/PluginSearchPath.cpp
-
-    Shared/cairo/ShareableBitmapCairo.cpp
-
-    Shared/efl/NativeWebKeyboardEventEfl.cpp
-    Shared/efl/NativeWebTouchEventEfl.cpp
-    Shared/efl/NativeWebWheelEventEfl.cpp
-    Shared/efl/ProcessExecutablePathEfl.cpp
-    Shared/efl/WebEventFactory.cpp
-
-    Shared/linux/WebMemorySamplerLinux.cpp
-
-    Shared/soup/WebCoreArgumentCodersSoup.cpp
-
-    Shared/unix/ChildProcessMain.cpp
-
-    UIProcess/AcceleratedDrawingAreaProxy.cpp
-    UIProcess/BackingStore.cpp
-    UIProcess/DefaultUndoController.cpp
-    UIProcess/LegacySessionStateCodingNone.cpp
-    UIProcess/WebResourceLoadStatisticsManager.cpp
-    UIProcess/WebResourceLoadStatisticsStore.cpp
-    UIProcess/WebTextChecker.cpp
-    UIProcess/WebTextCheckerClient.cpp
-
-    UIProcess/API/C/WKResourceLoadStatisticsManager.cpp
-
-    UIProcess/API/C/CoordinatedGraphics/WKView.cpp
-
-    UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
-
-    UIProcess/API/C/efl/WKColorPickerResultListener.cpp
-    UIProcess/API/C/efl/WKEventEfl.cpp
-    UIProcess/API/C/efl/WKViewEfl.cpp
-
-    UIProcess/API/C/soup/WKCookieManagerSoup.cpp
-
-    UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp
-
-    UIProcess/API/cpp/efl/WKEinaSharedString.cpp
-
-    UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp
-    UIProcess/API/efl/EwkView.cpp
-    UIProcess/API/efl/GestureRecognizer.cpp
-    UIProcess/API/efl/SnapshotImageGL.cpp
-    UIProcess/API/efl/WebAccessibility.cpp
-    UIProcess/API/efl/ewk_application_cache_manager.cpp
-    UIProcess/API/efl/ewk_auth_request.cpp
-    UIProcess/API/efl/ewk_back_forward_list.cpp
-    UIProcess/API/efl/ewk_back_forward_list_item.cpp
-    UIProcess/API/efl/ewk_color_picker.cpp
-    UIProcess/API/efl/ewk_context.cpp
-    UIProcess/API/efl/ewk_context_menu.cpp
-    UIProcess/API/efl/ewk_context_menu_item.cpp
-    UIProcess/API/efl/ewk_cookie_manager.cpp
-    UIProcess/API/efl/ewk_database_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_file_chooser_request.cpp
-    UIProcess/API/efl/ewk_form_submission_request.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_object.cpp
-    UIProcess/API/efl/ewk_page_group.cpp
-    UIProcess/API/efl/ewk_popup_menu.cpp
-    UIProcess/API/efl/ewk_popup_menu_item.cpp
-    UIProcess/API/efl/ewk_security_origin.cpp
-    UIProcess/API/efl/ewk_settings.cpp
-    UIProcess/API/efl/ewk_storage_manager.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_configuration.cpp
-    UIProcess/API/efl/ewk_view.cpp
-    UIProcess/API/efl/ewk_window_features.cpp
-
-    UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp
-    UIProcess/CoordinatedGraphics/PageViewportController.cpp
-    UIProcess/CoordinatedGraphics/WebPageProxyCoordinatedGraphics.cpp
-
-    UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
-
-    UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
-
-    UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
-
-    UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
-
-    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
-    UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
-
-    UIProcess/Storage/StorageManager.cpp
-
-    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
-
-    UIProcess/cairo/BackingStoreCairo.cpp
-
-    UIProcess/efl/ContextHistoryClientEfl.cpp
-    UIProcess/efl/ContextMenuClientEfl.cpp
-    UIProcess/efl/DownloadManagerEfl.cpp
-    UIProcess/efl/EasingCurves.cpp
-    UIProcess/efl/EwkTouchEvent.cpp
-    UIProcess/efl/EwkTouchPoint.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/PageViewportControllerClientEfl.cpp
-    UIProcess/efl/RequestManagerClientEfl.cpp
-    UIProcess/efl/TextCheckerClientEfl.cpp
-    UIProcess/efl/TextCheckerEfl.cpp
-    UIProcess/efl/VibrationClientEfl.cpp
-    UIProcess/efl/ViewClientEfl.cpp
-    UIProcess/efl/WebColorPickerClient.cpp
-    UIProcess/efl/WebColorPickerEfl.cpp
-    UIProcess/efl/WebColorPickerResultListenerProxy.cpp
-    UIProcess/efl/WebContextMenuProxyEfl.cpp
-    UIProcess/efl/WebInspectorProxyEfl.cpp
-    UIProcess/efl/WebPageProxyEfl.cpp
-    UIProcess/efl/WebPopupItemEfl.cpp
-    UIProcess/efl/WebPopupMenuProxyEfl.cpp
-    UIProcess/efl/WebPreferencesEfl.cpp
-    UIProcess/efl/WebProcessPoolEfl.cpp
-    UIProcess/efl/WebView.cpp
-    UIProcess/efl/WebViewClient.cpp
-
-    UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
-    UIProcess/gstreamer/WebPageProxyGStreamer.cpp
-
-    UIProcess/linux/MemoryPressureMonitor.cpp
-
-    UIProcess/soup/WebCookieManagerProxySoup.cpp
-    UIProcess/soup/WebProcessPoolSoup.cpp
-
-    WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
-    WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
-
-    WebProcess/InjectedBundle/API/efl/ewk_extension.cpp
-    WebProcess/InjectedBundle/API/efl/ewk_page.cpp
-
-    WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp
-
-    WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
-
-    WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
-    WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
-
-    WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-
-    WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp
-    WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp
-    WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
-    WebProcess/WebCoreSupport/efl/WebPopupMenuEfl.cpp
-
-    WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
-
-    WebProcess/WebPage/AcceleratedDrawingArea.cpp
-    WebProcess/WebPage/DrawingAreaImpl.cpp
-
-    WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
-    WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
-    WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
-    WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
-    WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp
-
-    WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
-
-    WebProcess/WebPage/efl/WebInspectorUIEfl.cpp
-    WebProcess/WebPage/efl/WebPageEfl.cpp
-
-    WebProcess/WebPage/gstreamer/WebPageGStreamer.cpp
-
-    WebProcess/efl/ExtensionManagerEfl.cpp
-    WebProcess/efl/WebProcessMainEfl.cpp
-
-    WebProcess/soup/WebKitSoupRequestInputStream.cpp
-    WebProcess/soup/WebProcessSoup.cpp
-)
-
-list(APPEND WebKit2_MESSAGES_IN_FILES
-    UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in
-
-    WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.messages.in
-)
-
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
-    "${WEBKIT2_DIR}/DatabaseProcess/unix"
-    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/efl"
-    "${WEBKIT2_DIR}/NetworkProcess/soup"
-    "${WEBKIT2_DIR}/NetworkProcess/unix"
-    "${WEBKIT2_DIR}/Platform/efl"
-    "${WEBKIT2_DIR}/Shared/API/c/efl"
-    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/Shared/Plugins/unix"
-    "${WEBKIT2_DIR}/Shared/glib"
-    "${WEBKIT2_DIR}/Shared/efl"
-    "${WEBKIT2_DIR}/Shared/soup"
-    "${WEBKIT2_DIR}/Shared/unix"
-    "${WEBKIT2_DIR}/UIProcess/API"
-    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
-    "${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics"
-    "${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/CoordinatedGraphics"
-    "${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols/soup"
-    "${WEBKIT2_DIR}/UIProcess/efl"
-    "${WEBKIT2_DIR}/UIProcess/linux"
-    "${WEBKIT2_DIR}/UIProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/efl"
-    "${WEBKIT2_DIR}/WebProcess/soup"
-    "${WEBKIT2_DIR}/WebProcess/unix"
-    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/efl"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/unix"
-    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/x11"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
-    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
-    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
-    "${WEBKIT2_DIR}"
-)
-
-list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
-    ${CAIRO_INCLUDE_DIRS}
-    ${ECORE_EVAS_INCLUDE_DIRS}
-    ${ECORE_IMF_EVAS_INCLUDE_DIRS}
-    ${ECORE_IMF_INCLUDE_DIRS}
-    ${ECORE_INCLUDE_DIRS}
-    ${ECORE_X_INCLUDE_DIRS}
-    ${EDJE_INCLUDE_DIRS}
-    ${EFREET_INCLUDE_DIRS}
-    ${EINA_INCLUDE_DIRS}
-    ${EO_INCLUDE_DIRS}
-    ${EVAS_INCLUDE_DIRS}
-    ${GLIB_INCLUDE_DIRS}
-    ${GSTREAMER_INCLUDE_DIRS}
-    ${HARFBUZZ_INCLUDE_DIRS}
-    ${LIBSOUP_INCLUDE_DIRS}
-    ${LIBXML2_INCLUDE_DIR}
-    ${LIBXSLT_INCLUDE_DIRS}
-    ${SQLITE_INCLUDE_DIRS}
-)
-
-list(APPEND WebKit2_LIBRARIES
-    WTF
-    ${CAIRO_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    ${ECORE_EVAS_LIBRARIES}
-    ${ECORE_IMF_EVAS_LIBRARIES}
-    ${ECORE_LIBRARIES}
-    ${EDJE_LIBRARIES}
-    ${EFREET_LIBRARIES}
-    ${EINA_LIBRARIES}
-    ${EO_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
-    ${GLIB_GIO_LIBRARIES}
-    ${GLIB_GOBJECT_LIBRARIES}
-    ${GLIB_LIBRARIES}
-    ${HARFBUZZ_LIBRARIES}
-    ${JPEG_LIBRARIES}
-    ${LIBSOUP_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    ${PNG_LIBRARIES}
-    ${SQLITE_LIBRARIES}
-)
-
-list(APPEND WebProcess_SOURCES
-    WebProcess/EntryPoint/unix/WebProcessMain.cpp
-)
-
-list(APPEND NetworkProcess_SOURCES
-    NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
-)
-
-list(APPEND DatabaseProcess_SOURCES
-    DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
-)
-
-list(APPEND WebProcess_LIBRARIES
-    ${CAIRO_LIBRARIES}
-    ${ECORE_IMF_EVAS_LIBRARIES}
-    ${ECORE_IMF_LIBRARIES}
-    ${EDJE_LIBRARIES}
-    ${EFLDEPS_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    ${SQLITE_LIBRARIES}
-)
-
-if (ENABLE_ECORE_X)
-    list(APPEND WebProcess_LIBRARIES
-        ${ECORE_X_LIBRARIES}
-    )
-    list(APPEND WebKit2_LIBRARIES
-        ${ECORE_X_LIBRARIES}
-        ${X11_Xext_LIB}
-    )
-endif ()
-
-add_custom_target(forwarding-headersEflForWebKit2
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform CoordinatedGraphics --platform soup
-)
-
-set(WEBKIT2_EXTRA_DEPENDENCIES
-     forwarding-headersEflForWebKit2
-)
-
-configure_file(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
-configure_file(efl/ewebkit2-extension.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2-extension.pc @ONLY)
-configure_file(efl/EWebKit2Config.cmake.in ${CMAKE_BINARY_DIR}/WebKit2/efl/EWebKit2Config.cmake @ONLY)
-configure_file(efl/EWebKit2ConfigVersion.cmake.in ${CMAKE_BINARY_DIR}/WebKit2/efl/EWebKit2ConfigVersion.cmake @ONLY)
-configure_file(UIProcess/API/efl/EWebKit2.h.in ${DERIVED_SOURCES_WEBKIT2_DIR}/include/EWebKit2.h)
-
-set(EWebKit2_HEADERS
-    "${DERIVED_SOURCES_WEBKIT2_DIR}/include/EWebKit2.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_auth_request.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_application_cache_manager.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_color_picker.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context_menu.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context_menu_item.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_cookie_manager.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_database_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_file_chooser_request.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_form_submission_request.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_intro.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_object.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_page_group.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_security_origin.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_settings.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_storage_manager.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_window_features.h"
-)
-
-set(EWebKit2_Extension_HEADERS
-    "${CMAKE_CURRENT_SOURCE_DIR}/WebProcess/InjectedBundle/API/efl/EWebKit_Extension.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/WebProcess/InjectedBundle/API/efl/ewk_extension.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/WebProcess/InjectedBundle/API/efl/ewk_page.h"
-)
-
-install(FILES ${EWebKit2_HEADERS} DESTINATION ${HEADER_INSTALL_DIR})
-install(FILES ${EWebKit2_Extension_HEADERS} DESTINATION ${HEADER_INSTALL_DIR}/extension)
-
-install(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig)
-install(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2-extension.pc DESTINATION lib/pkgconfig)
-install(FILES
-        ${CMAKE_BINARY_DIR}/WebKit2/efl/EWebKit2Config.cmake
-        ${CMAKE_BINARY_DIR}/WebKit2/efl/EWebKit2ConfigVersion.cmake
-        DESTINATION lib/cmake/EWebKit2)
-
-set(EWEBKIT_EXTENSION_MANAGER_INSTALL_DIR "${LIB_INSTALL_DIR}/${WebKit2_OUTPUT_NAME}-${PROJECT_VERSION_MAJOR}/" CACHE PATH "Absolute path to install injected bundle which controls the extension library")
-
-add_library(ewebkit_extension_manager SHARED "${WEBKIT2_DIR}/WebProcess/efl/WebInjectedBundleMainEfl.cpp")
-target_link_libraries(ewebkit_extension_manager WebKit2)
-
-install(TARGETS ewebkit_extension_manager DESTINATION "${EWEBKIT_EXTENSION_MANAGER_INSTALL_DIR}")
-
-if (ENABLE_PLUGIN_PROCESS)
-    list(APPEND PluginProcess_INCLUDE_DIRECTORIES
-        "${WEBKIT2_DIR}/PluginProcess/unix"
-    )
-
-    include_directories(${PluginProcess_INCLUDE_DIRECTORIES})
-
-    list(APPEND PluginProcess_SOURCES
-        ${WEBKIT2_DIR}/PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
-    )
-
-    if (ENABLE_ECORE_X)
-        list(APPEND PluginProcess_LIBRARIES
-            ${ECORE_X_LIBRARIES}
-        )
-    endif ()
-endif () # ENABLE_PLUGIN_PROCESS
-
-include_directories(${THIRDPARTY_DIR}/gtest/include)
-
-set(EWK2UnitTests_LIBRARIES
-    ${CAIRO_LIBRARIES}
-    ${ECORE_EVAS_LIBRARIES}
-    ${ECORE_LIBRARIES}
-    ${EVAS_LIBRARIES}
-    ${GLIB_GIO_LIBRARIES}
-    ${GLIB_GOBJECT_LIBRARIES}
-    ${GLIB_GTHREAD_LIBRARIES}
-    ${GLIB_LIBRARIES}
-    ${LIBSOUP_LIBRARIES}
-    WebKit2
-    JavaScriptCore
-    WTF
-    WebCore
-    gtest
-)
-
-if (ENABLE_ECORE_X)
-    list(APPEND EWK2UnitTests_LIBRARIES
-        ${ECORE_X_LIBRARIES}
-    )
-endif ()
-
-set(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests")
-set(TEST_RESOURCES_DIR ${WEBKIT2_EFL_TEST_DIR}/resources)
-set(TEST_EXTENSIONS_DIR ${WEBKIT2_EFL_TEST_DIR}/extensions)
-set(WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/EWebKit2)
-
-add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
-    -DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
-    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
-    -DLIBDIR=\"${LIB_INSTALL_DIR}\"
-    -DLIBEXECDIR=\"${EXEC_INSTALL_DIR}\"
-    -DDATADIR=\"${CMAKE_INSTALL_PREFIX}/share\"
-    -DEXTENSIONMANAGERDIR=\"${CMAKE_INSTALL_PREFIX}/${EWEBKIT_EXTENSION_MANAGER_INSTALL_DIR}\"
-    -DWEBPROCESSNAME=\"WebKitWebProcess\"
-    -DPLUGINPROCESSNAME=\"WebKitPluginProcess\"
-    -DNETWORKPROCESSNAME=\"WebKitNetworkProcess\"
-    -DDATABASEPROCESSNAME=\"WebKitDatabaseProcess\"
-    -DEXTENSIONMANAGERNAME=\"libewebkit_extension_manager.so\"
-    -DGTEST_HAS_RTTI=0
-)
-
-add_library(ewk2UnitTestUtils
-    ${WEBKIT2_EFL_TEST_DIR}/UnitTestUtils/EWK2UnitTestBase.cpp
-    ${WEBKIT2_EFL_TEST_DIR}/UnitTestUtils/EWK2UnitTestEnvironment.cpp
-    ${WEBKIT2_EFL_TEST_DIR}/UnitTestUtils/EWK2UnitTestMain.cpp
-    ${WEBKIT2_EFL_TEST_DIR}/UnitTestUtils/EWK2UnitTestServer.cpp
-)
-
-target_link_libraries(ewk2UnitTestUtils ${EWK2UnitTests_LIBRARIES})
-
-# 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_accessibility
-    test_ewk2_application_cache_manager
-    test_ewk2_auth_request
-    test_ewk2_back_forward_list
-    test_ewk2_color_picker
-    test_ewk2_context
-    test_ewk2_context_history_callbacks
-    test_ewk2_context_menu
-    test_ewk2_cookie_manager
-    test_ewk2_database_manager
-    test_ewk2_download_job
-    test_ewk2_eina_shared_string
-    test_ewk2_favicon_database
-    test_ewk2_file_chooser_request
-    test_ewk2_javascript_binding
-    test_ewk2_object
-    test_ewk2_page
-    test_ewk2_page_group
-    test_ewk2_popup_menu
-    test_ewk2_settings
-    test_ewk2_ssl
-    test_ewk2_storage_manager
-    test_ewk2_text_checker
-    test_ewk2_view
-    test_ewk2_view_configuration
-    test_ewk2_window_features
-)
-
-# Skipped unit tests list:
-#
-# webkit.org/b/107422: test_ewk2_auth_request
-
-if (ENABLE_API_TESTS)
-    foreach (testName ${EWK2UnitTests_BINARIES})
-        add_executable(${testName} ${WEBKIT2_EFL_TEST_DIR}/${testName}.cpp)
-        add_test(${testName} ${WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY}/${testName})
-        set_tests_properties(${testName} PROPERTIES TIMEOUT 60)
-        set_target_properties(${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY})
-        target_link_libraries(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils)
-    endforeach ()
-
-    add_library(ewk2UnitTestExtensionSample SHARED ${TEST_EXTENSIONS_DIR}/extension_sample.cpp)
-    target_link_libraries(ewk2UnitTestExtensionSample ${EINA_LIBRARIES} WebKit2)
-endif ()
-
-if (ENABLE_SPELLCHECK)
-    list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
-        ${ENCHANT_INCLUDE_DIRS}
-    )
-    list(APPEND WebKit2_LIBRARIES
-        ${ENCHANT_LIBRARIES}
-    )
-endif ()
-
-if (ENABLE_ACCESSIBILITY)
-    list(APPEND WebKit2_INCLUDE_DIRECTORIES
-        "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
-    )
-    list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
-        ${ATK_INCLUDE_DIRS}
-    )
-    list(APPEND WebKit2_LIBRARIES
-        ${ATK_LIBRARIES}
-    )
-endif ()
index 745bb71..02a816b 100644 (file)
@@ -39,8 +39,6 @@
 
 #if PLATFORM(GTK)
 #include <gtk/gtk.h>
-#elif PLATFORM(EFL) && HAVE_ECORE_X
-#include <Ecore_X.h>
 #endif
 
 #if defined(XP_UNIX)
@@ -60,11 +58,6 @@ public:
     {
 #if PLATFORM(GTK)
         gtk_init(nullptr, nullptr);
-#elif PLATFORM(EFL)
-#ifdef HAVE_ECORE_X
-        if (!ecore_x_init(0))
-#endif
-            return false;
 #endif
 
         return true;
index a0ad04f..f2cb054 100644 (file)
@@ -192,13 +192,6 @@ public:
         SoupRequestManager,
         SoupCustomProtocolRequestManager,
 #endif
-#if PLATFORM(EFL)
-        PopupMenuItem,
-#if ENABLE(TOUCH_EVENTS)
-        TouchPoint,
-        TouchEvent,
-#endif
-#endif
     };
 
     virtual ~Object()
index e9df787..2e8fbfb 100644 (file)
 #include <WebKit/WKBaseGtk.h>
 #endif
 
-#if defined(BUILDING_EFL__)
-#include <WebKit/WKBaseEfl.h>
-#endif
-
 #if defined(__APPLE__) && !defined(BUILDING_GTK__)
 #include <WebKit/WKBaseMac.h>
 #endif
index b393bc2..864baff 100644 (file)
@@ -336,7 +336,7 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
         return kWKContextMenuItemTagDownloadImageToDisk;
     case WebCore::ContextMenuItemTagCopyImageToClipboard:
         return kWKContextMenuItemTagCopyImageToClipboard;
-#if PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     case WebCore::ContextMenuItemTagCopyImageUrlToClipboard:
         return kWKContextMenuItemTagCopyImageUrlToClipboard;
 #endif
@@ -356,7 +356,7 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
         return kWKContextMenuItemTagCut;
     case WebCore::ContextMenuItemTagPaste:
         return kWKContextMenuItemTagPaste;
-#if PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     case WebCore::ContextMenuItemTagSelectAll:
         return kWKContextMenuItemTagSelectAll;
 #endif
@@ -531,7 +531,7 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag)
     case kWKContextMenuItemTagCopyImageToClipboard:
         return WebCore::ContextMenuItemTagCopyImageToClipboard;
     case kWKContextMenuItemTagOpenFrameInNewWindow:
-#if PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     case kWKContextMenuItemTagCopyImageUrlToClipboard:
         return WebCore::ContextMenuItemTagCopyImageUrlToClipboard;
 #endif
@@ -550,7 +550,7 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag)
         return WebCore::ContextMenuItemTagCut;
     case kWKContextMenuItemTagPaste:
         return WebCore::ContextMenuItemTagPaste;
-#if PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(GTK)
     case kWKContextMenuItemTagSelectAll:
         return WebCore::ContextMenuItemTagSelectAll;
 #endif
index babb3ae..cb1f118 100644 (file)
@@ -39,10 +39,6 @@ struct KeypressCommand;
 }
 #endif
 
-#if PLATFORM(EFL)
-#include <Evas.h>
-#endif
-
 #if PLATFORM(GTK)
 #include "InputMethodFilter.h"
 #include <WebCore/CompositionResults.h>
@@ -64,9 +60,6 @@ public:
 #elif PLATFORM(GTK)
     NativeWebKeyboardEvent(const NativeWebKeyboardEvent&);
     NativeWebKeyboardEvent(GdkEvent*, const WebCore::CompositionResults&, InputMethodFilter::EventFakedForComposition, Vector<String>&& commands);
-#elif PLATFORM(EFL)
-    NativeWebKeyboardEvent(const Evas_Event_Key_Down*, bool);
-    NativeWebKeyboardEvent(const Evas_Event_Key_Up*);
 #elif PLATFORM(IOS)
     NativeWebKeyboardEvent(::WebEvent *);
 #endif
@@ -77,9 +70,6 @@ public:
     GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
     const WebCore::CompositionResults& compositionResults() const  { return m_compositionResults; }
     bool isFakeEventForComposition() const { return m_fakeEventForComposition; }
-#elif PLATFORM(EFL)
-    const void* nativeEvent() const { return m_nativeEvent; }
-    bool isFiltered() const { return m_isFiltered; }
 #elif PLATFORM(IOS)
     ::WebEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #endif
@@ -91,9 +81,6 @@ private:
     GUniquePtr<GdkEvent> m_nativeEvent;
     WebCore::CompositionResults m_compositionResults;
     bool m_fakeEventForComposition;
-#elif PLATFORM(EFL)
-    const void* m_nativeEvent;
-    bool m_isFiltered;
 #elif PLATFORM(IOS)
     RetainPtr<::WebEvent> m_nativeEvent;
 #endif
index a4f95c2..88cd141 100644 (file)
 OBJC_CLASS NSView;
 #endif
 
-#if PLATFORM(EFL)
-#include "WebEventFactory.h"
-#include <Evas.h>
-#include <WebCore/AffineTransform.h>
-#endif
-
 #if PLATFORM(GTK)
 #include <WebCore/GUniquePtrGtk.h>
 typedef union _GdkEvent GdkEvent;
@@ -53,17 +47,12 @@ public:
 #elif PLATFORM(GTK)
     NativeWebMouseEvent(const NativeWebMouseEvent&);
     NativeWebMouseEvent(GdkEvent*, int);
-#elif PLATFORM(EFL)
-    template <typename EvasEventMouse>
-    NativeWebMouseEvent(const EvasEventMouse*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
 #endif
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(GTK)
     const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(EFL)
-    const void* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(IOS)
     const void* nativeEvent() const { return 0; }
 #endif
@@ -73,20 +62,9 @@ private:
     RetainPtr<NSEvent> m_nativeEvent;
 #elif PLATFORM(GTK)
     GUniquePtr<GdkEvent> m_nativeEvent;
-#elif PLATFORM(EFL)
-    const void* m_nativeEvent;
 #endif
 };
 
-#if PLATFORM(EFL)
-template <typename EvasEventMouse>
-NativeWebMouseEvent::NativeWebMouseEvent(const EvasEventMouse* event, const WebCore::AffineTransform& toWebContent, const WebCore::AffineTransform& toDeviceScreen)
-    : WebMouseEvent(WebEventFactory::createWebMouseEvent(event, toWebContent, toDeviceScreen))
-    , m_nativeEvent(event)
-{
-}
-#endif
-
 } // namespace WebKit
 
 #endif // NativeWebMouseEvent_h
index 4add6b5..118124c 100644 (file)
 struct _UIWebTouchEvent;
 #elif PLATFORM(GTK)
 #include <WebCore/GUniquePtrGtk.h>
-#elif PLATFORM(EFL)
-#include "EwkTouchEvent.h"
-#include <WebCore/AffineTransform.h>
-#include <wtf/RefPtr.h>
 #endif
 
 namespace WebKit {
@@ -50,9 +46,6 @@ public:
     NativeWebTouchEvent(GdkEvent*, Vector<WebPlatformTouchPoint>&&);
     NativeWebTouchEvent(const NativeWebTouchEvent&);
     const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(EFL)
-    NativeWebTouchEvent(EwkTouchEvent*, const WebCore::AffineTransform&);
-    const EwkTouchEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #endif
 
 private:
@@ -62,8 +55,6 @@ private:
 
 #if PLATFORM(GTK)
     GUniquePtr<GdkEvent> m_nativeEvent;
-#elif PLATFORM(EFL)
-    RefPtr<EwkTouchEvent> m_nativeEvent;
 #endif
 };
 
index 1533222..5db0bce 100644 (file)
 OBJC_CLASS NSView;
 #endif
 
-#if PLATFORM(EFL)
-#include <Evas.h>
-#include <WebCore/AffineTransform.h>
-#endif
-
 #if PLATFORM(GTK)
 #include <WebCore/GUniquePtrGtk.h>
 typedef union _GdkEvent GdkEvent;
@@ -52,16 +47,12 @@ public:
 #elif PLATFORM(GTK)
     NativeWebWheelEvent(const NativeWebWheelEvent&);
     NativeWebWheelEvent(GdkEvent*);
-#elif PLATFORM(EFL)
-    NativeWebWheelEvent(const Evas_Event_Mouse_Wheel*, const WebCore::AffineTransform& toWebContent, const WebCore::AffineTransform& toDeviceScreen);
 #endif
 
 #if USE(APPKIT)
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(GTK)
     GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
-#elif PLATFORM(EFL)
-    const Evas_Event_Mouse_Wheel* nativeEvent() const { return m_nativeEvent; }
 #elif PLATFORM(IOS)
     const void* nativeEvent() const { return 0; }
 #endif
@@ -71,8 +62,6 @@ private:
     RetainPtr<NSEvent> m_nativeEvent;
 #elif PLATFORM(GTK)
     GUniquePtr<GdkEvent> m_nativeEvent;
-#elif PLATFORM(EFL)
-    const Evas_Event_Mouse_Wheel* m_nativeEvent;
 #endif
 };
 
index acfcf00..a1a0ed9 100644 (file)
@@ -186,9 +186,6 @@ void NetscapePluginModule::determineQuirks()
 #if CPU(X86_64)
             m_pluginQuirks.add(PluginQuirks::IgnoreRightClickInWindowlessMode);
 #endif
-#if PLATFORM(EFL)
-            m_pluginQuirks.add(PluginQuirks::ForceFlashWindowlessMode);
-#endif
             m_pluginQuirks.add(PluginQuirks::DoNotCancelSrcStreamInWindowedMode);
             break;
         }
index a48545d..846a08f 100644 (file)
 #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
 #endif
 
-#if PLATFORM(EFL)
-#define DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED true
-#else
-#define DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED false
-#endif
-
 #if ENABLE(SMOOTH_SCROLLING)
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
 #else
     macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, "Shadow DOM", "HTML Shadow DOM prototype") \
     macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, true, "", "") \
     macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, true, "", "") \
-    macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, "", "") \
+    macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, false, "", "") \
     macro(ApplePayEnabled, applePayEnabled, Bool, bool, false, "", "") \
     macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
     macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, true, "", "") \
     macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji", "", "") \
     \
 
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times", "", "") \
index 0155533..5c78ccd 100644 (file)
@@ -84,7 +84,7 @@ void WebsiteDataStore::registerSharedResourceLoadObserver()
     m_websiteDataStore->registerSharedResourceLoadObserver();
 }
     
-#if !PLATFORM(COCOA) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
 WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
 {
     // FIXME: Fill everything in.
index 7946cac..392a342 100644 (file)
@@ -557,8 +557,4 @@ inline ProxyingRefPtr<WebGrammarDetail> toAPI(const WebCore::GrammarDetail& gram
 #include "WKAPICastGtk.h"
 #endif
 
-#if defined(BUILDING_EFL__)
-#include "WKAPICastEfl.h"
-#endif
-
 #endif // WKAPICast_h
index c8eabac..c8e7560 100644 (file)
@@ -27,7 +27,7 @@
 #include "WKTextChecker.h"
 #include "TextChecker.h"
 
-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
+#if defined(BUILDING_GTK__)
 #include "WKAPICast.h"
 #include "WebPageProxy.h"
 #include "WebTextChecker.h"
@@ -40,7 +40,7 @@ void WKTextCheckerSetTestingMode(bool enabled)
     TextChecker::setTestingMode(enabled);
 }
 
-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
+#if defined(BUILDING_GTK__)
 
 void WKTextCheckerSetClient(const WKTextCheckerClientBase* wkClient)
 {
index e2c4675..f52d9c7 100644 (file)
@@ -34,7 +34,7 @@ extern "C" {
 
 WK_EXPORT void WKTextCheckerSetTestingMode(bool enabled);
 
-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
+#if defined(BUILDING_GTK__)
 
 // TextChecker Client
 typedef bool (*WKTextCheckerContinousSpellCheckingAllowed)(const void *clientInfo);
index d58870e..dd8aef5 100644 (file)
@@ -55,7 +55,7 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
     if (m_alwaysRunsAtBackgroundPriority)
         launchOptions.extraInitializationData.add(ASCIILiteral("always-runs-at-background-priority"), "true");
 
-#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
     const char* varname;
     switch (launchOptions.processType) {
     case ProcessLauncher::ProcessType::Web:
@@ -79,7 +79,7 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
     const char* processCmdPrefix = getenv(varname);
     if (processCmdPrefix && *processCmdPrefix)
         launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
-#endif // !defined(NDEBUG) && (PLATFORM(GTK) || PLATFORM(EFL)
+#endif // ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
 }
 
 void ChildProcessProxy::connect()
index e8ff7d5..89488e3 100644 (file)
@@ -86,25 +86,6 @@ static inline bool isIntegral(float value)
 
 FloatPoint PageViewportController::pixelAlignedFloatPoint(const FloatPoint& framePosition)
 {
-#if PLATFORM(EFL)
-    float effectiveScale = m_pageScaleFactor * deviceScaleFactor();
-    if (!isIntegral(effectiveScale)) {
-        // To avoid blurryness, modify the position so that it maps into a discrete device position.
-        FloatPoint scaledPos(framePosition);
-
-        // Scale by the effective scale factor to compute the screen-relative position.
-        scaledPos.scale(effectiveScale, effectiveScale);
-
-        // Round to integer boundaries.
-        FloatPoint alignedPos = roundedIntPoint(scaledPos);
-
-        // Convert back to CSS coordinates.
-        alignedPos.scale(1 / effectiveScale, 1 / effectiveScale);
-
-        return alignedPos;
-    }
-#endif
-
     return framePosition;
 }
 
index e7ee2da..939a7e2 100644 (file)
@@ -60,7 +60,7 @@ private:
     void didCloseWebSocketConnection(WebSocketServerConnection*) final;
 
     bool platformResourceForPath(const String& path, Vector<char>& data, String& contentType);
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
     void buildPageList(Vector<char>& data, String& contentType);
 #endif
 
index fe65cb2..3995069 100644 (file)
@@ -60,7 +60,7 @@ public:
         ProcessType processType;
         HashMap<String, String> extraInitializationData;
 
-#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
         String processCmdPrefix;
 #endif
     };
index 4a572df..a5467f9 100644 (file)
@@ -148,10 +148,6 @@ public:
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&) = 0;
 #endif
 
-#if PLATFORM(EFL)
-    virtual void updateTextInputState() = 0;
-#endif // PLATFORM(EFL)
-
     virtual void handleDownloadRequest(DownloadProxy*) = 0;
 
     virtual bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) { return false; }
index a6c52f8..70bb125 100644 (file)
@@ -37,7 +37,7 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
 #include <glib.h>
 #include <wtf/glib/GUniquePtr.h>
 #endif
@@ -78,7 +78,7 @@ static bool pluginRequiresGtk2(const String& pluginPath)
 #if PLUGIN_ARCHITECTURE(X11)
 bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
 {
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
     String pluginProcessPath = executablePathOfPluginProcess();
 
 #if PLATFORM(GTK)
@@ -149,9 +149,9 @@ bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData&
     result.requiresGtk2 = requiresGtk2;
 #endif
     return !result.mimeDescription.isEmpty();
-#else // PLATFORM(GTK) || PLATFORM(EFL)
+#else // PLATFORM(GTK)
     return false;
-#endif // PLATFORM(GTK) || PLATFORM(EFL)
+#endif // PLATFORM(GTK)
 }
 #endif // PLUGIN_ARCHITECTURE(X11)
 
index 7f413ab..826c98a 100644 (file)
@@ -53,11 +53,6 @@ OBJC_CLASS WKWebViewConfiguration;
 #include "WebInspectorClientGtk.h"
 #endif
 
-#if PLATFORM(EFL)
-#include <Ecore_Evas.h>
-#include <Evas.h>
-#endif
-
 namespace WebCore {
 class URL;
 }
@@ -227,11 +222,8 @@ private:
 
     WebPreferences& inspectorPagePreferences() const;
 
-#if PLATFORM(GTK) || PLATFORM(EFL)
-    void createInspectorWindow();
-#endif
-
 #if PLATFORM(GTK)
+    void createInspectorWindow();
     void updateInspectorWindowTitle() const;
 #endif
 
@@ -265,9 +257,6 @@ private:
     GtkWidget* m_inspectorWindow { nullptr };
     GtkWidget* m_headerBar { nullptr };
     String m_inspectedURLString;
-#elif PLATFORM(EFL)
-    Evas_Object* m_inspectorView { nullptr };
-    Ecore_Evas* m_inspectorWindow { nullptr };
 #endif
 #if ENABLE(INSPECTOR_SERVER)
     int m_remoteInspectionPageId { 0 };
index 73a7fe8..ea730d0 100644 (file)
@@ -569,9 +569,6 @@ public:
     void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
     void commitPageTransitionViewport();
 #endif
-#if PLATFORM(EFL)
-    void setThemePath(const String&);
-#endif
 
 #if PLATFORM(GTK)
     void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
@@ -630,13 +627,6 @@ public:
     CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const;
 #endif // PLATFORM(MAC)
 
-#if PLATFORM(EFL)
-    void handleInputMethodKeydown(bool& handled);
-    void confirmComposition(const String&);
-    void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
-    void cancelComposition();
-#endif
-
 #if PLATFORM(GTK)
     PlatformWidget viewWidget();
     const WebCore::Color& backgroundColor() const { return m_backgroundColor; }
@@ -1114,12 +1104,6 @@ public:
     void setFooterBannerHeightForTesting(int);
 #endif
 
-#if PLATFORM(EFL) && HAVE(ACCESSIBILITY) && defined(HAVE_ECORE_X)
-    bool accessibilityObjectReadByPoint(const WebCore::IntPoint&);
-    bool accessibilityObjectReadPrevious();
-    bool accessibilityObjectReadNext();
-#endif
-
 #if USE(UNIFIED_TEXT_CHECKING)
     void checkTextOfParagraph(const String& text, uint64_t checkingTypes, int32_t insertionPoint, Vector<WebCore::TextCheckingResult>& results);
 #endif
@@ -1397,9 +1381,6 @@ private:
     void getEditorCommandsForKeyEvent(const AtomicString&, Vector<String>&);
     void bindAccessibilityTree(const String&);
 #endif
-#if PLATFORM(EFL)
-    void getEditorCommandsForKeyEvent(Vector<String>&);
-#endif
 
     // Popup Menu.
     void showPopupMenu(const WebCore::IntRect& rect, uint64_t textDirection, const Vector<WebPopupItem>& items, int32_t selectedIndex, const PlatformPopupMenuData&);
index 71f40fb..37f627f 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UUSE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o \"${WKBASE_H}\".unifdef \"${WKBASE_H}\"\n\ncase $? in\n0)\n    rm \"${WKBASE_H}\".unifdef\n    ;;\n1)\n    mv \"${WKBASE_H}\"{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
+                       shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UUSE_SOUP -o \"${WKBASE_H}\".unifdef \"${WKBASE_H}\"\n\ncase $? in\n0)\n    rm \"${WKBASE_H}\".unifdef\n    ;;\n1)\n    mv \"${WKBASE_H}\"{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
                };
                37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */ = {
                        isa = PBXShellScriptBuildPhase;
index 80c087c..4794a68 100644 (file)
 typedef struct _GModule GModule;
 #endif
 
-#if PLATFORM(EFL)
-#include <Eina.h>
-#endif
-
 #if USE(FOUNDATION)
 OBJC_CLASS NSBundle;
 OBJC_CLASS NSMutableDictionary;
@@ -67,8 +63,6 @@ namespace WebKit {
 typedef NSBundle *PlatformBundle;
 #elif PLATFORM(GTK)
 typedef ::GModule* PlatformBundle;
-#elif PLATFORM(EFL)
-typedef Eina_Module* PlatformBundle;
 #endif
 
 class InjectedBundleScriptWorld;
index d009491..2bed46a 100644 (file)
@@ -44,8 +44,6 @@
 #endif
 #include <gdk/gdkx.h>
 #include <WebCore/GtkVersioning.h>
-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-#include <Ecore_X.h>
 #endif
 
 #if USE(CAIRO)
@@ -69,8 +67,6 @@ static Display* getPluginDisplay()
     // Since we're a gdk/gtk app, we'll (probably?) have the same X connection as any gdk-based
     // plugins, so we can return that. We might want to add other implementations here later.
     return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-    return static_cast<Display*>(ecore_x_display_get());
 #else
     return nullptr;
 #endif
@@ -80,8 +76,6 @@ static inline int x11Screen()
 {
 #if PLATFORM(GTK)
     return gdk_screen_get_number(gdk_screen_get_default());
-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-    return ecore_x_screen_index_get(ecore_x_default_screen_get());
 #else
     return 0;
 #endif
@@ -91,8 +85,6 @@ static inline int displayDepth()
 {
 #if PLATFORM(GTK)
     return gdk_visual_get_depth(gdk_screen_get_system_visual(gdk_screen_get_default()));
-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-    return ecore_x_default_depth_get(x11HostDisplay(), ecore_x_default_screen_get());
 #else
     return 0;
 #endif
@@ -102,8 +94,6 @@ static inline unsigned long rootWindowID()
 {
 #if PLATFORM(GTK)
     return GDK_ROOT_WINDOW();
-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-    return ecore_x_window_root_first_get();
 #else
     return 0;
 #endif
@@ -302,7 +292,7 @@ void NetscapePluginX11::paint(GraphicsContext& context, const IntRect& dirtyRect
     if (m_pluginDisplay != x11HostDisplay())
         XSync(m_pluginDisplay, false);
 
-#if PLATFORM(GTK) || (PLATFORM(EFL) && USE(CAIRO))
+#if PLATFORM(GTK)
     RefPtr<cairo_surface_t> drawableSurface = adoptRef(cairo_xlib_surface_create(m_pluginDisplay, m_drawable.get(),
         m_setWindowCallbackStruct.visual, m_plugin.size().width(), m_plugin.size().height()));
     cairo_t* cr = context.platformContext()->cr();
index 807764d..0912808 100644 (file)
@@ -822,11 +822,7 @@ bool WebChromeClient::shouldNotifyOnFormChanges()
 
 bool WebChromeClient::selectItemWritingDirectionIsNatural()
 {
-#if PLATFORM(EFL)
-    return true;
-#else
     return false;
-#endif
 }
 
 bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
@@ -1015,7 +1011,7 @@ Color WebChromeClient::underlayColor() const
 
 void WebChromeClient::pageExtendedBackgroundColorDidChange(Color backgroundColor) const
 {
-#if PLATFORM(MAC) || PLATFORM(EFL)
+#if PLATFORM(MAC)
     m_page.send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(backgroundColor));
 #else
     UNUSED_PARAM(backgroundColor);
index 8b80755..a3c9ad9 100644 (file)
@@ -297,7 +297,7 @@ void WebEditorClient::redo()
     m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(static_cast<uint32_t>(WebPageProxy::Redo)), Messages::WebPageProxy::ExecuteUndoRedo::Reply(result));
 }
 
-#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(EFL)
+#if !PLATFORM(GTK) && !PLATFORM(COCOA)
 void WebEditorClient::handleKeyboardEvent(KeyboardEvent* event)
 {
     if (m_page->handleEditingKeyboardEvent(event))
@@ -437,7 +437,7 @@ void WebEditorClient::textWillBeDeletedInTextField(Element* element)
 bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType type) const
 {
     // This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
-#if PLATFORM(COCOA) || PLATFORM(EFL)
+#if PLATFORM(COCOA)
     return type != TextCheckingTypeSpelling;
 #else
     UNUSED_PARAM(type);
index 060cd2f..a856ff9 100644 (file)
@@ -1210,7 +1210,7 @@ void WebFrameLoaderClient::frameLoadCompleted()
 
 void WebFrameLoaderClient::saveViewStateToItem(HistoryItem& historyItem)
 {
-#if PLATFORM(IOS) || PLATFORM(EFL)
+#if PLATFORM(IOS)
     if (m_frame->isMainFrame())
         m_frame->page()->savePageState(historyItem);
 #else
@@ -1220,7 +1220,7 @@ void WebFrameLoaderClient::saveViewStateToItem(HistoryItem& historyItem)
 
 void WebFrameLoaderClient::restoreViewState()
 {
-#if PLATFORM(IOS) || PLATFORM(EFL)
+#if PLATFORM(IOS)
     Frame& frame = *m_frame->coreFrame();
     HistoryItem* currentItem = frame.loader().history().currentItem();
     if (FrameView* view = frame.view()) {
@@ -1613,7 +1613,7 @@ void WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&
     if (automationSessionProxy && world.isNormal())
         automationSessionProxy->didClearWindowObjectForFrame(*m_frame);
 
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
     // Ensure the accessibility hierarchy is updated.
     webPage->updateAccessibilityTree();
 #endif
index ac877f6..a5175c0 100644 (file)
@@ -330,7 +330,7 @@ WebPage::WebPage(uint64_t pageID, WebPageCreationParameters&& parameters)
     , m_layerHostingMode(parameters.layerHostingMode)
 #if PLATFORM(COCOA)
     , m_viewGestureGeometryCollector(*this)
-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
     , m_accessibilityObject(nullptr)
 #endif
     , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
index 7240bbd..658cda4 100644 (file)
@@ -78,7 +78,7 @@
 #include <wtf/Seconds.h>
 #include <wtf/text/WTFString.h>
 
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
 #include "WebPageAccessibilityObject.h"
 #include <wtf/glib/GRefPtr.h>
 #endif
@@ -498,7 +498,7 @@ public:
     GeolocationPermissionRequestManager& geolocationPermissionRequestManager() { return m_geolocationPermissionRequestManager; }
 #endif
 
-#if PLATFORM(IOS) || PLATFORM(EFL)
+#if PLATFORM(IOS)
     void savePageState(WebCore::HistoryItem&);
     void restorePageState(const WebCore::HistoryItem&);
 #endif
@@ -648,10 +648,6 @@ public:
 
     SandboxExtensionTracker& sandboxExtensionTracker() { return m_sandboxExtensionTracker; }
 
-#if PLATFORM(EFL)
-    void setThemePath(const String&);
-#endif
-
 #if PLATFORM(GTK)
     void setComposition(const String& text, const Vector<WebCore::CompositionUnderline>& underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeLength);
     void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);
@@ -701,14 +697,9 @@ public:
 #if ENABLE(SERVICE_CONTROLS)
     void replaceSelectionWithPasteboardData(const Vector<String>& types, const IPC::DataReference&);
 #endif
-
-#elif PLATFORM(EFL)
-    void confirmComposition(const String& compositionString);
-    void setComposition(const WTF::String& compositionString, const WTF::Vector<WebCore::CompositionUnderline>& underlines, uint64_t cursorPosition);
-    void cancelComposition();
 #endif
 
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
     void updateAccessibilityTree();
 #endif
 
@@ -1337,7 +1328,7 @@ private:
 
     RetainPtr<NSDictionary> m_dataDetectionContext;
 
-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
     GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
 #endif
 
index 23939c1..fb30be5 100644 (file)
@@ -341,10 +341,6 @@ messages -> WebPage LegacyReceiver {
     SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
     SetCanRunModal(bool canRunModal)
 
-#if PLATFORM(EFL)
-    SetThemePath(String themePath)
-#endif
-
 #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
     CommitPageTransitionViewport()
 #endif
@@ -396,11 +392,6 @@ messages -> WebPage LegacyReceiver {
     SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
     SetAutoSizingShouldExpandToViewHeight(bool shouldExpand)
 
-#if PLATFORM(EFL)
-    ConfirmComposition(String compositionString)
-    SetComposition(String compositionString, Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
-    CancelComposition()
-#endif
 #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
     FindZoomableAreaForPoint(WebCore::IntPoint point, WebCore::IntSize area)
 #endif
index 5649250..c63d1a2 100644 (file)
@@ -48,7 +48,7 @@
 #ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
 #if PLATFORM(MAC)
 #define PLUGIN_ARCHITECTURE_MAC 1
-#elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X)) && PLATFORM(X11)
+#elif PLATFORM(GTK) && PLATFORM(X11) && OS(UNIX) && !OS(MAC_OS_X)
 #define PLUGIN_ARCHITECTURE_X11 1
 #else
 #define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
@@ -58,7 +58,7 @@
 #define PLUGIN_ARCHITECTURE(ARCH) (defined PLUGIN_ARCHITECTURE_##ARCH && PLUGIN_ARCHITECTURE_##ARCH)
 
 #ifndef ENABLE_INSPECTOR_SERVER
-#if ENABLE(WEB_SOCKETS) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(WEB_SOCKETS) && PLATFORM(GTK)
 #define ENABLE_INSPECTOR_SERVER 1
 #endif
 #endif