Skip to content

Commit

Permalink
Remove Legacy Dashboard Support
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=255204

Reviewed by Alexey Proskuryakov.

The Legacy Dashboard itself has not been used for many years.
We can remove it without issue now, especially since nothing
is dependent on the files themselves anymore.

* Source/WebCore/platform/mac/PasteboardMac.mm:
  (WebCore::Pasteboard::setDragImage):
* Source/WebKit/Configurations/WebKit.xcconfig:
* Source/WebKit/MigratedHeaders-input.xcfilelist:
* Source/WebKit/MigratedHeaders-output.xcfilelist:
* Source/WebKit/Modules/OSX_Private.modulemap:
* Source/WebKitLegacy/PlatformMac.cmake:
* Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj:
* Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:
* Source/WebKitLegacy/mac/WebKit.order:
* Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h: Removed.
* Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm: Removed.
* Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h:
* Source/WebKitLegacy/mac/WebView/WebView.mm:
  (-[WebView _addScrollerDashboardRegions:]): Deleted.
  (-[WebView _dashboardRegions]): Deleted.
  (-[WebView _setDashboardBehavior:to:]): Deleted.
  (-[WebView _dashboardBehavior:]): Deleted.
* Source/WebKitLegacy/mac/WebView/WebViewData.h:
* Source/WebKitLegacy/mac/WebView/WebViewPrivate.h:

Canonical link: https://commits.webkit.org/262798@main
  • Loading branch information
AtariDreams authored and aproskuryakov committed Apr 11, 2023
1 parent d7cdf93 commit e432547
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 245 deletions.
2 changes: 2 additions & 0 deletions Source/WebCore/platform/mac/PasteboardMac.mm
Expand Up @@ -815,6 +815,8 @@ static void setDragImageImpl(NSImage *image, NSPoint offset)

// Dashboard wants to be able to set the drag image during dragging, but Cocoa does not allow this.
// Instead we must drop down to the CoreGraphics API.

// FIXME: Do we still need this now Dashboard is gone?
setDragImageImpl(image.get().get(), location);

// Hack: We must post an event to wake up the NSDragManager, which is sitting in a nextEvent call
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/Configurations/WebKit.xcconfig
Expand Up @@ -214,7 +214,7 @@ EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES) $(EXCLUDED_IOS
EXCLUDED_PRODUCT_DEPENDENCY_NAMES = libWebKitAdditions.a AuthenticationServicesCore.framework;
EXCLUDED_IOS_RESOURCE_FILE_NAMES = Resources/ios/*;
EXCLUDED_IOS_RESOURCE_FILE_NAMES[sdk=iphone*] = ;
EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_YES = WebDashboardRegion.h WebDynamicScrollBarsView.h WebEventRegion.h WebIconDatabase.h WebJavaScriptTextInputPanel.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebStringTruncator.h;
EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_YES = WebDynamicScrollBarsView.h WebEventRegion.h WebIconDatabase.h WebJavaScriptTextInputPanel.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebStringTruncator.h;
EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_NO = AbstractPasteboard.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h KeyEventCodesIOS.h WAKAppKitStubs.h WAKResponder.h WAKView.h WAKWindow.h WebCaretChangeListener.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebEvent.h WebEventRegion.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebItemProviderPasteboard.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h WKContentObservation.h WKGraphics.h WKTypes.h;

INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/MigratedHeaders-input.xcfilelist
Expand Up @@ -181,7 +181,6 @@ $(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebCoreStatistics.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebCreateFragmentInternal.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDOMOperations.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDOMOperationsPrivate.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDashboardRegion.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDataSource.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDataSourcePrivate.h
$(WEBKITLEGACY_PRIVATE_HEADERS_DIR)/WebDatabaseManagerPrivate.h
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/MigratedHeaders-output.xcfilelist
Expand Up @@ -175,7 +175,6 @@ $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebCoreStatistics.h
$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebCreateFragmentInternal.h
$(TARGET_BUILD_DIR)/$(WK_MAC_PUBLIC_IOS_PRIVATE_HEADERS_DIR)/WebDOMOperations.h
$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebDOMOperationsPrivate.h
$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebDashboardRegion.h
$(TARGET_BUILD_DIR)/$(WK_MAC_PUBLIC_IOS_PRIVATE_HEADERS_DIR)/WebDataSource.h
$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebDataSourcePrivate.h
$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/WebDatabaseManagerPrivate.h
Expand Down
5 changes: 0 additions & 5 deletions Source/WebKit/Modules/OSX_Private.modulemap
Expand Up @@ -1369,11 +1369,6 @@ framework module WebKit_Private [system] {
export *
}

explicit module WebDashboardRegion {
header "WebDashboardRegion.h"
export *
}

explicit module WebDataSourcePrivate {
header "WebDataSourcePrivate.h"
export *
Expand Down
2 changes: 0 additions & 2 deletions Source/WebKitLegacy/PlatformMac.cmake
Expand Up @@ -118,7 +118,6 @@ list(APPEND WebKitLegacy_SOURCES
mac/WebInspector/WebNodeHighlighter.mm

mac/WebView/WebArchive.mm
mac/WebView/WebDashboardRegion.mm
mac/WebView/WebDelegateImplementationCaching.mm
mac/WebView/WebDeviceOrientation.mm
mac/WebView/WebDeviceOrientationProviderMock.mm
Expand Down Expand Up @@ -551,7 +550,6 @@ set(WebKitLegacy_LEGACY_FORWARDING_HEADERS_FILES
mac/WebView/WebEditingDelegate.h
mac/WebView/WebHistoryDelegate.h
mac/WebView/WebWindowAnimation.h
mac/WebView/WebDashboardRegion.h
mac/WebView/WebHTMLView.h
mac/WebView/WebIndicateLayer.h
mac/WebView/WebHTMLRepresentation.h
Expand Down
8 changes: 0 additions & 8 deletions Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
Expand Up @@ -544,8 +544,6 @@
93D437991D57ABEF00AB85EA /* ExceptionHandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D436471D57ABEE00AB85EA /* ExceptionHandlers.h */; };
93D4379B1D57ABEF00AB85EA /* ObjCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D436491D57ABEE00AB85EA /* ObjCEventListener.h */; };
93D4379D1D57ABEF00AB85EA /* ObjCNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D4364B1D57ABEE00AB85EA /* ObjCNodeFilterCondition.h */; };
93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
93E2A1A5123B0B3C009FE12A /* WebDashboardRegion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */; };
93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; };
9ACC07BC25C85A4700DC6386 /* WebMediaKeySystemClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9ACC07BB25C85A4700DC6386 /* WebMediaKeySystemClient.mm */; };
9ACC07BE25C85A5900DC6386 /* WebMediaKeySystemClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 9ACC07BD25C85A5900DC6386 /* WebMediaKeySystemClient.h */; };
Expand Down Expand Up @@ -1339,8 +1337,6 @@
93D4364B1D57ABEE00AB85EA /* ObjCNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCNodeFilterCondition.h; sourceTree = "<group>"; };
93D4364C1D57ABEE00AB85EA /* ObjCNodeFilterCondition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCNodeFilterCondition.mm; sourceTree = "<group>"; };
93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDashboardRegion.h; sourceTree = "<group>"; };
93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDashboardRegion.mm; sourceTree = "<group>"; };
93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; };
9ACC07BB25C85A4700DC6386 /* WebMediaKeySystemClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMediaKeySystemClient.mm; sourceTree = "<group>"; };
9ACC07BD25C85A5900DC6386 /* WebMediaKeySystemClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaKeySystemClient.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1934,8 +1930,6 @@
44BB8B131241A022001E3A22 /* WebArchiveInternal.h */,
933D659903413FF2008635CE /* WebClipView.h */,
933D659A03413FF2008635CE /* WebClipView.mm */,
93E2A1A2123B0B3C009FE12A /* WebDashboardRegion.h */,
93E2A1A3123B0B3C009FE12A /* WebDashboardRegion.mm */,
39446070020F50ED0ECA1767 /* WebDataSource.h */,
39446071020F50ED0ECA1767 /* WebDataSource.mm */,
658A40950A14853B005E6987 /* WebDataSourceInternal.h */,
Expand Down Expand Up @@ -2885,7 +2879,6 @@
065AD5A30B0C32C7005A2B1D /* WebContextMenuClient.h in Headers */,
939810160824BF01008DF038 /* WebCoreStatistics.h in Headers */,
E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */,
93E2A1A4123B0B3C009FE12A /* WebDashboardRegion.h in Headers */,
511F3FD70CECC88F00852565 /* WebDatabaseManagerClient.h in Headers */,
51AEDEF10CECF45700854328 /* WebDatabaseManagerInternal.h in Headers */,
511F3FD60CECC88F00852565 /* WebDatabaseManagerPrivate.h in Headers */,
Expand Down Expand Up @@ -3446,7 +3439,6 @@
A10C1D651820300E0036883A /* WebChromeClientIOS.mm in Sources */,
065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */,
939810BF0824BF01008DF038 /* WebCoreStatistics.mm in Sources */,
93E2A1A5123B0B3C009FE12A /* WebDashboardRegion.mm in Sources */,
511F3FD50CECC88F00852565 /* WebDatabaseManager.mm in Sources */,
511F3FD80CECC88F00852565 /* WebDatabaseManagerClient.mm in Sources */,
1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */,
Expand Down
Expand Up @@ -24,7 +24,7 @@
#include "../../../../Configurations/Version.xcconfig"

EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH));
EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebEventRegion.h WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDynamicScrollBarsView.* WebEventRegion.h WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm AbstractPasteboard.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h KeyEventCodesIOS.h LaBanquePostaleQuirks.js WAKAppKitStubs.h WAKResponder.h WAKView.h WAKWindow.h WebCaretChangeListener.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebEvent.h WebEventRegion.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebItemProviderPasteboard.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h WKContentObservation.h WKGraphics.h WKTypes.h;

INCLUDED_SOURCE_FILE_NAMES = $(INCLUDED_MIGRATED_HEADERS_$(USE_INTERNAL_SDK)_$(WK_COCOA_TOUCH)) $(INCLUDED_MIGRATED_HEADERS_$(ENABLE_IOS_TOUCH_EVENTS));
Expand Down
9 changes: 0 additions & 9 deletions Source/WebKitLegacy/mac/WebKit.order
Expand Up @@ -205,7 +205,6 @@ __ZN7WebCore17FrameLoaderClient24isEmptyFrameLoaderClientEv
-[WebHTMLView(WebHTMLViewFileInternal) _topHTMLView]
-[WebDataSource(WebInternal) _webView]
-[WebHTMLView(WebHTMLViewFileInternal) _webView]
-[WebView(WebPrivate) _dashboardBehavior:]
-[WebDataSource(WebInternal) _documentLoader]
-[WebDataSource pageTitle]
__ZNK7WebCore17FrameLoaderClient29shouldAlwaysUsePluginDocumentERKN3WTF6StringE
Expand Down Expand Up @@ -1283,7 +1282,6 @@ _WKSetHTTPCookieAcceptPolicy
-[WebView(WebPendingPublic) resetPageZoom:]
-[WebView(WebPrivate) _scaleWebView:atOrigin:]
-[WebView(WebPrivate) _setCustomBackingScaleFactor:]
-[WebView(WebPrivate) _setDashboardBehavior:to:]
-[WebView(WebPrivate) _clearMainFrameName]
-[WebView groupName]
+[WebView(WebPrivate) _removeAllUserContentFromGroup:]
Expand Down Expand Up @@ -2211,13 +2209,6 @@ __ZN6WebKit27NetscapePluginInstanceProxy13invokeDefaultEjPcjRS1_Rj
__ZNK7WebCore12ChromeClient39shouldRunModalDialogDuringPageDismissalERKNS0_10DialogTypeERKN3WTF6StringENS_11FrameLoader17PageDismissalTypeE
-[WebView(WebPrivate) trackedRepaintRects]
__ZN15WebChromeClient23annotatedRegionsChangedEv
-[WebView(WebPrivate) _dashboardRegions]
-[WebDashboardRegion .cxx_construct]
-[WebDashboardRegion initWithRect:clip:type:]
-[WebView(WebPrivate) _addScrollerDashboardRegions:]
-[WebView(WebPrivate) _addScrollerDashboardRegions:from:]
-[WebView(WebPrivate) _addScrollerDashboardRegionsForFrameView:dashboardRegions:]
-[WebView(WebPrivate) _addControlRect:clip:fromView:toDashboardRegions:]
__ZN15WebEditorClient26shouldMoveRangeAfterDeleteEPN7WebCore5RangeES2_
-[WebDefaultEditingDelegate webView:shouldMoveRangeAfterDelete:replacingRange:]
__ZN15WebEditorClient24textFieldDidBeginEditingEPN7WebCore7ElementE
Expand Down
53 changes: 0 additions & 53 deletions Source/WebKitLegacy/mac/WebView/WebDashboardRegion.h

This file was deleted.

97 changes: 0 additions & 97 deletions Source/WebKitLegacy/mac/WebView/WebDashboardRegion.mm

This file was deleted.

14 changes: 0 additions & 14 deletions Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h
Expand Up @@ -32,14 +32,6 @@
#import <WebKitLegacy/WAKView.h>
#endif

#if !defined(ENABLE_DASHBOARD_SUPPORT)
#if !TARGET_OS_IPHONE
#define ENABLE_DASHBOARD_SUPPORT 1
#else
#define ENABLE_DASHBOARD_SUPPORT 0
#endif
#endif

#if !defined(ENABLE_FULLSCREEN_API)
#if !TARGET_OS_IPHONE
#define ENABLE_FULLSCREEN_API 1
Expand Down Expand Up @@ -217,12 +209,6 @@ extern NSString *WebConsoleMessageErrorMessageLevel;
- (NSView *)webView:(WebView *)webView plugInViewWithArguments:(NSDictionary *)arguments;
#endif

#if ENABLE_DASHBOARD_SUPPORT
// FIXME: Remove this method once it is verified no one is dependent on it.
// regions is an dictionary whose keys are regions label and values are arrays of WebDashboardRegions.
- (void)webView:(WebView *)webView dashboardRegionsChanged:(NSDictionary *)regions;
#endif

#if !TARGET_OS_IPHONE
- (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view;
#endif
Expand Down
24 changes: 0 additions & 24 deletions Source/WebKitLegacy/mac/WebView/WebView.mm
Expand Up @@ -3454,30 +3454,6 @@ - (void)_didCommitLoadForFrame:(WebFrame *)frame

#endif // PLATFORM(IOS_FAMILY)

#if ENABLE(DASHBOARD_SUPPORT)

// FIXME: Remove these once it is verified no one is dependent on it.

- (void)_addScrollerDashboardRegions:(NSMutableDictionary *)regions
{
}

- (NSDictionary *)_dashboardRegions
{
return nil;
}

- (void)_setDashboardBehavior:(WebDashboardBehavior)behavior to:(BOOL)flag
{
}

- (BOOL)_dashboardBehavior:(WebDashboardBehavior)behavior
{
return NO;
}

#endif /* ENABLE(DASHBOARD_SUPPORT) */

#if !PLATFORM(IOS_FAMILY)
+ (void)_setUsesTestModeFocusRingColor:(BOOL)f
{
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKitLegacy/mac/WebView/WebViewData.h
Expand Up @@ -257,7 +257,7 @@ class WebSelectionServiceController;
#endif

#if !PLATFORM(IOS_FAMILY)
// WebKit has both a global plug-in database and a separate, per WebView plug-in database. Dashboard uses the per WebView database.
// WebKit has both a global plug-in database and a separate, per WebView plug-in database.
RetainPtr<WebPluginDatabase> pluginDatabase;
#endif

Expand Down

0 comments on commit e432547

Please sign in to comment.