Diff
Modified: trunk/Tools/CMakeLists.txt (215757 => 215758)
--- trunk/Tools/CMakeLists.txt 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/CMakeLists.txt 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,21 +1,9 @@
set_property(DIRECTORY . PROPERTY FOLDER "Tools")
-if ("${PORT}" STREQUAL "Efl")
+if ("${PORT}" STREQUAL "GTK")
if (DEVELOPER_MODE)
add_subdirectory(WebKitTestRunner)
add_subdirectory(ImageDiff)
- if (ENABLE_X11_TARGET)
- add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
- endif ()
- endif ()
-
- if (ENABLE_MINIBROWSER)
- add_subdirectory(MiniBrowser/efl)
- endif ()
-elseif ("${PORT}" STREQUAL "GTK")
- if (DEVELOPER_MODE)
- add_subdirectory(WebKitTestRunner)
- add_subdirectory(ImageDiff)
if (ENABLE_API_TESTS)
add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
endif ()
Modified: trunk/Tools/ChangeLog (215757 => 215758)
--- trunk/Tools/ChangeLog 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/ChangeLog 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,5 +1,112 @@
2017-04-25 Daniel Bates <daba...@apple.com>
+ Remove more EFL code
+ https://bugs.webkit.org/show_bug.cgi?id=171288
+
+ Rubber-stamped by Simon Fraser.
+
+ The EFL port is no longer in the WebKit OpenSource Project repository. Remove more code
+ that was part of the EFL port.
+
+ * CMakeLists.txt:
+ * DumpRenderTree/AccessibilityController.h:
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/DumpRenderTree.h:
+ * DumpRenderTree/cairo/PixelDumpSupportCairo.h:
+ * ImageDiff/efl/ImageDiff.cpp: Removed.
+ * MiniBrowser/efl/CMakeLists.txt: Removed.
+ * MiniBrowser/efl/main.c: Removed.
+ * Scripts/build-dumprendertree:
+ * Scripts/build-jsc:
+ * Scripts/build-webkit:
+ * Scripts/build-webkittestrunner:
+ * Scripts/run-minibrowser:
+ * Scripts/update-webkit-libs-jhbuild:
+ * Scripts/update-webkitefl-libs: Removed.
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+ (extractNonMacOSHostConfiguration):
+ (executableProductDir):
+ (builtDylibPathForName):
+ (determinePortName):
+ (launcherPath):
+ (launcherName):
+ (getJhbuildPath):
+ (wrapperPrefixIfNeeded):
+ (generateBuildSystemFromCMakeProject):
+ (buildCMakeProjectOrExit):
+ (isEfl): Deleted.
+ * Scripts/webkitperl/FeatureList.pm:
+ * Scripts/webkitperl/webkitdirs_unittest/extractNonMacOSHostConfiguration.pl:
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort.port):
+ (GtkWK2Port.run_webkit_tests_command):
+ (EflWK2Port): Deleted.
+ (EflWK2Port.build_webkit_command): Deleted.
+ * Scripts/webkitpy/port/builders.py:
+ * Scripts/webkitpy/port/efl.py: Removed.
+ * Scripts/webkitpy/port/efl_unittest.py: Removed.
+ * Scripts/webkitpy/port/factory.py:
+ (platform_options):
+ (PortFactory):
+ * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
+ (TestExpectationsTestCase.test_determine_port_from_expectations_path):
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaselineTest.test_baseline_directory):
+ (TestRebaselineExpectations.test_rebaseline_expectations):
+ * TestWebKitAPI/PlatformEfl.cmake: Removed.
+ * TestWebKitAPI/PlatformWebView.h:
+ * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewScrollTo.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/scrollTo.html: Removed.
+ * TestWebKitAPI/efl/InjectedBundleController.cpp: Removed.
+ * TestWebKitAPI/efl/PlatformUtilities.cpp: Removed.
+ * TestWebKitAPI/efl/PlatformWebView.cpp: Removed.
+ * TestWebKitAPI/efl/main.cpp: Removed.
+ * WebKitTestRunner/EventSenderProxy.h:
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::EventSendingController::contextClick):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+ (WTR::AccessibilityNotificationHandler::setNotificationFunctionCallback):
+ (WTR::AccessibilityNotificationHandler::removeAccessibilityNotificationHandler):
+ * WebKitTestRunner/InjectedBundle/efl/ActivateFontsEfl.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/FontManagement.h: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/InjectedBundleEfl.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp: Removed.
+ * WebKitTestRunner/PlatformEfl.cmake: Removed.
+ * WebKitTestRunner/PlatformWebView.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ * WebKitTestRunner/efl/EventSenderProxyEfl.cpp: Removed.
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp: Removed.
+ * WebKitTestRunner/efl/TestControllerEfl.cpp: Removed.
+ * WebKitTestRunner/efl/main.cpp: Removed.
+ * efl/install-dependencies: Removed.
+ * efl/jhbuild-optional.modules: Removed.
+ * efl/jhbuild.modules: Removed.
+ * efl/jhbuildrc: Removed.
+ * efl/patches/evas-fix-build-with-giflib5.patch: Removed.
+ * efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Removed.
+ * efl/patches/gst-libav.patch: Removed.
+ * efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Removed.
+ * efl/patches/gst-plugins-good-Revert-qtdemux-expose-streams-with-first-moof-for-fr.patch: Removed.
+ * efl/patches/gst-plugins-good-use-the-tfdt-decode-time.patch: Removed.
+ * efl/patches/openwebrtc-gst-plugins-clang-warning-fix.patch: Removed.
+ * gtk/manifest.txt.in:
+
+2017-04-25 Daniel Bates <daba...@apple.com>
+
[Cocoa][Win] Enable of X-Content-Type-Options: nosniff header
https://bugs.webkit.org/show_bug.cgi?id=136452
<rdar://problem/23412620>
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (215757 => 215758)
--- trunk/Tools/DumpRenderTree/AccessibilityController.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -35,7 +35,7 @@
#if PLATFORM(WIN)
#include <windows.h>
#endif
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
#include "AccessibilityNotificationHandlerAtk.h"
#include <atk/atk.h>
#endif
@@ -76,7 +76,7 @@
void winNotificationReceived(PlatformUIElement, const std::string& eventName);
#endif
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
AtkObject* childElementById(AtkObject* parent, const char* id);
#endif
@@ -97,7 +97,7 @@
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
#endif
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (215757 => 215758)
--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1396,7 +1396,7 @@
return JSValueMakeUndefined(context);
}
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
static JSValueRef characterAtOffsetCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
int offset = -1;
@@ -1903,7 +1903,7 @@
{ "scrollToMakeVisible", scrollToMakeVisibleCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "scrollToGlobalPoint", scrollToGlobalPointCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "scrollToMakeVisibleWithSubFocus", scrollToMakeVisibleWithSubFocusCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
{ "characterAtOffset", characterAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "wordAtOffset", wordAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "lineAtOffset", lineAtOffsetCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (215757 => 215758)
--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -45,7 +45,7 @@
#include <oleacc.h>
typedef COMPtr<IAccessible> PlatformUIElement;
-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
#include "AccessibilityNotificationHandlerAtk.h"
#include <atk/atk.h>
typedef AtkObject* PlatformUIElement;
@@ -234,7 +234,7 @@
AccessibilityUIElement fieldsetAncestorElement();
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// Text-specific
JSStringRef characterAtOffset(int offset);
JSStringRef wordAtOffset(int offset);
@@ -326,7 +326,7 @@
NotificationHandler m_notificationHandler;
#endif
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY) && PLATFORM(GTK)
RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
#endif
};
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (215757 => 215758)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -34,8 +34,6 @@
#include "DumpRenderTreeWin.h"
#elif PLATFORM(GTK)
#include "DumpRenderTreeGtk.h"
-#elif PLATFORM(EFL)
-#include "DumpRenderTreeEfl.h"
#endif
#include <string>
Modified: trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.h (215757 => 215758)
--- trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -35,7 +35,7 @@
#if PLATFORM(WIN)
#include <windows.h>
#include <cairo-win32.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK)
#include <cairo.h>
#endif
Modified: trunk/Tools/Scripts/build-dumprendertree (215757 => 215758)
--- trunk/Tools/Scripts/build-dumprendertree 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/build-dumprendertree 2017-04-25 21:14:06 UTC (rev 215758)
@@ -43,7 +43,6 @@
--help Show this help message
--clean Clean up the build directory
--gtk Build the GTK+ port
- --efl Build the EFL port
EOF
GetOptions(
@@ -66,8 +65,8 @@
my $result;
if (isAppleCocoaWebKit()) {
$result = buildXCodeProject("DumpRenderTree", $clean, XcodeOptions(), @ARGV);
-} elsif (isGtk() || isEfl() || isAnyWindows()) {
- # Gtk, EFL, and Windows build everything in one shot. No need to build anything here.
+} elsif (isGtk() || isAnyWindows()) {
+ # GTK and Windows build everything in one shot. No need to build anything here.
$result = 0;
} else {
die "Building not defined for this platform!\n";
Modified: trunk/Tools/Scripts/build-jsc (215757 => 215758)
--- trunk/Tools/Scripts/build-jsc 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/build-jsc 2017-04-25 21:14:06 UTC (rev 215758)
@@ -45,7 +45,7 @@
my $minimal = 0;
my $coverageSupport = 0;
my $showHelp = 0;
-my $ftlJIT = int(isAppleCocoaWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl() || isJSCOnly()));
+my $ftlJIT = int(isAppleCocoaWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isJSCOnly()));
my $forceCLoop = 0;
my $cli = 0;
my $makeArgs = "";
Modified: trunk/Tools/Scripts/build-webkit (215757 => 215758)
--- trunk/Tools/Scripts/build-webkit 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/build-webkit 2017-04-25 21:14:06 UTC (rev 215758)
@@ -99,7 +99,6 @@
--coverage Enable code coverage support (Mac only)
--analyze Enable static anaylsis (iOS and Mac only)
- --efl Build the EFL port
--gtk Build the GTK+ port
--wincairo Build using Cairo (rather than CoreGraphics) on Windows
Modified: trunk/Tools/Scripts/build-webkittestrunner (215757 => 215758)
--- trunk/Tools/Scripts/build-webkittestrunner 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/build-webkittestrunner 2017-04-25 21:14:06 UTC (rev 215758)
@@ -61,8 +61,8 @@
my $result;
if (isAppleCocoaWebKit()) {
$result = buildXCodeProject("WebKitTestRunner", $clean, XcodeOptions(), @ARGV);
-} elsif (isGtk() || isEfl()) {
- # GTK+ and EFL build everything in one shot. No need to build anything here.
+} elsif isGtk() {
+ # GTK+ build everything in one shot. No need to build anything here.
$result = 0;
} else {
die "WebKitTestRunner is not supported on this platform.\n";
Modified: trunk/Tools/Scripts/run-minibrowser (215757 => 215758)
--- trunk/Tools/Scripts/run-minibrowser 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/run-minibrowser 2017-04-25 21:14:06 UTC (rev 215758)
@@ -43,7 +43,7 @@
prohibitUnknownPort();
setConfiguration();
-if (isGtk() || isEfl()) {
+if (isGtk()) {
# Check to see that all the frameworks are built.
checkFrameworks();
Modified: trunk/Tools/Scripts/update-webkit-libs-jhbuild (215757 => 215758)
--- trunk/Tools/Scripts/update-webkit-libs-jhbuild 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/update-webkit-libs-jhbuild 2017-04-25 21:14:06 UTC (rev 215758)
@@ -23,11 +23,10 @@
use Getopt::Long qw(:config pass_through);
my $platform = "";
-$platform = "efl" if isEfl();
$platform = "gtk" if isGtk();
if (!$platform) {
- die "No platform specified for " . basename($0) .". Use --gtk or --efl.\n";
+ die "No platform specified for " . basename($0) .". Use --gtk.\n";
}
my $wipeOnChange = $ENV{JHBUILD_WIPE_ON_CHANGE} // 1;
@@ -133,7 +132,7 @@
chdir(relativeScriptsDir() . "/../jhbuild") or die $!;
-my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" );
+my %prettyPlatform = ( "gtk" => "GTK+" );
if (!$force && !jhbuildConfigurationChanged()) {
print $prettyPlatform{$platform} . " port dependencies are already up to date\n";
Deleted: trunk/Tools/Scripts/update-webkitefl-libs (215757 => 215758)
--- trunk/Tools/Scripts/update-webkitefl-libs 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/update-webkitefl-libs 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,23 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2012 Intel Corporation
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my $scriptsDir = relativeScriptsDir();
-system("perl", "$scriptsDir/update-webkit-libs-jhbuild", "--efl", @ARGV) == 0 or die $!;
Modified: trunk/Tools/Scripts/webkitdirs.pm (215757 => 215758)
--- trunk/Tools/Scripts/webkitdirs.pm 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-04-25 21:14:06 UTC (rev 215758)
@@ -101,7 +101,6 @@
use constant {
AppleWin => "AppleWin",
GTK => "GTK",
- Efl => "Efl",
iOS => "iOS",
tvOS => "tvOS",
watchOS => "watchOS",
@@ -446,7 +445,6 @@
push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
push(@args, '--64-bit') if (isWin64());
push(@args, '--gtk') if isGtk();
- push(@args, '--efl') if isEfl();
push(@args, '--jsc-only') if isJSCOnly();
push(@args, '--wincairo') if isWinCairo();
push(@args, '--inspector-frontend') if isInspectorFrontend();
@@ -456,7 +454,7 @@
sub extractNonMacOSHostConfiguration
{
my @args = ();
- my @extract = ('--device', '--efl', '--gtk', '--ios', '--platform', '--sdk', '--simulator', '--wincairo', 'SDKROOT', 'ARCHS');
+ my @extract = ('--device', '--gtk', '--ios', '--platform', '--sdk', '--simulator', '--wincairo', 'SDKROOT', 'ARCHS');
foreach (@{$_[0]}) {
my $line = $_;
my $flag = 0;
@@ -682,7 +680,7 @@
my $productDirectory = productDir();
my $binaryDirectory;
- if (isEfl() || isGtk() || isJSCOnly()) {
+ if (isGtk() || isJSCOnly()) {
$binaryDirectory = "bin";
} elsif (isAnyWindows()) {
$binaryDirectory = isWin64() ? "bin64" : "bin32";
@@ -927,9 +925,6 @@
my $extension = isDarwin() ? ".dylib" : ".so";
return "$configurationProductDir/lib/libwebkit2gtk-4.0" . $extension;
}
- if (isEfl()) {
- return "$configurationProductDir/lib/libewebkit2.so";
- }
if (isIOSWebKit()) {
return "$configurationProductDir/$libraryName.framework/$libraryName";
}
@@ -1055,7 +1050,6 @@
return if defined $portName;
my %argToPortName = (
- efl => Efl,
gtk => GTK,
'jsc-only' => JSCOnly,
wincairo => WinCairo
@@ -1090,7 +1084,6 @@
} else {
if ($unknownPortProhibited) {
my $portsChoice = join "\n\t", qw(
- --efl
--gtk
--jsc-only
);
@@ -1110,11 +1103,6 @@
return $portName;
}
-sub isEfl()
-{
- return portName() eq Efl;
-}
-
sub isGtk()
{
return portName() eq GTK;
@@ -1524,7 +1512,7 @@
sub launcherPath()
{
my $relativeScriptsPath = relativeScriptsDir();
- if (isGtk() || isEfl()) {
+ if (isGtk()) {
return "$relativeScriptsPath/run-minibrowser";
} elsif (isAppleWebKit()) {
return "$relativeScriptsPath/run-safari";
@@ -1533,7 +1521,7 @@
sub launcherName()
{
- if (isGtk() || isEfl()) {
+ if (isGtk()) {
return "MiniBrowser";
} elsif (isAppleCocoaWebKit()) {
return "Safari";
@@ -1836,12 +1824,10 @@
if (isGit() && isGitBranchBuild() && gitBranch()) {
pop(@jhbuildPath);
}
- if (isEfl()) {
- push(@jhbuildPath, "DependenciesEFL");
- } elsif (isGtk()) {
+ if (isGtk()) {
push(@jhbuildPath, "DependenciesGTK");
} else {
- die "Cannot get JHBuild path for platform that isn't GTK+ or EFL.\n";
+ die "Cannot get JHBuild path for platform that isn't GTK+.\n";
}
return File::Spec->catdir(@jhbuildPath);
}
@@ -1878,9 +1864,7 @@
}
if (-e getJhbuildPath()) {
my @prefix = (File::Spec->catfile(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper"));
- if (isEfl()) {
- push(@prefix, "--efl");
- } elsif (isGtk()) {
+ if (isGtk()) {
push(@prefix, "--gtk");
}
push(@prefix, "run");
@@ -2040,7 +2024,7 @@
push @args, '-DSHOW_BINDINGS_GENERATION_PROGRESS=1' unless ($willUseNinja && -t STDOUT);
# Some ports have production mode, but build-webkit should always use developer mode.
- push @args, "-DDEVELOPER_MODE=ON" if isEfl() || isGtk() || isJSCOnly();
+ push @args, "-DDEVELOPER_MODE=ON" if isGtk() || isJSCOnly();
# Don't warn variables which aren't used by cmake ports.
push @args, "--no-warn-unused-cli";
@@ -2113,10 +2097,6 @@
exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
- if (isEfl() && checkForArgumentAndRemoveFromARGV("--update-efl")) {
- system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!;
- }
-
if (isGtk() && checkForArgumentAndRemoveFromARGV("--update-gtk")) {
system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
}
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (215757 => 215758)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-04-25 21:14:06 UTC (rev 215758)
@@ -147,7 +147,7 @@
my @features = (
{ option => "3d-rendering", desc => "Toggle 3D Rendering support",
- define => "ENABLE_3D_TRANSFORMS", default => (isAppleCocoaWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDTransformsSupport },
+ define => "ENABLE_3D_TRANSFORMS", default => (isAppleCocoaWebKit() || isIOSWebKit() || isGtk()), value => \$threeDTransformsSupport },
{ option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
@@ -177,13 +177,13 @@
define => "ENABLE_CSS_DEVICE_ADAPTATION", default => 0, value => \$cssDeviceAdaptation },
{ option => "css-image-orientation", desc => "Toggle CSS image-orientation support",
- define => "ENABLE_CSS_IMAGE_ORIENTATION", default => (isEfl() || isGtk()), value => \$cssImageOrientationSupport },
+ define => "ENABLE_CSS_IMAGE_ORIENTATION", default => isGtk(), value => \$cssImageOrientationSupport },
{ option => "css-image-resolution", desc => "Toggle CSS image-resolution support",
define => "ENABLE_CSS_IMAGE_RESOLUTION", default => isGtk(), value => \$cssImageResolutionSupport },
{ option => "css-image-set", desc => "Toggle CSS image-set support",
- define => "ENABLE_CSS_IMAGE_SET", default => (isEfl() || isGtk()), value => \$cssImageSetSupport },
+ define => "ENABLE_CSS_IMAGE_SET", default => isGtk(), value => \$cssImageSetSupport },
{ option => "css-regions", desc => "Toggle CSS Regions support",
define => "ENABLE_CSS_REGIONS", default => 1, value => \$cssRegionsSupport },
@@ -192,28 +192,28 @@
define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
{ option => "css3-text", desc => "Toggle CSS3 Text support",
- define => "ENABLE_CSS3_TEXT", default => (isEfl() || isGtk()), value => \$css3TextSupport },
+ define => "ENABLE_CSS3_TEXT", default => isGtk(), value => \$css3TextSupport },
{ option => "custom-elements", desc => "Toggle custom elements support",
define => "ENABLE_CUSTOM_ELEMENTS", default => 1, value => \$customElementsSupport },
{ option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
- define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => isEfl(), value => \$customSchemeHandlerSupport },
+ define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => 0, value => \$customSchemeHandlerSupport },
{ option => "data-transfer-items", desc => "Toggle Data Transfer Items support",
define => "ENABLE_DATA_TRANSFER_ITEMS", default => 0, value => \$dataTransferItemsSupport },
{ option => "datalist-element", desc => "Toggle Datalist Element support",
- define => "ENABLE_DATALIST_ELEMENT", default => isEfl(), value => \$datalistElementSupport },
+ define => "ENABLE_DATALIST_ELEMENT", default => 0, value => \$datalistElementSupport },
{ option => "device-orientation", desc => "Toggle Device Orientation support",
define => "ENABLE_DEVICE_ORIENTATION", default => isIOSWebKit(), value => \$deviceOrientationSupport },
{ option => "dom4-events-constructor", desc => "Expose DOM4 Events constructors",
- define => "ENABLE_DOM4_EVENTS_CONSTRUCTOR", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$dom4EventsConstructor },
+ define => "ENABLE_DOM4_EVENTS_CONSTRUCTOR", default => (isAppleWebKit() || isGtk()), value => \$dom4EventsConstructor },
{ option => "download-attribute", desc => "Toggle Download Attribute support",
- define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isEfl() || isGtk()), value => \$downloadAttributeSupport },
+ define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => isGtk(), value => \$downloadAttributeSupport },
{ option => "encrypted-media", desc => "Toggle EME V3 support",
define => "ENABLE_ENCRYPTED_MEDIA", default => 0, value => \$encryptedMediaSupport },
@@ -231,13 +231,13 @@
define => "ENABLE_FTPDIR", default => 1, value => \$ftpDirSupport },
{ option => "fullscreen-api", desc => "Toggle Fullscreen API support",
- define => "ENABLE_FULLSCREEN_API", default => (isAppleCocoaWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
+ define => "ENABLE_FULLSCREEN_API", default => (isAppleCocoaWebKit() || isGtk()), value => \$fullscreenAPISupport },
{ option => "gamepad", desc => "Toggle Gamepad support",
define => "ENABLE_GAMEPAD", default => 0, value => \$gamepadSupport },
{ option => "geolocation", desc => "Toggle Geolocation support",
- define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$geolocationSupport },
+ define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk()), value => \$geolocationSupport },
{ option => "high-dpi-canvas", desc => "Toggle High DPI Canvas support",
define => "ENABLE_HIGH_DPI_CANVAS", default => (isAppleWebKit()), value => \$highDPICanvasSupport },
@@ -246,13 +246,13 @@
define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
{ option => "indexed-database", desc => "Toggle Indexed Database support",
- define => "ENABLE_INDEXED_DATABASE", default => (isAppleCocoaWebKit() || isEfl() || isGtk()), value => \$indexedDatabaseSupport },
+ define => "ENABLE_INDEXED_DATABASE", default => (isAppleCocoaWebKit() || isGtk()), value => \$indexedDatabaseSupport },
{ option => "input-speech", desc => "Toggle Input Speech support",
define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
{ option => "input-type-color", desc => "Toggle Input Type Color support",
- define => "ENABLE_INPUT_TYPE_COLOR", default => (isEfl() || isGtk()), value => \$inputTypeColorSupport },
+ define => "ENABLE_INPUT_TYPE_COLOR", default => isGtk(), value => \$inputTypeColorSupport },
{ option => "input-type-date", desc => "Toggle Input Type Date support",
define => "ENABLE_INPUT_TYPE_DATE", default => 0, value => \$inputTypeDateSupport },
@@ -291,13 +291,13 @@
define => "ENABLE_LEGACY_WEB_AUDIO", default => 1, value => \$legacyWebAudioSupport },
{ option => "link-prefetch", desc => "Toggle Link Prefetch support",
- define => "ENABLE_LINK_PREFETCH", default => (isGtk() || isEfl()), value => \$linkPrefetchSupport },
+ define => "ENABLE_LINK_PREFETCH", default => isGtk(), value => \$linkPrefetchSupport },
{ option => "mathml", desc => "Toggle MathML support",
define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
{ option => "media-capture", desc => "Toggle Media Capture support",
- define => "ENABLE_MEDIA_CAPTURE", default => isEfl(), value => \$mediaCaptureSupport },
+ define => "ENABLE_MEDIA_CAPTURE", default => 0, value => \$mediaCaptureSupport },
{ option => "media-source", desc => "Toggle Media Source support",
define => "ENABLE_MEDIA_SOURCE", default => isGtk(), value => \$mediaSourceSupport },
@@ -306,19 +306,19 @@
define => "ENABLE_MEDIA_STATISTICS", default => 0, value => \$mediaStatisticsSupport },
{ option => "media-stream", desc => "Toggle Media Stream support",
- define => "ENABLE_MEDIA_STREAM", default => (isGtk()), value => \$mediaStreamSupport },
+ define => "ENABLE_MEDIA_STREAM", default => isGtk(), value => \$mediaStreamSupport },
{ option => "meter-element", desc => "Toggle Meter Element support",
define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterElementSupport },
{ option => "mhtml", desc => "Toggle MHTML support",
- define => "ENABLE_MHTML", default => (isGtk() || isEfl()), value => \$mhtmlSupport },
+ define => "ENABLE_MHTML", default => isGtk(), value => \$mhtmlSupport },
{ option => "mouse-cursor-scale", desc => "Toggle Scaled mouse cursor support",
- define => "ENABLE_MOUSE_CURSOR_SCALE", default => isEfl(), value => \$mouseCursorScaleSupport },
+ define => "ENABLE_MOUSE_CURSOR_SCALE", default => 0, value => \$mouseCursorScaleSupport },
{ option => "navigator-content-utils", desc => "Toggle Navigator Content Utils support",
- define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => isEfl(), value => \$registerProtocolHandlerSupport },
+ define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => 0, value => \$registerProtocolHandlerSupport },
{ option => "navigator-hardware-concurrency", desc => "Toggle Navigator hardware concurrenct support",
define => "ENABLE_NAVIGATOR_HWCONCURRENCY", default => 1, value => \$hardwareConcurrencySupport },
@@ -351,13 +351,13 @@
define => "ENABLE_READABLE_BYTE_STREAM_API", default => 1, value => \$readableByteStreamAPISupport },
{ option => "resolution-media-query", desc => "Toggle resolution media query support",
- define => "ENABLE_RESOLUTION_MEDIA_QUERY", default => isEfl(), value => \$resolutionMediaQuerySupport },
+ define => "ENABLE_RESOLUTION_MEDIA_QUERY", default => 0, value => \$resolutionMediaQuerySupport },
{ option => "scripted-speech", desc => "Toggle Scripted Speech support",
define => "ENABLE_SCRIPTED_SPEECH", default => 0, value => \$scriptedSpeechSupport },
{ option => "subtle-crypto", desc => "Toggle WebCrypto Subtle-Crypto support",
- define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isEfl() || isAppleCocoaWebKit() || isIOSWebKit()), value => \$subtleCrypto },
+ define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isAppleCocoaWebKit() || isIOSWebKit()), value => \$subtleCrypto },
{ option => "svg-fonts", desc => "Toggle SVG Fonts support",
define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
@@ -366,28 +366,28 @@
define => "USE_SYSTEM_MALLOC", default => 0, value => \$systemMallocSupport },
{ option => "touch-events", desc => "Toggle Touch Events support",
- define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl() || isGtk()), value => \$touchEventsSupport },
+ define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isGtk()), value => \$touchEventsSupport },
{ option => "touch-icon-loading", desc => "Toggle Touch Icon Loading Support",
define => "ENABLE_TOUCH_ICON_LOADING", default => 0, value => \$touchIconLoadingSupport },
{ option => "touch-slider", desc => "Toggle Touch Slider support",
- define => "ENABLE_TOUCH_SLIDER", default => isEfl(), value => \$touchSliderSupport },
+ define => "ENABLE_TOUCH_SLIDER", default => 0, value => \$touchSliderSupport },
{ option => "vibration", desc => "Toggle Vibration support",
- define => "ENABLE_VIBRATION", default => isEfl(), value => \$vibrationSupport },
+ define => "ENABLE_VIBRATION", default => 0, value => \$vibrationSupport },
{ option => "video", desc => "Toggle Video support",
- define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoSupport },
+ define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk()), value => \$videoSupport },
{ option => "video-track", desc => "Toggle Video Track support",
- define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl()), value => \$videoTrackSupport },
+ define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk()), value => \$videoTrackSupport },
{ option => "web-animations", desc => "Toggle Web Animations support",
define => "ENABLE_WEB_ANIMATIONS", default => 1, value => \$webAnimationsSupport },
{ option => "web-audio", desc => "Toggle Web Audio support",
- define => "ENABLE_WEB_AUDIO", default => (isEfl() || isGtk()), value => \$webAudioSupport },
+ define => "ENABLE_WEB_AUDIO", default => isGtk(), value => \$webAudioSupport },
{ option => "web-replay", desc => "Toggle Web Replay support",
define => "ENABLE_WEB_REPLAY", default => isAppleCocoaWebKit(), value => \$webReplaySupport },
@@ -405,7 +405,7 @@
define => "ENABLE_WEBASSEMBLY", default => (isX86_64() && (isGtk() || isJSCOnly())) , value => \$webAssemblySupport },
{ option => "webgl", desc => "Toggle WebGL support",
- define => "ENABLE_WEBGL", default => (isAppleCocoaWebKit() || isGtk() || isEfl()), value => \$webglSupport },
+ define => "ENABLE_WEBGL", default => (isAppleCocoaWebKit() || isGtk()), value => \$webglSupport },
{ option => "writableStreamAPI", desc => "Toggle WritableStream API support",
define => "ENABLE_WRITABLE_STREAM_API", default => 1, value => \$writableStreamAPISupport },
Modified: trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/extractNonMacOSHostConfiguration.pl (215757 => 215758)
--- trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/extractNonMacOSHostConfiguration.pl 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/extractNonMacOSHostConfiguration.pl 2017-04-25 21:14:06 UTC (rev 215758)
@@ -63,11 +63,6 @@
description => "Debug with GTK",
},
{
- argValue => ["--debug", "--efl"],
- expectedValue => ["--debug"],
- description => "Debug with EFL",
-},
-{
argValue => ["--debug", "--wincairo"],
expectedValue => ["--debug"],
description => "Debug with WinCairo",
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -72,7 +72,6 @@
"mac-wk2": MacWK2Port,
"win": WinPort,
"wincairo": WinCairoPort,
- "efl-wk2": EflWK2Port,
}
default_port = {
"Windows": WinPort,
@@ -201,14 +200,3 @@
command = super(GtkWK2Port, self).run_webkit_tests_command(build_style)
command.append("--gtk")
return command
-
-
-class EflWK2Port(DeprecatedPort):
- port_flag_name = "efl-wk2"
-
- def build_webkit_command(self, build_style=None):
- command = super(EflWK2Port, self).build_webkit_command(build_style=build_style)
- command.append("--efl")
- command.append("--update-efl")
- command.append(super(EflWK2Port, self).makeArgs())
- return command
Modified: trunk/Tools/Scripts/webkitpy/port/builders.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/port/builders.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/port/builders.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -75,9 +75,6 @@
"GTK Linux 32-bit Release": {"port_name": "gtk-wk2", "is_debug": False},
"GTK Linux 64-bit Debug (Tests)": {"port_name": "gtk-wk2", "is_debug": True},
"GTK Linux 64-bit Release (Tests)": {"port_name": "gtk-wk2", "is_debug": False},
-
- "EFL Linux 64-bit Release WK2": {"port_name": "efl-wk2", "is_debug": False},
- "EFL Linux 64-bit Debug WK2": {"port_name": "efl-wk2", "is_debug": True},
}
Deleted: trunk/Tools/Scripts/webkitpy/port/efl.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/port/efl.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,146 +0,0 @@
-# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
-# Copyright (C) 2011 Samsung Electronics. All rights reserved.
-# Copyright (C) 2012 Intel Corporation
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""WebKit Efl implementation of the Port interface."""
-
-import os
-
-from webkitpy.common.system import path
-from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.port.base import Port
-from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.port.xorgdriver import XorgDriver
-from webkitpy.port.xvfbdriver import XvfbDriver
-from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
-
-
-class EflPort(Port):
- port_name = 'efl'
-
- def __init__(self, *args, **kwargs):
- super(EflPort, self).__init__(*args, **kwargs)
-
- self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--efl', 'run']
-
- self.set_option_default('wrapper', ' '.join(self._jhbuild_wrapper))
- self.webprocess_cmd_prefix = self.get_option('webprocess_cmd_prefix')
-
- self._pulseaudio_sanitizer = PulseAudioSanitizer()
-
- def _port_flag_for_scripts(self):
- return "--efl"
-
- def setup_test_run(self, device_class=None):
- super(EflPort, self).setup_test_run(device_class)
- self._pulseaudio_sanitizer.unload_pulseaudio_module()
-
- def setup_environ_for_server(self, server_name=None):
- env = super(EflPort, self).setup_environ_for_server(server_name)
-
- # If DISPLAY environment variable is unset in the system
- # e.g. on build bot, remove DISPLAY variable from the dictionary
- if not 'DISPLAY' in os.environ:
- del env['DISPLAY']
-
- if 'ACCESSIBILITY_EAIL_LIBRARY_PATH' in os.environ:
- env['ACCESSIBILITY_EAIL_LIBRARY_PATH'] = os.environ['ACCESSIBILITY_EAIL_LIBRARY_PATH']
-
- env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
- env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
-
- # Silence GIO warnings about using the "memory" GSettings backend.
- env['GSETTINGS_BACKEND'] = 'memory'
-
- if self.webprocess_cmd_prefix:
- env['WEB_PROCESS_CMD_PREFIX'] = self.webprocess_cmd_prefix
-
- return env
-
- def default_timeout_ms(self):
- # Tests run considerably slower under gdb
- # or valgrind.
- if self.get_option('webprocess_cmd_prefix'):
- return 350 * 1000
- return super(EflPort, self).default_timeout_ms()
-
- def clean_up_test_run(self):
- super(EflPort, self).clean_up_test_run()
- self._pulseaudio_sanitizer.restore_pulseaudio_module()
-
- def _generate_all_test_configurations(self):
- return [TestConfiguration(version=self._version, architecture='x86', build_type=build_type) for build_type in self.ALL_BUILD_TYPES]
-
- def _driver_class(self):
- if os.environ.get("USE_NATIVE_XDISPLAY"):
- return XorgDriver
- return XvfbDriver
-
- def _path_to_driver(self):
- return self._build_path('bin', self.driver_name())
-
- def _path_to_image_diff(self):
- return self._build_path('bin', 'ImageDiff')
-
- def _image_diff_command(self, *args, **kwargs):
- return self._jhbuild_wrapper + super(EflPort, self)._image_diff_command(*args, **kwargs)
-
- def _path_to_webcore_library(self):
- static_path = self._build_path('lib', 'libwebcore_efl.a')
- dyn_path = self._build_path('lib', 'libwebcore_efl.so')
- return static_path if self._filesystem.exists(static_path) else dyn_path
-
- def _search_paths(self):
- search_paths = []
- search_paths.append(self.port_name)
- search_paths.append('wk2')
- return search_paths
-
- def default_baseline_search_path(self):
- return map(self._webkit_baseline_path, self._search_paths())
-
- def _port_specific_expectations_files(self):
- # FIXME: We should be able to use the default algorithm here.
- return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
-
- def show_results_html_file(self, results_filename):
- self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
-
- def check_sys_deps(self, needs_http):
- return super(EflPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
-
- def build_webkit_command(self, build_style=None):
- command = super(EflPort, self).build_webkit_command(build_style)
- command.extend(["--efl", "--update-efl"])
- command.append(super(EflPort, self).make_args())
- return command
-
- def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
- return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
-
- def test_expectations_file_position(self):
- # EFL port baseline search path is efl -> wk2 -> generic (as efl-wk2 and efl baselines are merged), so port test expectations file is at third to last position.
- return 2
Deleted: trunk/Tools/Scripts/webkitpy/port/efl_unittest.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,54 +0,0 @@
-# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
-# Copyright (C) 2011 Samsung Electronics. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
-
-from webkitpy.common.system.executive_mock import MockExecutive
-from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.port.efl import EflPort
-from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.port import port_testcase
-
-
-class EflPortTest(port_testcase.PortTestCase):
- port_name = 'efl'
- port_maker = EflPort
-
- # Additionally mocks out the PulseAudioSanitizer methods.
- def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=None, **kwargs):
- port = super(EflPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
- port._pulseaudio_sanitizer = PulseAudioSanitizerMock()
- return port
-
- def test_show_results_html_file(self):
- port = self.make_port()
- port._executive = MockExecutive(should_log=True)
- expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
- OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
-
- def test_get_crash_log(self):
- # This function tested in linux_get_crash_log_unittest.py
- pass
Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/port/factory.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -50,9 +50,6 @@
optparse.make_option('--simulator', action='', dest='platform',
const=('ios-simulator'),
help=('DEPRECATED alias for --platform=ios-simulator')),
- optparse.make_option('--efl', action='', dest='platform',
- const=('efl*' if use_globs else 'efl'),
- help=('Alias for --platform=efl*' if use_globs else 'Alias for --platform=efl')),
optparse.make_option('--gtk', action='', dest='platform',
const=('gtk*' if use_globs else 'gtk'),
help=('Alias for --platform=gtk*' if use_globs else 'Alias for --platform=gtk')),
@@ -88,7 +85,6 @@
# common prefix, the more specific port class should be listed
# first.
PORT_CLASSES = (
- 'efl.EflPort',
'gtk.GtkPort',
'ios_simulator.IOSSimulatorPort',
'ios_device.IOSDevicePort',
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -76,7 +76,6 @@
self._expect_port_for_expectations_path(None, '/')
self._expect_port_for_expectations_path(None, '/mock-checkout/LayoutTests/platform/win/TestExpectations')
self._expect_port_for_expectations_path('win', 'LayoutTests/platform/win/TestExpectations')
- self._expect_port_for_expectations_path('efl', 'LayoutTests/platform/efl/TestExpectations')
def assert_lines_lint(self, lines, should_pass, expected_output=None):
self._error_collector.reset_errors()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (215757 => 215758)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2017-04-25 21:14:06 UTC (rev 215758)
@@ -95,7 +95,6 @@
self.assertMultiLineEqual(command._baseline_directory("Apple Yosemite Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
- self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
def test_rebaseline_updates_expectations_file_noop(self):
self._zero_out_test_expectations()
@@ -320,7 +319,7 @@
# FIXME: change this to use the test- ports.
calls = self.tool.executive.calls
self.assertEqual(len(calls), 1)
- self.assertEqual(len(calls[0]), 24)
+ self.assertEqual(len(calls[0]), 22)
def test_rebaseline_expectations_noop(self):
self._zero_out_test_expectations()
Deleted: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (215757 => 215758)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,139 +0,0 @@
-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
-
-add_custom_target(forwarding-headersEflForTestWebKitAPI
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform CoordinatedGraphics --platform soup
- DEPENDS forwarding-headersEflForWebKit2
-)
-set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI)
-
-include_directories(
- ${DERIVED_SOURCES_WEBKIT2_DIR}/include
- ${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics
- ${WEBKIT2_DIR}/UIProcess/API/C/soup
- ${WEBKIT2_DIR}/UIProcess/API/C/efl
- ${WEBKIT2_DIR}/UIProcess/API/efl
-)
-
-include_directories(SYSTEM
- ${ECORE_EVAS_INCLUDE_DIRS}
- ${GLIB_INCLUDE_DIRS}
- ${LIBSOUP_INCLUDE_DIRS}
-)
-
-set(test_main_SOURCES
- ${TESTWEBKITAPI_DIR}/efl/main.cpp
-)
-
-set(bundle_harness_SOURCES
- ${TESTWEBKITAPI_DIR}/efl/InjectedBundleController.cpp
- ${TESTWEBKITAPI_DIR}/efl/PlatformUtilities.cpp
-)
-
-set(webkit2_api_harness_SOURCES
- ${TESTWEBKITAPI_DIR}/efl/PlatformUtilities.cpp
- ${TESTWEBKITAPI_DIR}/efl/PlatformWebView.cpp
-)
-
-list(APPEND test_wtf_LIBRARIES
- WebKit2
-)
-
-list(APPEND test_webcore_LIBRARIES
- WebKit2
-)
-
-list(APPEND TestJavaScriptCore_LIBRARIES
- WebKit2
-)
-
-# The list below works like a test expectation. Tests in the
-# test_{webkit2_api|webcore}_BINARIES list are added to the test runner and
-# tried on the bots on every build. Tests in test_{webkit2_api|webcore}_BINARIES
-# are compiled and suffixed with fail and skipped from the test runner.
-#
-# Make sure that the tests are passing on both Debug and
-# Release builds before adding it to test_{webkit2_api|webcore}_BINARIES.
-
-set(test_webcore_BINARIES
- CSSParser
- GridPosition
- HTMLParserIdioms
- LayoutUnit
- URL
-)
-
-# In here we list the bundles that are used by our specific WK2 API Tests
-list(APPEND bundle_harness_SOURCES
- ${TESTWEBKITAPI_DIR}/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp
-)
-
-set(test_webkit2_api_BINARIES
- AboutBlankLoad
- CloseThenTerminate
- CookieManager
- DOMWindowExtensionNoCache
- DidAssociateFormControls
- DocumentStartUserScriptAlertCrash
- EvaluateJavaScript
- FailedLoad
- Find
- ForceRepaint
- FrameMIMETypeHTML
- FrameMIMETypePNG
- GetInjectedBundleInitializationUserDataCallback
- HitTestResultNodeHandle
- InjectedBundleBasic
- InjectedBundleFrameHitTest
- InjectedBundleInitializationUserDataCallbackWins
- LoadAlternateHTMLStringWithNonDirectoryURL
- LoadCanceledNoServerRedirectCallback
- NewFirstVisuallyNonEmptyLayout
- NewFirstVisuallyNonEmptyLayoutFails
- NewFirstVisuallyNonEmptyLayoutForImages
- PageLoadBasic
- PageLoadDidChangeLocationWithinPageForFrame
- ParentFrame
- PendingAPIRequestURL
- PreventEmptyUserAgent
- PrivateBrowsingPushStateNoHistoryCallback
- ProvisionalURLAfterWillSendRequestCallback
- ResponsivenessTimerDoesntFireEarly
- ShouldGoToBackForwardListItem
- TerminateTwice
- TextFieldDidBeginAndEndEditing
- WKPreferences
- WKString
- WKStringJSString
- WKURL
- WillSendSubmitEvent
-
- CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward
- CoordinatedGraphics/WKViewUserViewportToContents
-
- efl/WKViewClientWebProcessCallbacks
- efl/WKViewScrollTo
-)
-
-set(test_webkit2_api_fail_BINARIES
- CanHandleRequest
- DOMWindowExtensionBasic
- DownloadDecideDestinationCrash
- Geolocation
- LoadPageOnCrash
- MouseMoveAfterCrash
- NewFirstVisuallyNonEmptyLayoutFrames
- ReloadPageAfterCrash
- ResizeReversePaginatedWebView
- ResizeWindowAfterCrash
- RestoreSessionStateContainingFormData
- ScrollPinningBehaviors
- UserMessage
- WKPageGetScaleFactorNotZero
- WillLoad
-)
-
-# Tests disabled because of missing features on the test harness:
-#
-# SpacebarScrolling
-# CoordinatedGraphics/WKViewIsActiveSetIsActive
Modified: trunk/Tools/TestWebKitAPI/PlatformWebView.h (215757 => 215758)
--- trunk/Tools/TestWebKitAPI/PlatformWebView.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/TestWebKitAPI/PlatformWebView.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -47,9 +47,6 @@
#elif PLATFORM(GTK)
typedef WKViewRef PlatformWKView;
typedef GtkWidget *PlatformWindow;
-#elif PLATFORM(EFL)
-typedef Evas_Object* PlatformWKView;
-typedef Ecore_Evas* PlatformWindow;
#endif
namespace TestWebKitAPI {
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (215757 => 215758)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -44,7 +44,7 @@
TEST(WebKit2, WKPreferencesDefaults)
{
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
static const char* expectedStandardFontFamily = "Times";
static const char* expectedFixedFontFamily = "Courier New";
static const char* expectedSerifFontFamily = "Times";
Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -36,8 +36,6 @@
#include <WebCore/GUniquePtrGtk.h>
#include <gdk/gdk.h>
#include <wtf/HashSet.h>
-#elif PLATFORM(EFL)
-#include "EWebKit2.h"
#endif
#if PLATFORM(COCOA)
@@ -50,8 +48,6 @@
#if PLATFORM(GTK)
struct WTREventQueueItem;
-#elif PLATFORM(EFL)
-struct WTREvent;
#endif
class EventSenderProxy {
@@ -98,7 +94,7 @@
double currentEventTime() { return m_time; }
void updateClickCountForButton(int button);
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
void replaySavedEvents();
#endif
@@ -116,13 +112,7 @@
GdkEvent* createMouseButtonEvent(GdkEventType, unsigned button, WKEventModifiers);
GUniquePtr<GdkEvent> createTouchEvent(GdkEventType, int id);
void sendUpdatedTouchEvents();
-#elif PLATFORM(EFL)
- void sendOrQueueEvent(const WTREvent&);
- void dispatchEvent(const WTREvent&);
-#if ENABLE(TOUCH_EVENTS)
- void sendTouchEvent(Ewk_Touch_Event_Type);
#endif
-#endif
double m_time;
WKPoint m_position;
@@ -138,13 +128,7 @@
unsigned m_mouseButtonCurrentlyDown;
Vector<GUniquePtr<GdkEvent>> m_touchEvents;
HashSet<int> m_updatedTouchEvents;
-#elif PLATFORM(EFL)
- Deque<WTREvent> m_eventQueue;
- WKEventMouseButton m_mouseButton;
-#if ENABLE(TOUCH_EVENTS)
- Eina_List* m_touchPoints;
#endif
-#endif
};
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -71,7 +71,7 @@
return WKAccessibilityEnhancedAccessibilityEnabled();
}
-#if !PLATFORM(GTK) && !PLATFORM(EFL)
+#if !PLATFORM(GTK)
Ref<AccessibilityUIElement> AccessibilityController::rootElement()
{
WKBundlePageRef page = InjectedBundle::singleton().page()->page();
@@ -95,7 +95,7 @@
return uiElement->elementAtPoint(x, y);
}
-#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if !HAVE(ACCESSIBILITY) && PLATFORM(GTK)
RefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
RefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -31,7 +31,7 @@
#include "JSWrappable.h"
#include <_javascript_Core/JSObjectRef.h>
#include <wtf/Platform.h>
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
#include "AccessibilityNotificationHandlerAtk.h"
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -78,7 +78,7 @@
#endif
// Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.
-#if (!PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
+#if !PLATFORM(GTK) || !HAVE(ACCESSIBILITY)
JSRetainPtr<JSStringRef> AccessibilityUIElement::characterAtOffset(int) { return nullptr; }
JSRetainPtr<JSStringRef> AccessibilityUIElement::wordAtOffset(int) { return nullptr; }
JSRetainPtr<JSStringRef> AccessibilityUIElement::lineAtOffset(int) { return nullptr; }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -40,7 +40,7 @@
#else
typedef struct objc_object* PlatformUIElement;
#endif
-#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
#include "AccessibilityNotificationHandlerAtk.h"
#include <atk/atk.h>
#include <wtf/glib/GRefPtr.h>
@@ -317,12 +317,12 @@
void getUIElementsWithAttribute(JSStringRef, Vector<RefPtr<AccessibilityUIElement> >&) const;
#endif
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
#endif
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -515,7 +515,7 @@
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
#if ENABLE(CONTEXT_MENUS)
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// Do mouse context click.
mouseDown(2, 0);
mouseUp(2, 0);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -44,8 +44,6 @@
class TestRunner;
typedef RunLoop::Timer<TestRunner> PlatformTimerRef;
}
-#elif PLATFORM(EFL)
-typedef Ecore_Timer* PlatformTimerRef;
#endif
namespace WTR {
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -54,7 +54,7 @@
if (!accessible || !ATK_IS_OBJECT(accessible))
return true;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
WKBundlePageRef page = InjectedBundle::singleton().page()->page();
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
@@ -153,7 +153,7 @@
m_notificationFunctionCallback = notificationFunctionCallback;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
WKBundlePageRef page = InjectedBundle::singleton().page()->page();
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
@@ -184,7 +184,7 @@
void AccessibilityNotificationHandler::removeAccessibilityNotificationHandler()
{
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
WKBundlePageRef page = InjectedBundle::singleton().page()->page();
WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
Deleted: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2017-04-25 21:14:06 UTC (rev 215758)
@@ -1,71 +0,0 @@
-add_custom_target(forwarding-headersEflForWebKitTestRunner
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --include-path ${WEBKIT_TESTRUNNER_SHARED_DIR} --output ${DERIVED_SOURCES_WEBKIT2_DIR}/include --platform efl --platform soup
-)
-set(ForwardingHeadersForWebKitTestRunner_NAME forwarding-headersEflForWebKitTestRunner)
-
-list(APPEND WebKitTestRunner_SOURCES
- ${WEBKIT_TESTRUNNER_DIR}/cairo/TestInvocationCairo.cpp
-
- ${WEBKIT_TESTRUNNER_DIR}/efl/EventSenderProxyEfl.cpp
- ${WEBKIT_TESTRUNNER_DIR}/efl/PlatformWebViewEfl.cpp
- ${WEBKIT_TESTRUNNER_DIR}/efl/TestControllerEfl.cpp
- ${WEBKIT_TESTRUNNER_DIR}/efl/main.cpp
-)
-
-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
- ${DERIVED_SOURCES_WEBKIT2_DIR}/include
- ${WEBKIT2_DIR}/UIProcess/API/efl
-)
-
-list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
- ${CAIRO_INCLUDE_DIRS}
- ${ECORE_INCLUDE_DIRS}
- ${ECORE_EVAS_INCLUDE_DIRS}
- ${ECORE_FILE_INCLUDE_DIRS}
- ${ECORE_IMF_INCLUDE_DIRS}
-)
-
-list(APPEND WebKitTestRunner_LIBRARIES
- WebCore
- ${CAIRO_LIBRARIES}
- ${ECORE_LIBRARIES}
- ${ECORE_EVAS_LIBRARIES}
- ${EINA_LIBRARIES}
- ${EVAS_LIBRARIES}
-)
-
-if (ENABLE_ECORE_X)
- list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
- ${ECORE_X_INCLUDE_DIRS}
- )
-
- list(APPEND WebKitTestRunner_LIBRARIES
- ${ECORE_X_LIBRARIES}
- ${X11_Xext_LIB}
- )
-endif ()
-
-if (ENABLE_ACCESSIBILITY)
- list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
- ${ATK_INCLUDE_DIRS}
- )
- list(APPEND WebKitTestRunner_LIBRARIES
- ${ATK_LIBRARIES}
- )
-endif ()
-
-list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
-
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/FontManagement.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp
-)
-
-# FIXME: EFL port needs to have own test font and font configure instead of gtk test font in future
-# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory structure.
-add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
- -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Source/webkitgtk-test-fonts")
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2017-04-25 21:14:06 UTC (rev 215758)
@@ -50,9 +50,6 @@
typedef WKViewRef PlatformWKView;
typedef GtkWidget* PlatformWindow;
typedef cairo_surface_t *PlatformImage;
-#elif PLATFORM(EFL)
-typedef Evas_Object* PlatformWKView;
-typedef Ecore_Evas* PlatformWindow;
#endif
namespace WTR {
@@ -112,10 +109,6 @@
PlatformWindow m_window;
bool m_windowIsKey;
const TestOptions m_options;
-
-#if PLATFORM(EFL)
- bool m_usingFixedLayout;
-#endif
};
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (215757 => 215758)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-04-25 21:14:06 UTC (rev 215758)
@@ -783,13 +783,6 @@
WKPageClearWheelEventTestTrigger(m_mainWebView->page());
-#if PLATFORM(EFL)
- // EFL uses a real window while other ports such as Qt don't.
- // In EFL, we need to resize the window to the original size after calls to window.resizeTo.
- WKRect rect = m_mainWebView->windowFrame();
- m_mainWebView->setWindowFrame(WKRectMake(rect.origin.x, rect.origin.y, TestController::viewWidth, TestController::viewHeight));
-#endif
-
WKPageSetMuted(m_mainWebView->page(), true);
WKPageClearUserMediaState(m_mainWebView->page());
Modified: trunk/Tools/gtk/manifest.txt.in (215757 => 215758)
--- trunk/Tools/gtk/manifest.txt.in 2017-04-25 21:12:57 UTC (rev 215757)
+++ trunk/Tools/gtk/manifest.txt.in 2017-04-25 21:14:06 UTC (rev 215758)
@@ -4,7 +4,6 @@
exclude CMakeLists.txt.user
exclude Makefile
exclude PlatformAppleWin.cmake
-exclude PlatformEfl.cmake
exclude PlatformMac.cmake
exclude PlatformWin.cmake
exclude PlatformWinCairo.cmake
