<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212557] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212557">212557</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2017-02-17 11:10:39 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformModuleh">trunk/Source/WebKit2/Platform/Module.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessunixPluginProcessMainUnixcpp">trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebKeyboardEventh">trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebMouseEventh">trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebTouchEventh">trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebWheelEventh">trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKTextCheckercpp">trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKTextCheckerh">trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessChildProcessProxycpp">trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebInspectorServerh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxyh">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapex11NetscapePluginX11cpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-02-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop backing up localStorage databases to iCloud by default.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -149,8 +149,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> m_socketMonitor.stop();
</span><del>-#elif PLATFORM(EFL)
- m_connectionQueue->unregisterSocketEventHandler(m_socketDescriptor);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_socketDescriptor = -1;
</span><span class="lines">@@ -382,11 +380,6 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return G_SOURCE_REMOVE;
</span><span class="cx"> });
</span><del>-#elif PLATFORM(EFL)
- m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
- [protectedThis] {
- protectedThis->readyReadHandler();
- });
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal handler.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Module.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/Module.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Platform/Module.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -37,11 +37,6 @@
</span><span class="cx"> typedef struct _GModule GModule;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Eina.h>
-#include <wtf/efl/UniquePtrEfl.h>
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class Module {
</span><span class="lines">@@ -76,8 +71,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> GModule* m_handle;
</span><del>-#elif PLATFORM(EFL)
- EflUniquePtr<Eina_Module> m_module;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/PlatformEfl.cmake (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -1,568 +0,0 @@
</span><del>-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 ()
</del></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessunixPluginProcessMainUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -39,8 +39,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#elif PLATFORM(EFL) && HAVE_ECORE_X
-#include <Ecore_X.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(XP_UNIX)
</span><span class="lines">@@ -60,12 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> gtk_init(nullptr, nullptr);
</span><del>-#elif PLATFORM(EFL)
-#ifdef HAVE_ECORE_X
- if (!ecore_x_init(0))
</del><span class="cx"> #endif
</span><del>- return false;
-#endif
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -192,13 +192,6 @@
</span><span class="cx"> SoupRequestManager,
</span><span class="cx"> SoupCustomProtocolRequestManager,
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- PopupMenuItem,
-#if ENABLE(TOUCH_EVENTS)
- TouchPoint,
- TouchEvent,
-#endif
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~Object()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> #include <WebKit/WKBaseGtk.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(BUILDING_EFL__)
-#include <WebKit/WKBaseEfl.h>
-#endif
-
</del><span class="cx"> #if defined(__APPLE__) && !defined(BUILDING_GTK__)
</span><span class="cx"> #include <WebKit/WKBaseMac.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> return kWKContextMenuItemTagDownloadImageToDisk;
</span><span class="cx"> case WebCore::ContextMenuItemTagCopyImageToClipboard:
</span><span class="cx"> return kWKContextMenuItemTagCopyImageToClipboard;
</span><del>-#if PLATFORM(EFL) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> case WebCore::ContextMenuItemTagCopyImageUrlToClipboard:
</span><span class="cx"> return kWKContextMenuItemTagCopyImageUrlToClipboard;
</span><span class="cx"> #endif
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> return kWKContextMenuItemTagCut;
</span><span class="cx"> case WebCore::ContextMenuItemTagPaste:
</span><span class="cx"> return kWKContextMenuItemTagPaste;
</span><del>-#if PLATFORM(EFL) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> case WebCore::ContextMenuItemTagSelectAll:
</span><span class="cx"> return kWKContextMenuItemTagSelectAll;
</span><span class="cx"> #endif
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> case kWKContextMenuItemTagCopyImageToClipboard:
</span><span class="cx"> return WebCore::ContextMenuItemTagCopyImageToClipboard;
</span><span class="cx"> case kWKContextMenuItemTagOpenFrameInNewWindow:
</span><del>-#if PLATFORM(EFL) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> case kWKContextMenuItemTagCopyImageUrlToClipboard:
</span><span class="cx"> return WebCore::ContextMenuItemTagCopyImageUrlToClipboard;
</span><span class="cx"> #endif
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> return WebCore::ContextMenuItemTagCut;
</span><span class="cx"> case kWKContextMenuItemTagPaste:
</span><span class="cx"> return WebCore::ContextMenuItemTagPaste;
</span><del>-#if PLATFORM(EFL) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> case kWKContextMenuItemTagSelectAll:
</span><span class="cx"> return WebCore::ContextMenuItemTagSelectAll;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -39,10 +39,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Evas.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include "InputMethodFilter.h"
</span><span class="cx"> #include <WebCore/CompositionResults.h>
</span><span class="lines">@@ -64,9 +60,6 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> NativeWebKeyboardEvent(const NativeWebKeyboardEvent&);
</span><span class="cx"> NativeWebKeyboardEvent(GdkEvent*, const WebCore::CompositionResults&, InputMethodFilter::EventFakedForComposition, Vector<String>&& commands);
</span><del>-#elif PLATFORM(EFL)
- NativeWebKeyboardEvent(const Evas_Event_Key_Down*, bool);
- NativeWebKeyboardEvent(const Evas_Event_Key_Up*);
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> NativeWebKeyboardEvent(::WebEvent *);
</span><span class="cx"> #endif
</span><span class="lines">@@ -77,9 +70,6 @@
</span><span class="cx"> GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><span class="cx"> const WebCore::CompositionResults& compositionResults() const { return m_compositionResults; }
</span><span class="cx"> bool isFakeEventForComposition() const { return m_fakeEventForComposition; }
</span><del>-#elif PLATFORM(EFL)
- const void* nativeEvent() const { return m_nativeEvent; }
- bool isFiltered() const { return m_isFiltered; }
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> ::WebEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -91,9 +81,6 @@
</span><span class="cx"> GUniquePtr<GdkEvent> m_nativeEvent;
</span><span class="cx"> WebCore::CompositionResults m_compositionResults;
</span><span class="cx"> bool m_fakeEventForComposition;
</span><del>-#elif PLATFORM(EFL)
- const void* m_nativeEvent;
- bool m_isFiltered;
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> RetainPtr<::WebEvent> m_nativeEvent;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -33,12 +33,6 @@
</span><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include "WebEventFactory.h"
-#include <Evas.h>
-#include <WebCore/AffineTransform.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="lines">@@ -53,9 +47,6 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> NativeWebMouseEvent(const NativeWebMouseEvent&);
</span><span class="cx"> NativeWebMouseEvent(GdkEvent*, int);
</span><del>-#elif PLATFORM(EFL)
- template <typename EvasEventMouse>
- NativeWebMouseEvent(const EvasEventMouse*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -62,8 +53,6 @@
</span><span class="cx"> NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><del>-#elif PLATFORM(EFL)
- const void* nativeEvent() const { return m_nativeEvent; }
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> const void* nativeEvent() const { return 0; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -73,20 +62,9 @@
</span><span class="cx"> RetainPtr<NSEvent> m_nativeEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> GUniquePtr<GdkEvent> m_nativeEvent;
</span><del>-#elif PLATFORM(EFL)
- const void* m_nativeEvent;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // NativeWebMouseEvent_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebTouchEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> struct _UIWebTouchEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><del>-#elif PLATFORM(EFL)
-#include "EwkTouchEvent.h"
-#include <WebCore/AffineTransform.h>
-#include <wtf/RefPtr.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -50,9 +46,6 @@
</span><span class="cx"> NativeWebTouchEvent(GdkEvent*, Vector<WebPlatformTouchPoint>&&);
</span><span class="cx"> NativeWebTouchEvent(const NativeWebTouchEvent&);
</span><span class="cx"> const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><del>-#elif PLATFORM(EFL)
- NativeWebTouchEvent(EwkTouchEvent*, const WebCore::AffineTransform&);
- const EwkTouchEvent* nativeEvent() const { return m_nativeEvent.get(); }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -62,8 +55,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> GUniquePtr<GdkEvent> m_nativeEvent;
</span><del>-#elif PLATFORM(EFL)
- RefPtr<EwkTouchEvent> m_nativeEvent;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -33,11 +33,6 @@
</span><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Evas.h>
-#include <WebCore/AffineTransform.h>
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="lines">@@ -52,8 +47,6 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> NativeWebWheelEvent(const NativeWebWheelEvent&);
</span><span class="cx"> NativeWebWheelEvent(GdkEvent*);
</span><del>-#elif PLATFORM(EFL)
- NativeWebWheelEvent(const Evas_Event_Mouse_Wheel*, const WebCore::AffineTransform& toWebContent, const WebCore::AffineTransform& toDeviceScreen);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -60,8 +53,6 @@
</span><span class="cx"> NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><del>-#elif PLATFORM(EFL)
- const Evas_Event_Mouse_Wheel* nativeEvent() const { return m_nativeEvent; }
</del><span class="cx"> #elif PLATFORM(IOS)
</span><span class="cx"> const void* nativeEvent() const { return 0; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -71,8 +62,6 @@
</span><span class="cx"> RetainPtr<NSEvent> m_nativeEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> GUniquePtr<GdkEvent> m_nativeEvent;
</span><del>-#elif PLATFORM(EFL)
- const Evas_Event_Mouse_Wheel* m_nativeEvent;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -186,9 +186,6 @@
</span><span class="cx"> #if CPU(X86_64)
</span><span class="cx"> m_pluginQuirks.add(PluginQuirks::IgnoreRightClickInWindowlessMode);
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- m_pluginQuirks.add(PluginQuirks::ForceFlashWindowlessMode);
-#endif
</del><span class="cx"> m_pluginQuirks.add(PluginQuirks::DoNotCancelSrcStreamInWindowedMode);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -31,12 +31,6 @@
</span><span class="cx"> #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#define DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED true
-#else
-#define DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED false
-#endif
-
</del><span class="cx"> #if ENABLE(SMOOTH_SCROLLING)
</span><span class="cx"> #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
</span><span class="cx"> #else
</span><span class="lines">@@ -233,7 +227,7 @@
</span><span class="cx"> macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true, "Shadow DOM", "HTML Shadow DOM prototype") \
</span><span class="cx"> macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, true, "", "") \
</span><del>- macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, "", "") \
</del><ins>+ macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, false, "", "") \
</ins><span class="cx"> macro(ApplePayEnabled, applePayEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
</span><span class="cx"> macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, true, "", "") \
</span><span class="lines">@@ -345,7 +339,7 @@
</span><span class="cx"> macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji", "", "") \
</span><span class="cx"> \
</span><span class="cx">
</span><del>-#elif PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#elif PLATFORM(GTK)
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
</span><span class="cx"> macro(StandardFontFamily, standardFontFamily, String, String, "Times", "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> m_websiteDataStore->registerSharedResourceLoadObserver();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA) && !PLATFORM(EFL) && !PLATFORM(GTK)
</del><ins>+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
</ins><span class="cx"> WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Fill everything in.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -557,8 +557,4 @@
</span><span class="cx"> #include "WKAPICastGtk.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(BUILDING_EFL__)
-#include "WKAPICastEfl.h"
-#endif
-
</del><span class="cx"> #endif // WKAPICast_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKTextCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "WKTextChecker.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx">
</span><del>-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
</del><ins>+#if defined(BUILDING_GTK__)
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebTextChecker.h"
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> TextChecker::setTestingMode(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
</del><ins>+#if defined(BUILDING_GTK__)
</ins><span class="cx">
</span><span class="cx"> void WKTextCheckerSetClient(const WKTextCheckerClientBase* wkClient)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKTextCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKTextChecker.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKTextCheckerSetTestingMode(bool enabled);
</span><span class="cx">
</span><del>-#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__)
</del><ins>+#if defined(BUILDING_GTK__)
</ins><span class="cx">
</span><span class="cx"> // TextChecker Client
</span><span class="cx"> typedef bool (*WKTextCheckerContinousSpellCheckingAllowed)(const void *clientInfo);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessChildProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (m_alwaysRunsAtBackgroundPriority)
</span><span class="cx"> launchOptions.extraInitializationData.add(ASCIILiteral("always-runs-at-background-priority"), "true");
</span><span class="cx">
</span><del>-#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
</ins><span class="cx"> const char* varname;
</span><span class="cx"> switch (launchOptions.processType) {
</span><span class="cx"> case ProcessLauncher::ProcessType::Web:
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> const char* processCmdPrefix = getenv(varname);
</span><span class="cx"> if (processCmdPrefix && *processCmdPrefix)
</span><span class="cx"> launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
</span><del>-#endif // !defined(NDEBUG) && (PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#endif // ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ChildProcessProxy::connect()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsPageViewportControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -86,25 +86,6 @@
</span><span class="cx">
</span><span class="cx"> FloatPoint PageViewportController::pixelAlignedFloatPoint(const FloatPoint& framePosition)
</span><span class="cx"> {
</span><del>-#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
-
</del><span class="cx"> return framePosition;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebInspectorServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void didCloseWebSocketConnection(WebSocketServerConnection*) final;
</span><span class="cx">
</span><span class="cx"> bool platformResourceForPath(const String& path, Vector<char>& data, String& contentType);
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> void buildPageList(Vector<char>& data, String& contentType);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> ProcessType processType;
</span><span class="cx"> HashMap<String, String> extraInitializationData;
</span><span class="cx">
</span><del>-#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if ENABLE(DEVELOPER_MODE) && PLATFORM(GTK)
</ins><span class="cx"> String processCmdPrefix;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupCustomProtocolManagerProxySoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include <WebCore/ErrorsGtk.h>
</span><del>-#elif PLATFORM(EFL)
-#include <WebCore/ErrorsEfl.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -148,10 +148,6 @@
</span><span class="cx"> virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- virtual void updateTextInputState() = 0;
-#endif // PLATFORM(EFL)
-
</del><span class="cx"> virtual void handleDownloadRequest(DownloadProxy*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool handleRunOpenPanel(WebPageProxy*, WebFrameProxy*, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) { return false; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
</span><span class="cx"> {
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> String pluginProcessPath = executablePathOfPluginProcess();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -149,9 +149,9 @@
</span><span class="cx"> result.requiresGtk2 = requiresGtk2;
</span><span class="cx"> #endif
</span><span class="cx"> return !result.mimeDescription.isEmpty();
</span><del>-#else // PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#else // PLATFORM(GTK)
</ins><span class="cx"> return false;
</span><del>-#endif // PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#endif // PLATFORM(GTK)
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLUGIN_ARCHITECTURE(X11)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -53,11 +53,6 @@
</span><span class="cx"> #include "WebInspectorClientGtk.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Ecore_Evas.h>
-#include <Evas.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class URL;
</span><span class="cx"> }
</span><span class="lines">@@ -227,11 +222,8 @@
</span><span class="cx">
</span><span class="cx"> WebPreferences& inspectorPagePreferences() const;
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> void createInspectorWindow();
</span><del>-#endif
-
-#if PLATFORM(GTK)
</del><span class="cx"> void updateInspectorWindowTitle() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -265,9 +257,6 @@
</span><span class="cx"> GtkWidget* m_inspectorWindow { nullptr };
</span><span class="cx"> GtkWidget* m_headerBar { nullptr };
</span><span class="cx"> String m_inspectedURLString;
</span><del>-#elif PLATFORM(EFL)
- Evas_Object* m_inspectorView { nullptr };
- Ecore_Evas* m_inspectorWindow { nullptr };
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx"> int m_remoteInspectionPageId { 0 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -569,9 +569,6 @@
</span><span class="cx"> void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect);
</span><span class="cx"> void commitPageTransitionViewport();
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- void setThemePath(const String&);
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
</span><span class="lines">@@ -630,13 +627,6 @@
</span><span class="cx"> CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const;
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- void handleInputMethodKeydown(bool& handled);
- void confirmComposition(const String&);
- void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
- void cancelComposition();
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> PlatformWidget viewWidget();
</span><span class="cx"> const WebCore::Color& backgroundColor() const { return m_backgroundColor; }
</span><span class="lines">@@ -1114,12 +1104,6 @@
</span><span class="cx"> void setFooterBannerHeightForTesting(int);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL) && HAVE(ACCESSIBILITY) && defined(HAVE_ECORE_X)
- bool accessibilityObjectReadByPoint(const WebCore::IntPoint&);
- bool accessibilityObjectReadPrevious();
- bool accessibilityObjectReadNext();
-#endif
-
</del><span class="cx"> #if USE(UNIFIED_TEXT_CHECKING)
</span><span class="cx"> void checkTextOfParagraph(const String& text, uint64_t checkingTypes, int32_t insertionPoint, Vector<WebCore::TextCheckingResult>& results);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1397,9 +1381,6 @@
</span><span class="cx"> void getEditorCommandsForKeyEvent(const AtomicString&, Vector<String>&);
</span><span class="cx"> void bindAccessibilityTree(const String&);
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- void getEditorCommandsForKeyEvent(Vector<String>&);
-#endif
</del><span class="cx">
</span><span class="cx"> // Popup Menu.
</span><span class="cx"> void showPopupMenu(const WebCore::IntRect& rect, uint64_t textDirection, const Vector<WebPopupItem>& items, int32_t selectedIndex, const PlatformPopupMenuData&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -9216,7 +9216,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> typedef struct _GModule GModule;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Eina.h>
-#endif
-
</del><span class="cx"> #if USE(FOUNDATION)
</span><span class="cx"> OBJC_CLASS NSBundle;
</span><span class="cx"> OBJC_CLASS NSMutableDictionary;
</span><span class="lines">@@ -67,8 +63,6 @@
</span><span class="cx"> typedef NSBundle *PlatformBundle;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef ::GModule* PlatformBundle;
</span><del>-#elif PLATFORM(EFL)
-typedef Eina_Module* PlatformBundle;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class InjectedBundleScriptWorld;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapex11NetscapePluginX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -44,8 +44,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #include <WebCore/GtkVersioning.h>
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
-#include <Ecore_X.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="lines">@@ -69,8 +67,6 @@
</span><span class="cx"> // Since we're a gdk/gtk app, we'll (probably?) have the same X connection as any gdk-based
</span><span class="cx"> // plugins, so we can return that. We might want to add other implementations here later.
</span><span class="cx"> return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
- return static_cast<Display*>(ecore_x_display_get());
</del><span class="cx"> #else
</span><span class="cx"> return nullptr;
</span><span class="cx"> #endif
</span><span class="lines">@@ -80,8 +76,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> return gdk_screen_get_number(gdk_screen_get_default());
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
- return ecore_x_screen_index_get(ecore_x_default_screen_get());
</del><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -91,8 +85,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> return gdk_visual_get_depth(gdk_screen_get_system_visual(gdk_screen_get_default()));
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
- return ecore_x_default_depth_get(x11HostDisplay(), ecore_x_default_screen_get());
</del><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -102,8 +94,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> return GDK_ROOT_WINDOW();
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
- return ecore_x_window_root_first_get();
</del><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -302,7 +292,7 @@
</span><span class="cx"> if (m_pluginDisplay != x11HostDisplay())
</span><span class="cx"> XSync(m_pluginDisplay, false);
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || (PLATFORM(EFL) && USE(CAIRO))
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> RefPtr<cairo_surface_t> drawableSurface = adoptRef(cairo_xlib_surface_create(m_pluginDisplay, m_drawable.get(),
</span><span class="cx"> m_setWindowCallbackStruct.visual, m_plugin.size().width(), m_plugin.size().height()));
</span><span class="cx"> cairo_t* cr = context.platformContext()->cr();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -822,11 +822,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::selectItemWritingDirectionIsNatural()
</span><span class="cx"> {
</span><del>-#if PLATFORM(EFL)
- return true;
-#else
</del><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
</span><span class="lines">@@ -1015,7 +1011,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::pageExtendedBackgroundColorDidChange(Color backgroundColor) const
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> m_page.send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(backgroundColor));
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(backgroundColor);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(static_cast<uint32_t>(WebPageProxy::Redo)), Messages::WebPageProxy::ExecuteUndoRedo::Reply(result));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(GTK) && !PLATFORM(COCOA)
</ins><span class="cx"> void WebEditorClient::handleKeyboardEvent(KeyboardEvent* event)
</span><span class="cx"> {
</span><span class="cx"> if (m_page->handleEditingKeyboardEvent(event))
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType type) const
</span><span class="cx"> {
</span><span class="cx"> // This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
</span><del>-#if PLATFORM(COCOA) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return type != TextCheckingTypeSpelling;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(type);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -1210,7 +1210,7 @@
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::saveViewStateToItem(HistoryItem& historyItem)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (m_frame->isMainFrame())
</span><span class="cx"> m_frame->page()->savePageState(historyItem);
</span><span class="cx"> #else
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::restoreViewState()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> Frame& frame = *m_frame->coreFrame();
</span><span class="cx"> HistoryItem* currentItem = frame.loader().history().currentItem();
</span><span class="cx"> if (FrameView* view = frame.view()) {
</span><span class="lines">@@ -1613,7 +1613,7 @@
</span><span class="cx"> if (automationSessionProxy && world.isNormal())
</span><span class="cx"> automationSessionProxy->didClearWindowObjectForFrame(*m_frame);
</span><span class="cx">
</span><del>-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
</ins><span class="cx"> // Ensure the accessibility hierarchy is updated.
</span><span class="cx"> webPage->updateAccessibilityTree();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> , m_layerHostingMode(parameters.layerHostingMode)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , m_viewGestureGeometryCollector(*this)
</span><del>-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
</ins><span class="cx"> , m_accessibilityObject(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #include <wtf/Seconds.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
</ins><span class="cx"> #include "WebPageAccessibilityObject.h"
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> GeolocationPermissionRequestManager& geolocationPermissionRequestManager() { return m_geolocationPermissionRequestManager; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> void savePageState(WebCore::HistoryItem&);
</span><span class="cx"> void restorePageState(const WebCore::HistoryItem&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -648,10 +648,6 @@
</span><span class="cx">
</span><span class="cx"> SandboxExtensionTracker& sandboxExtensionTracker() { return m_sandboxExtensionTracker; }
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- void setThemePath(const String&);
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> void setComposition(const String& text, const Vector<WebCore::CompositionUnderline>& underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeLength);
</span><span class="cx"> void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);
</span><span class="lines">@@ -701,14 +697,9 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void replaceSelectionWithPasteboardData(const Vector<String>& types, const IPC::DataReference&);
</span><span class="cx"> #endif
</span><del>-
-#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();
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
</ins><span class="cx"> void updateAccessibilityTree();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1337,7 +1328,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSDictionary> m_dataDetectionContext;
</span><span class="cx">
</span><del>-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
</ins><span class="cx"> GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -341,10 +341,6 @@
</span><span class="cx"> SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
</span><span class="cx"> SetCanRunModal(bool canRunModal)
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- SetThemePath(String themePath)
-#endif
-
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> CommitPageTransitionViewport()
</span><span class="cx"> #endif
</span><span class="lines">@@ -396,11 +392,6 @@
</span><span class="cx"> SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
</span><span class="cx"> SetAutoSizingShouldExpandToViewHeight(bool shouldExpand)
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- ConfirmComposition(String compositionString)
- SetComposition(String compositionString, Vector<WebCore::CompositionUnderline> underlines, uint64_t cursorPosition)
- CancelComposition()
-#endif
</del><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> FindZoomableAreaForPoint(WebCore::IntPoint point, WebCore::IntSize area)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (212556 => 212557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2017-02-17 19:00:25 UTC (rev 212556)
+++ trunk/Source/WebKit2/config.h 2017-02-17 19:10:39 UTC (rev 212557)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> #ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #define PLUGIN_ARCHITECTURE_MAC 1
</span><del>-#elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X)) && PLATFORM(X11)
</del><ins>+#elif PLATFORM(GTK) && PLATFORM(X11) && OS(UNIX) && !OS(MAC_OS_X)
</ins><span class="cx"> #define PLUGIN_ARCHITECTURE_X11 1
</span><span class="cx"> #else
</span><span class="cx"> #define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> #define PLUGIN_ARCHITECTURE(ARCH) (defined PLUGIN_ARCHITECTURE_##ARCH && PLUGIN_ARCHITECTURE_##ARCH)
</span><span class="cx">
</span><span class="cx"> #ifndef ENABLE_INSPECTOR_SERVER
</span><del>-#if ENABLE(WEB_SOCKETS) && (PLATFORM(GTK) || PLATFORM(EFL))
</del><ins>+#if ENABLE(WEB_SOCKETS) && PLATFORM(GTK)
</ins><span class="cx"> #define ENABLE_INSPECTOR_SERVER 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>