Remove additional WebKitSystemInterface remnants
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2017 17:43:56 +0000 (17:43 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Oct 2017 17:43:56 +0000 (17:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177948

Reviewed by Andy Estes.

Source/WebCore:

* PlatformMac.cmake: Remove logic to select and link an appropriate
WebKitSystemInterface library.

* html/shadow/MediaControlElementTypes.h: Remove comment about matching
WebKitSystemInterface.h, now obsolete.

* rendering/RenderMediaControls.cpp: Wrap whole file in a single conditional
to make it clear that it's only used at all in this one particular case.
(wkHitTestMediaUIPart): Deleted.
(wkMeasureMediaUIPart): Deleted.
(wkDrawMediaUIPart): Deleted.
(wkDrawMediaSliderTrack): Deleted.
(WebCore::determineState): Deleted.
(WebCore::getUnzoomedRectAndAdjustCurrentContext): Deleted.
(WebCore::RenderMediaControls::adjustMediaSliderThumbSize): Call the
WKMeasureMediaUIPart instead of through an inline function to rename it.
(WebCore::RenderMediaControls::paintMediaControlsPart): Deleted.

* rendering/RenderMediaControls.h: Wrap whole file in a single conditional
to make it clear that it's only used at all in this one particular case.
Removed unneeded includes, forward declarations, and function declaration.

* rendering/RenderThemeMac.mm: Removed include of RenderMediaControls.h.

Source/WebKitLegacy:

* PlatformMac.cmake: Removed reference to deleted file WebSystemInterface.mm.

Tools:

* DumpRenderTree/PlatformMac.cmake: Removed code to link the
WebKitSystemInterface library. Left in code that points to
the WebKitLibraries directory, but maybe that can be removed by
someone who is more certain it's no longer needed.

* Scripts/copy-webkitlibraries-to-product-directory: Removed code
to copy and delete WebKitSystemInterface libraries and headers.

* WebKitTestRunner/PlatformMac.cmake: Removed code to link the
WebKitSystemInterface library. Left in code that points to
the WebKitLibraries directory, but maybe that can be removed by
someone who is more certain it's no longer needed.

WebKitLibraries:

* libWebKitSystemInterfaceElCapitan.a: Removed.
* libWebKitSystemInterfaceIOSDevice10.a: Removed.
* libWebKitSystemInterfaceIOSDevice11.a: Removed.
* libWebKitSystemInterfaceIOSSimulator10.a: Removed.
* libWebKitSystemInterfaceIOSSimulator11.a: Removed.
* libWebKitSystemInterfaceOSX10.12.a: Removed.
* libWebKitSystemInterfaceOSX10.13.a: Removed.

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

20 files changed:
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/html/shadow/MediaControlElementTypes.h
Source/WebCore/rendering/RenderMediaControls.cpp
Source/WebCore/rendering/RenderMediaControls.h
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformMac.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake
Tools/Scripts/copy-webkitlibraries-to-product-directory
Tools/WebKitTestRunner/PlatformMac.cmake
WebKitLibraries/ChangeLog
WebKitLibraries/libWebKitSystemInterfaceElCapitan.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceIOSDevice10.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceIOSDevice11.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceIOSSimulator10.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceIOSSimulator11.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceOSX10.12.a [deleted file]
WebKitLibraries/libWebKitSystemInterfaceOSX10.13.a [deleted file]

index af2ce01..c551887 100644 (file)
@@ -1,3 +1,34 @@
+2017-10-05  Darin Adler  <darin@apple.com>
+
+        Remove additional WebKitSystemInterface remnants
+        https://bugs.webkit.org/show_bug.cgi?id=177948
+
+        Reviewed by Andy Estes.
+
+        * PlatformMac.cmake: Remove logic to select and link an appropriate
+        WebKitSystemInterface library.
+
+        * html/shadow/MediaControlElementTypes.h: Remove comment about matching
+        WebKitSystemInterface.h, now obsolete.
+
+        * rendering/RenderMediaControls.cpp: Wrap whole file in a single conditional
+        to make it clear that it's only used at all in this one particular case.
+        (wkHitTestMediaUIPart): Deleted.
+        (wkMeasureMediaUIPart): Deleted.
+        (wkDrawMediaUIPart): Deleted.
+        (wkDrawMediaSliderTrack): Deleted.
+        (WebCore::determineState): Deleted.
+        (WebCore::getUnzoomedRectAndAdjustCurrentContext): Deleted.
+        (WebCore::RenderMediaControls::adjustMediaSliderThumbSize): Call the
+        WKMeasureMediaUIPart instead of through an inline function to rename it.
+        (WebCore::RenderMediaControls::paintMediaControlsPart): Deleted.
+
+        * rendering/RenderMediaControls.h: Wrap whole file in a single conditional
+        to make it clear that it's only used at all in this one particular case.
+        Removed unneeded includes, forward declarations, and function declaration.
+
+        * rendering/RenderThemeMac.mm: Removed include of RenderMediaControls.h.
+
 2017-10-05  Zalan Bujtas  <zalan@apple.com>
 
         Remove redundant LayoutStateDisabler from RenderTreeUpdaterFirstLetter
index 40e8522..5e4ec62 100644 (file)
@@ -1,11 +1,3 @@
-if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
-    set(WEBKITSYSTEMINTERFACE_LIBRARY ${CMAKE_SOURCE_DIR}/WebKitLibraries/libWebKitSystemInterfaceMavericks.a)
-elseif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
-    set(WEBKITSYSTEMINTERFACE_LIBRARY ${CMAKE_SOURCE_DIR}/WebKitLibraries/libWebKitSystemInterfaceYosemite.a)
-else ()
-    set(WEBKITSYSTEMINTERFACE_LIBRARY ${CMAKE_SOURCE_DIR}/WebKitLibraries/libWebKitSystemInterfaceElCapitan.a)
-endif ()
-
 find_library(ACCELERATE_LIBRARY accelerate)
 find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
 find_library(AVFOUNDATION_LIBRARY AVFoundation)
@@ -49,7 +41,6 @@ list(APPEND WebCore_LIBRARIES
     ${SECURITY_LIBRARY}
     ${SQLITE_LIBRARIES}
     ${SYSTEMCONFIGURATION_LIBRARY}
-    ${WEBKITSYSTEMINTERFACE_LIBRARY}
     ${XML2_LIBRARY}
     ${ZLIB_LIBRARY}
 )
index ea05eb7..81fd05b 100644 (file)
@@ -39,7 +39,6 @@
 
 namespace WebCore {
 
-// Must match WebKitSystemInterface.h
 enum MediaControlElementType {
     MediaEnterFullscreenButton = 0,
     MediaMuteButton,
index 3e8a762..184ac6d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2009-2017 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  */
 
 #include "config.h"
-
-#if ENABLE(VIDEO)
-
 #include "RenderMediaControls.h"
 
-#include "DOMWindow.h"
-#include "GraphicsContext.h"
-#include "HTMLMediaElement.h"
-#include "HTMLNames.h"
-#include "NotImplemented.h"
-#include "PaintInfo.h"
-#include "RenderTheme.h"
-
-// FIXME: Unify more of the code for Mac and Win.
-#if PLATFORM(WIN) && USE(CG)
+#if ENABLE(VIDEO) && PLATFORM(WIN) && USE(CG)
 
+#include "RenderStyle.h"
 #include <CoreGraphics/CoreGraphics.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 
-// The Windows version of WKSI defines these functions as capitalized, while the Mac version defines them as lower case.
-// FIXME: Is this necessary anymore?
-inline bool wkHitTestMediaUIPart(int part, const CGRect& bounds, const CGPoint& point)
-{
-    WKHitTestMediaUIPart(part, bounds, point);
-}
-
-inline void wkMeasureMediaUIPart(int part, CGRect* bounds, CGSize* naturalSize)
-{
-    WKMeasureMediaUIPart(part, bounds, naturalSize);
-}
-
-inline void wkDrawMediaUIPart(int part, CGContextRef context, const CGRect& rect, unsigned state)
-{
-    WKDrawMediaUIPart(part, context, rect, state);
-}
-
-inline void wkDrawMediaSliderTrack(CGContextRef context, const CGRect& rect, float timeLoaded, float currentTime, float duration, unsigned state)
-{
-    WKDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state);
-}
-
-#endif
-
 namespace WebCore {
 
-#if PLATFORM(WIN) && USE(CG)
-
-static WKMediaControllerThemeState determineState(const RenderObject& o)
-{
-    int result = 0;
-    const RenderTheme& theme = o.theme();
-    if (!theme.isEnabled(o) || theme.isReadOnlyControl(o))
-        result |= WKMediaControllerFlagDisabled;
-    if (theme.isPressed(o))
-        result |= WKMediaControllerFlagPressed;
-    if (theme.isFocused(o))
-        result |= WKMediaControllerFlagFocused;
-    return static_cast<WKMediaControllerThemeState>(result);
-}
-
-// Utility to scale when the UI part are not scaled by wkDrawMediaUIPart
-static FloatRect getUnzoomedRectAndAdjustCurrentContext(const RenderObject& o, const PaintInfo& paintInfo, const IntRect &originalRect)
-{
-    float zoomLevel = o.style().effectiveZoom();
-    FloatRect unzoomedRect(originalRect);
-    if (zoomLevel != 1.0f) {
-        unzoomedRect.setSize(unzoomedRect.size() / zoomLevel);
-        paintInfo.context().translate(unzoomedRect.location());
-        paintInfo.context().scale(zoomLevel);
-        paintInfo.context().translate(-unzoomedRect.location());
-    }
-    return unzoomedRect;
-}
-
 static const int mediaSliderThumbWidth = 13;
 static const int mediaSliderThumbHeight = 14;
 
@@ -120,114 +55,13 @@ void RenderMediaControls::adjustMediaSliderThumbSize(RenderStyle& style)
     }
 
     CGSize size;
-    wkMeasureMediaUIPart(part, 0, &size);
+    WKMeasureMediaUIPart(part, 0, &size);
 
     float zoomLevel = style.effectiveZoom();
     style.setWidth(Length(static_cast<int>(size.width * zoomLevel), Fixed));
     style.setHeight(Length(static_cast<int>(size.height * zoomLevel), Fixed));
 }
 
-bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
-{
-#if USE(DIRECT2D)
-    UNUSED_PARAM(part);
-    UNUSED_PARAM(o);
-    UNUSED_PARAM(paintInfo);
-    UNUSED_PARAM(r);
-    notImplemented();
-#else
-    GraphicsContextStateSaver stateSaver(paintInfo.context());
-
-    switch (part) {
-    case MediaEnterFullscreenButton:
-    case MediaExitFullscreenButton:
-        if (MediaControlFullscreenButtonElement* btn = static_cast<MediaControlFullscreenButtonElement*>(o.node())) {
-            bool enterButton = btn->displayType() == MediaEnterFullscreenButton;
-            wkDrawMediaUIPart(enterButton ? WKMediaUIPartFullscreenButton : WKMediaUIPartExitFullscreenButton, paintInfo.context().platformContext(), r, determineState(o));
-        }
-        break;
-    case MediaShowClosedCaptionsButton:
-    case MediaHideClosedCaptionsButton:
-        if (MediaControlToggleClosedCaptionsButtonElement* btn = static_cast<MediaControlToggleClosedCaptionsButtonElement*>(o.node())) {
-            bool captionsVisible = btn->displayType() == MediaHideClosedCaptionsButton;
-            wkDrawMediaUIPart(captionsVisible ? WKMediaUIPartHideClosedCaptionsButton : WKMediaUIPartShowClosedCaptionsButton, paintInfo.context().platformContext(), r, determineState(o));
-        }
-        break;
-    case MediaMuteButton:
-    case MediaUnMuteButton:
-        if (MediaControlMuteButtonElement* btn = static_cast<MediaControlMuteButtonElement*>(o.node())) {
-            bool audioEnabled = btn->displayType() == MediaMuteButton;
-            wkDrawMediaUIPart(audioEnabled ? WKMediaUIPartMuteButton : WKMediaUIPartUnMuteButton, paintInfo.context().platformContext(), r, determineState(o));
-        }
-        break;
-    case MediaPauseButton:
-    case MediaPlayButton:
-        if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(o.node())) {
-            bool canPlay = btn->displayType() == MediaPlayButton;
-            wkDrawMediaUIPart(canPlay ? WKMediaUIPartPlayButton : WKMediaUIPartPauseButton, paintInfo.context().platformContext(), r, determineState(o));
-        }
-        break;
-    case MediaRewindButton:
-        wkDrawMediaUIPart(WKMediaUIPartRewindButton, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaReturnToRealtimeButton:
-        wkDrawMediaUIPart(WKMediaUIPartSeekToRealtimeButton, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaSeekBackButton:
-        wkDrawMediaUIPart(WKMediaUIPartSeekBackButton, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaSeekForwardButton:
-        wkDrawMediaUIPart(WKMediaUIPartSeekForwardButton, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaSlider: {
-        if (HTMLMediaElement* mediaElement = parentMediaElement(o)) {
-            FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
-            wkDrawMediaSliderTrack(paintInfo.context().platformContext(), unzoomedRect, mediaElement->percentLoaded() * mediaElement->duration(), mediaElement->currentTime(), mediaElement->duration(), determineState(o));
-        }
-        break;
-    }
-    case MediaSliderThumb:
-        wkDrawMediaUIPart(WKMediaUIPartTimelineSliderThumb, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaVolumeSliderContainer:
-        wkDrawMediaUIPart(WKMediaUIPartVolumeSliderContainer, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaVolumeSlider:
-        wkDrawMediaUIPart(WKMediaUIPartVolumeSlider, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaVolumeSliderThumb:
-        wkDrawMediaUIPart(WKMediaUIPartVolumeSliderThumb, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaFullScreenVolumeSlider:
-        wkDrawMediaUIPart(WKMediaUIPartFullScreenVolumeSlider, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaFullScreenVolumeSliderThumb:
-        wkDrawMediaUIPart(WKMediaUIPartFullScreenVolumeSliderThumb, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaTimelineContainer:
-        wkDrawMediaUIPart(WKMediaUIPartBackground, paintInfo.context().platformContext(), r, determineState(o));
-        break;
-    case MediaCurrentTimeDisplay:
-        ASSERT_NOT_REACHED();
-        break;
-    case MediaTimeRemainingDisplay:
-        ASSERT_NOT_REACHED();
-        break;
-    case MediaControlsPanel:
-        ASSERT_NOT_REACHED();
-    case MediaTextTrackDisplayContainer:
-    case MediaTextTrackDisplay:
-    case MediaClosedCaptionsContainer:
-    case MediaClosedCaptionsTrackList:
-        ASSERT_NOT_REACHED();
-        break;
-    }
-#endif
-    return false;
-}
-
-#endif
-
 }
 
 #endif
index f8f8ac9..49028f1 100644 (file)
 
 #pragma once
 
-#if ENABLE(VIDEO)
-
-#include "MediaControlElementTypes.h"
+#if ENABLE(VIDEO) && PLATFORM(WIN) && USE(CG)
 
 namespace WebCore {
 
-struct PaintInfo;
-
-class HTMLMediaElement;
-class IntRect;
-class IntSize;
-class RenderBox;
-class RenderObject;
 class RenderStyle;
 
 class RenderMediaControls {
 public:
-
-#if PLATFORM(WIN)
-    static bool paintMediaControlsPart(MediaControlElementType, const RenderObject&, const PaintInfo&, const IntRect&);
     static void adjustMediaSliderThumbSize(RenderStyle&);
-#endif
 };
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO)
+#endif ENABLE(VIDEO) && PLATFORM(WIN) && USE(CG)
index d08d804..31b4eb7 100644 (file)
@@ -54,7 +54,6 @@
 #import "RenderLayer.h"
 #import "RenderMedia.h"
 #import "RenderMediaControlElements.h"
-#import "RenderMediaControls.h"
 #import "RenderProgress.h"
 #import "RenderSlider.h"
 #import "RenderSnapshottedPlugIn.h"
index 82c492a..b3e51b7 100644 (file)
@@ -1,3 +1,12 @@
+2017-10-05  Darin Adler  <darin@apple.com>
+
+        Remove additional WebKitSystemInterface remnants
+        https://bugs.webkit.org/show_bug.cgi?id=177948
+
+        Reviewed by Andy Estes.
+
+        * PlatformMac.cmake: Removed reference to deleted file WebSystemInterface.mm.
+
 2017-10-04  Alex Christensen  <achristensen@webkit.org>
 
         Stop linking with WebKitSystemInterface
index 69bb880..59ab346 100644 (file)
@@ -271,7 +271,6 @@ list(APPEND WebKitLegacy_SOURCES
     mac/WebCoreSupport/WebProgressTrackerClient.mm
     mac/WebCoreSupport/WebSecurityOrigin.mm
     mac/WebCoreSupport/WebSelectionServiceController.mm
-    mac/WebCoreSupport/WebSystemInterface.mm
     mac/WebCoreSupport/WebUserMediaClient.mm
     mac/WebCoreSupport/WebValidationMessageClient.mm
     mac/WebCoreSupport/WebVisitedLinkStore.mm
index 0f6d80e..bb23a94 100644 (file)
@@ -1,3 +1,23 @@
+2017-10-05  Darin Adler  <darin@apple.com>
+
+        Remove additional WebKitSystemInterface remnants
+        https://bugs.webkit.org/show_bug.cgi?id=177948
+
+        Reviewed by Andy Estes.
+
+        * DumpRenderTree/PlatformMac.cmake: Removed code to link the
+        WebKitSystemInterface library. Left in code that points to
+        the WebKitLibraries directory, but maybe that can be removed by
+        someone who is more certain it's no longer needed.
+
+        * Scripts/copy-webkitlibraries-to-product-directory: Removed code
+        to copy and delete WebKitSystemInterface libraries and headers.
+
+        * WebKitTestRunner/PlatformMac.cmake: Removed code to link the
+        WebKitSystemInterface library. Left in code that points to
+        the WebKitLibraries directory, but maybe that can be removed by
+        someone who is more certain it's no longer needed.
+
 2017-10-05  Saam Barati  <sbarati@apple.com>
 
         Unreviewed. Try to make debug type profiler tests stop timing out.
index db283ab..1d01a48 100644 (file)
@@ -5,14 +5,8 @@ find_library(CORESERVICES_LIBRARY CoreServices)
 # FIXME: We shouldn't need to define NS_RETURNS_RETAINED.
 add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks -iframework ${CORESERVICES_LIBRARY}/Frameworks -DNS_RETURNS_RETAINED=)
 
-if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
-endif ()
 link_directories(../../WebKitLibraries)
+include_directories(../../WebKitLibraries)
 
 list(APPEND TestNetscapePlugIn_LIBRARIES
     ${QUARTZ_LIBRARY}
@@ -22,20 +16,9 @@ list(APPEND TestNetscapePlugIn_LIBRARIES
 list(APPEND DumpRenderTree_LIBRARIES
     ${CARBON_LIBRARY}
     ${QUARTZ_LIBRARY}
-    ${WEBKITSYSTEMINTERFACE_LIBRARY}
     WebKit
 )
 
-if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
-endif ()
-link_directories(../../WebKitLibraries)
-include_directories(../../WebKitLibraries)
-
 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     cg
     cf
index f3c96e7..7ae153b 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005-2016 Apple Inc. All rights reserved.
+# Copyright (C) 2005-2017 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@ my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options]
   --help                        Show this help message
-  --[no-]wksi                   Toggle copying WebKitSystemInterface drops (default: $wksi)
+  --[no-]wksi                   Obsolete. Does nothing. Remove once we are sure nobody passes this option any more.
   --clean                       Clean the libraries (default: $clean)
   --[no-]use-full-lib-paths     Toggle using full library paths
   --sdk=<sdk>                   Use a specific Xcode SDK
@@ -120,47 +120,9 @@ sub dittoHeaders
 
 if ($clean) {
     print "Cleaning.\n";    
-    (system("rm", "-rf", File::Spec->catfile($productDir, "usr", "local", "include", "WebKitSystemInterface.h")) == 0) or die;
-    unlink glob "$productDir/libWebKitSystemInterface*" or die if glob "$productDir/libWebKitSystemInterface*";
-    unlink glob "$productDir/usr/local/lib/libWebKitSystemInterface*" or die if glob "$productDir/usr/local/lib/libWebKitSystemInterface*";
     unlink glob "$productDir/libLTO*" or die if glob "$productDir/libLTO*";
 }
 
-if ($wksi) {
-    (system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
-    
-    my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/lib" : $productDir;
-    (system("mkdir", "-p", $libraryDir) == 0) or die;
-
-    my @librariesToCopy;
-    if (isIOSWebKit()) {
-        push(@librariesToCopy, (
-            "libWebKitSystemInterfaceIOSDevice10.a",
-            "libWebKitSystemInterfaceIOSSimulator10.a",
-            "libWebKitSystemInterfaceIOSDevice11.a",
-            "libWebKitSystemInterfaceIOSSimulator11.a",
-        ));
-    } else {
-        push(@librariesToCopy, (
-            "libWebKitSystemInterfaceElCapitan.a",
-            "libWebKitSystemInterfaceOSX10.12.a",
-            "libWebKitSystemInterfaceOSX10.13.a"
-        ));
-    }
-
-    foreach my $libraryName (@librariesToCopy) {
-        my $sourceLibrary = "WebKitLibraries/" . $libraryName;
-        my $targetLibrary = "$libraryDir/" . $libraryName;
-        if ($force || !-e $targetLibrary || -M $targetLibrary > -M $sourceLibrary) {
-            print "Updating $targetLibrary\n";
-            (system("ditto", $sourceLibrary, $targetLibrary) == 0) or die;
-            executeRanlib($targetLibrary);
-        }
-    }
-    
-    dittoHeaders("WebKitLibraries/WebKitSystemInterface.h", "$productDir/usr/local/include/WebKitSystemInterface.h");
-}
-
 sub fileContains
 {
     my ($filename, $string) = @_;
index 8ee301e..313dbcd 100644 (file)
@@ -5,18 +5,10 @@ find_library(CORESERVICES_LIBRARY CoreServices)
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
 add_definitions(-iframework ${CORESERVICES_LIBRARY}/Versions/Current/Frameworks)
 
-if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
-elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
-else ()
-set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
-endif ()
 link_directories(../../WebKitLibraries)
 
 list(APPEND WebKitTestRunner_LIBRARIES
     ${CARBON_LIBRARY}
-    ${WEBKITSYSTEMINTERFACE_LIBRARY}
 )
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
index a893c69..073e8e2 100644 (file)
@@ -1,3 +1,18 @@
+2017-10-05  Darin Adler  <darin@apple.com>
+
+        Remove additional WebKitSystemInterface remnants
+        https://bugs.webkit.org/show_bug.cgi?id=177948
+
+        Reviewed by Andy Estes.
+
+        * libWebKitSystemInterfaceElCapitan.a: Removed.
+        * libWebKitSystemInterfaceIOSDevice10.a: Removed.
+        * libWebKitSystemInterfaceIOSDevice11.a: Removed.
+        * libWebKitSystemInterfaceIOSSimulator10.a: Removed.
+        * libWebKitSystemInterfaceIOSSimulator11.a: Removed.
+        * libWebKitSystemInterfaceOSX10.12.a: Removed.
+        * libWebKitSystemInterfaceOSX10.13.a: Removed.
+
 2017-07-05  Jonathan Bedard  <jbedard@apple.com>
 
         Add WebKitPrivateFrameworkStubs for iOS 11
diff --git a/WebKitLibraries/libWebKitSystemInterfaceElCapitan.a b/WebKitLibraries/libWebKitSystemInterfaceElCapitan.a
deleted file mode 100644 (file)
index 659ee5c..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceElCapitan.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSDevice10.a b/WebKitLibraries/libWebKitSystemInterfaceIOSDevice10.a
deleted file mode 100644 (file)
index b2bb82d..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceIOSDevice10.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSDevice11.a b/WebKitLibraries/libWebKitSystemInterfaceIOSDevice11.a
deleted file mode 100644 (file)
index 877199e..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceIOSDevice11.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator10.a b/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator10.a
deleted file mode 100644 (file)
index 8608d26..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator10.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator11.a b/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator11.a
deleted file mode 100644 (file)
index a712a01..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceIOSSimulator11.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceOSX10.12.a b/WebKitLibraries/libWebKitSystemInterfaceOSX10.12.a
deleted file mode 100644 (file)
index c8fbeb3..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceOSX10.12.a and /dev/null differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceOSX10.13.a b/WebKitLibraries/libWebKitSystemInterfaceOSX10.13.a
deleted file mode 100644 (file)
index 2d98d6d..0000000
Binary files a/WebKitLibraries/libWebKitSystemInterfaceOSX10.13.a and /dev/null differ