Skip to content

Commit 10a179e

Browse files
darinadlerdarinadler
committed
Use #import instead of #include in Objective-C and don't use #pragma once
https://bugs.webkit.org/show_bug.cgi?id=210724 Reviewed by David Kilzer. Source/JavaScriptCore: * API/JSAPIWrapperObject.mm: * API/JSContext.h: * API/JSContext.mm: * API/JSScriptInternal.h: * API/JSValue.mm: * API/JSVirtualMachine.mm: * API/JSVirtualMachinePrivate.h: * API/JSWrapperMap.mm: * API/ObjCCallbackFunction.mm: * API/tests/CurrentThisInsideBlockGetterTest.mm: More #import, less #pragma once. Source/WebCore: * page/cocoa/SettingsBaseCocoa.mm: (WebCore::sansSerifTraditionalHanFontFamily): Deleted. (WebCore::sansSerifSimplifiedHanFontFamily): Deleted. (WebCore::SettingsBase::initializeDefaultFontFamilies): Just use font name strings directly since there are no conditionals any more. * Modules/applepay/PaymentRequestValidator.mm: * Modules/applepay/cocoa/PaymentContactCocoa.mm: * accessibility/ios/WebAccessibilityObjectWrapperIOS.h: * accessibility/mac/AXObjectCacheMac.mm: * accessibility/mac/WebAccessibilityObjectWrapperBase.h: * accessibility/mac/WebAccessibilityObjectWrapperMac.h: * bridge/objc/WebScriptObjectPrivate.h: * bridge/objc/objc_class.mm: * bridge/testbindings.mm: * crypto/mac/SerializedCryptoKeyWrapMac.mm: * editing/cocoa/WebArchiveResourceFromNSAttributedString.h: * editing/cocoa/WebArchiveResourceWebResourceHandler.h: * editing/cocoa/WebContentReaderCocoa.mm: * history/mac/HistoryItemMac.mm: * loader/cocoa/DiskCacheMonitorCocoa.mm: * loader/cocoa/SubresourceLoaderCocoa.mm: * loader/mac/ResourceLoaderMac.mm: * page/cocoa/MemoryReleaseCocoa.mm: * page/cocoa/ResourceUsageOverlayCocoa.mm: * page/cocoa/ResourceUsageThreadCocoa.mm: * page/ios/WebEventRegion.h: * page/mac/ChromeMac.mm: * page/mac/EventHandlerMac.mm: * page/mac/WheelEventDeltaFilterMac.mm: * page/scrolling/cocoa/ScrollingStateNode.mm: * page/scrolling/mac/ScrollingCoordinatorMac.mm: * page/scrolling/mac/ScrollingMomentumCalculatorMac.mm: * page/scrolling/mac/ScrollingStateScrollingNodeMac.mm: * page/scrolling/mac/ScrollingThreadMac.mm: * page/scrolling/mac/ScrollingTreeMac.mm: * platform/audio/cocoa/MediaSessionManagerCocoa.mm: * platform/audio/mac/AudioSampleDataSource.mm: * platform/cocoa/DataDetectorsCoreSoftLink.mm: * platform/cocoa/PasteboardCocoa.mm: * platform/cocoa/ScrollSnapAnimatorState.mm: * platform/cocoa/SystemVersion.mm: * platform/gamepad/cocoa/GameControllerGamepad.mm: * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm: * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm: * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm: * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm: * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: * platform/graphics/ca/cocoa/WebSystemBackdropLayer.h: * platform/graphics/ca/cocoa/WebTiledBackingLayer.h: * platform/graphics/ca/cocoa/WebVideoContainerLayer.h: * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: * platform/graphics/cocoa/IOSurfacePoolCocoa.mm: * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm: * platform/graphics/cocoa/WebGLLayer.h: * platform/graphics/cocoa/WebGLLayer.mm: * platform/graphics/cocoa/WebGPULayer.h: * platform/graphics/cocoa/WebGPULayer.mm: * platform/graphics/cv/ImageRotationSessionVT.mm: * platform/graphics/cv/ImageTransferSessionVT.mm: * platform/graphics/cv/TextureCacheCV.mm: * platform/graphics/gpu/cocoa/GPUBufferMetal.mm: * platform/graphics/gpu/cocoa/GPUComputePassEncoderMetal.mm: * platform/graphics/mac/ComplexTextControllerCoreText.mm: * platform/graphics/mac/FloatPointMac.mm: * platform/graphics/mac/FloatSizeMac.mm: * platform/graphics/mac/IntPointMac.mm: * platform/graphics/mac/IntSizeMac.mm: * platform/graphics/mac/WebLayer.h: * platform/graphics/mac/WebLayer.mm: * platform/ios/LegacyTileCache.mm: * platform/ios/LegacyTileGrid.mm: * platform/ios/LegacyTileGridTile.mm: * platform/ios/LegacyTileLayer.h: * platform/ios/LegacyTileLayer.mm: * platform/ios/LegacyTileLayerPool.mm: * platform/ios/LocalCurrentTraitCollection.mm: * platform/ios/LocalizedDeviceModel.mm: * platform/ios/ScrollbarThemeIOS.mm: * platform/ios/WebCoreMotionManager.h: * platform/ios/WebItemProviderPasteboard.mm: * platform/ios/WebVideoFullscreenControllerAVKit.h: * platform/mac/LocalCurrentGraphicsContext.mm: * platform/mac/LocalDefaultSystemAppearance.mm: * platform/mac/LoggingMac.mm: * platform/mac/PlatformEventFactoryMac.mm: * platform/mac/RemoteCommandListenerMac.mm: * platform/mac/ScrollAnimatorMac.mm: * platform/mac/SerializedPlatformDataCueMac.mm: * platform/mac/WebCoreFullScreenPlaceholderView.mm: * platform/mac/WebCoreFullScreenWarningView.h: * platform/mac/WebCoreFullScreenWarningView.mm: * platform/mac/WebCoreFullScreenWindow.h: * platform/mac/WebCoreObjCExtras.mm: * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm: * platform/mediasession/mac/MediaSessionInterruptionProviderMac.mm: * platform/mediastream/ios/AVAudioSessionCaptureDevice.mm: * platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm: * platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm: * platform/mediastream/mac/RealtimeMediaSourceCenterMac.mm: * platform/mediastream/mac/RealtimeVideoUtilities.mm: * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm: * platform/network/cocoa/CertificateInfoCocoa.mm: * platform/network/cocoa/WebCoreNSURLSession.h: * platform/network/mac/BlobDataFileReferenceMac.mm: * platform/network/mac/CredentialStorageMac.mm: * platform/network/mac/SynchronousLoaderClient.mm: * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h: * platform/text/cocoa/LocaleCocoa.mm: * testing/ServiceWorkerInternals.mm: * testing/cocoa/WebViewVisualIdentificationOverlay.h: More #import, less #pragma once. Source/WebCore/PAL: * pal/cocoa/AppSSOSoftLink.mm: * pal/cocoa/FileSizeFormatterCocoa.mm: * pal/cocoa/UsageTrackingSoftLink.mm: * pal/ios/ManagedConfigurationSoftLink.mm: * pal/ios/UIKitSoftLink.mm: * pal/mac/LookupSoftLink.mm: * pal/spi/cocoa/AVFoundationSPI.h: * pal/spi/cocoa/AccessibilitySupportSoftLink.cpp: * pal/spi/cocoa/AppSSOSPI.h: * pal/spi/cocoa/AuthKitSPI.h: * pal/spi/cocoa/DataDetectorsCoreSPI.h: * pal/spi/cocoa/LaunchServicesSPI.h: * pal/spi/cocoa/NSAccessibilitySPI.h: * pal/spi/cocoa/NSAttributedStringSPI.h: * pal/spi/cocoa/NSProgressSPI.h: * pal/spi/cocoa/NSURLDownloadSPI.h: * pal/spi/cocoa/NSUserDefaultsSPI.h: * pal/spi/cocoa/NSXPCConnectionSPI.h: * pal/spi/cocoa/PassKitSPI.h: * pal/spi/cocoa/SecKeyProxySPI.h: * pal/spi/ios/CelestialSPI.h: * pal/spi/mac/DataDetectorsSPI.h: * pal/spi/mac/NSColorWellSPI.h: * pal/spi/mac/NSGraphicsSPI.h: * pal/spi/mac/NSPopoverColorWellSPI.h: * pal/spi/mac/NSScrollerImpSPI.h: More #import, less #pragma once. Source/WebKit: * mac/MigrateHeadersFromWebKitLegacy.make: Delete stale MemoryMeasure.h forwarding header from incremental WebKit builds and ignore when generating new forwarding headers. * Platform/foundation/LoggingFoundation.mm: (WebKit::logLevelString): Use string directly instead of a named constant. * UIProcess/mac/WebColorPickerMac.h: Mark class final. * GPUProcess/webrtc/LibWebRTCCodecsProxy.mm: * NetworkProcess/WebStorage/ios/LocalStorageDatabaseTrackerIOS.mm: * NetworkProcess/cache/NetworkCacheDataCocoa.mm: * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm: * NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm: * NetworkProcess/cocoa/NetworkSessionCocoa.mm: * NetworkProcess/webrtc/NetworkRTCProvider.mm: * Platform/spi/Cocoa/DeviceManagementSPI.h: * Platform/spi/Cocoa/LocalAuthenticationSPI.h: * Platform/spi/Cocoa/NearFieldSPI.h: * Platform/spi/Cocoa/SafeBrowsingSPI.h: * Platform/spi/mac/AppKitSPI.h: * Shared/API/Cocoa/RemoteObjectInvocation.mm: * Shared/API/Cocoa/WKMain.mm: * Shared/APIWebArchive.mm: * Shared/APIWebArchiveResource.mm: * Shared/Authentication/cocoa/AuthenticationChallengeDispositionCocoa.mm: * Shared/Cocoa/LoadParametersCocoa.mm: * Shared/Cocoa/SandboxInitialiationParametersCocoa.mm: * Shared/Cocoa/WKNSData.mm: * Shared/DocumentEditingContext.mm: * Shared/Plugins/mac/PluginSandboxProfile.mm: * Shared/RemoteLayerTree/WKAnimationDelegate.h: * Shared/UserInterfaceIdiom.mm: * Shared/ios/WebIconUtilities.mm: * Shared/mac/CodeSigning.mm: * Shared/mac/ColorSpaceData.mm: * Shared/mac/HangDetectionDisablerMac.mm: * Shared/mac/PDFKitImports.mm: * UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm: * UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm: * UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm: * UIProcess/API/Cocoa/WKContentRuleList.mm: * UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm: * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm: * UIProcess/API/Cocoa/WKWebViewInternal.h: * UIProcess/API/Cocoa/WKWebpagePreferencesInternal.h: * UIProcess/API/Cocoa/_WKApplicationManifest.h: * UIProcess/API/Cocoa/_WKAttachment.h: * UIProcess/API/Cocoa/_WKResourceLoadInfoInternal.h: * UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstPartyInternal.h: * UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdPartyInternal.h: * UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.mm: * UIProcess/API/Cocoa/_WKUserContentFilter.mm: * UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponseInternal.h: * UIProcess/API/Cocoa/_WKWebAuthenticationPanelInternal.h: * UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h: * UIProcess/Authentication/mac/WebCredentialMac.mm: * UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm: * UIProcess/Cocoa/IconLoadingDelegate.mm: * UIProcess/Cocoa/MediaUtilities.mm: * UIProcess/Cocoa/PreferenceObserver.h: * UIProcess/Cocoa/PreferenceObserver.mm: * UIProcess/Cocoa/SOAuthorization/NavigationSOAuthorizationSession.mm: * UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h: * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm: * UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h: * UIProcess/Cocoa/WKEditCommand.h: * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h: * UIProcess/Cocoa/WebPageProxyCocoa.mm: * UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm: * UIProcess/Inspector/mac/WKInspectorViewController.h: * UIProcess/Inspector/mac/WKInspectorWKWebView.h: * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.h: * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h: * UIProcess/RemoteLayerTree/mac/ScrollerMac.mm: * UIProcess/RemoteLayerTree/mac/ScrollerPairMac.mm: * UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm: * UIProcess/WebAuthentication/Cocoa/WKNFReaderSessionDelegate.h: * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm: * UIProcess/ios/WKDeferringGestureRecognizer.h: * UIProcess/ios/WKHighlightLongPressGestureRecognizer.h: * UIProcess/ios/WebDataListSuggestionsDropdownIOS.h: * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm: * UIProcess/ios/forms/WKDatePickerViewController.h: * UIProcess/ios/forms/WKDatePickerViewController.mm: * UIProcess/ios/forms/WKFocusedFormControlView.h: * UIProcess/ios/forms/WKFocusedFormControlView.mm: * UIProcess/ios/forms/WKFormColorPicker.mm: * UIProcess/ios/forms/WKNumberPadViewController.h: * UIProcess/ios/forms/WKNumberPadViewController.mm: * UIProcess/ios/forms/WKQuickboardListViewController.h: * UIProcess/ios/forms/WKQuickboardListViewController.mm: * UIProcess/ios/forms/WKSelectMenuListViewController.h: * UIProcess/ios/forms/WKTimePickerViewController.h: * UIProcess/ios/forms/WKTimePickerViewController.mm: * UIProcess/ios/fullscreen/WKFullScreenViewController.h: * UIProcess/ios/fullscreen/WKFullscreenStackView.h: * UIProcess/ios/fullscreen/WKFullscreenStackView.mm: * UIProcess/mac/PageClientImplMac.mm: * UIProcess/mac/WKSharingServicePickerDelegate.h: * WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm: * WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.h: * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm: * WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp: * WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm: * WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteTiledBacking.cpp: * WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.h: * WebProcess/WebPage/mac/PageBannerMac.mm: * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.h: * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h: * WebProcess/cocoa/WebProcessCocoa.mm: More #import, less #pragma once. Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Removed MemoryMeasure.h/mm. Source/WebKitLegacy/ios: * Misc/MemoryMeasure.h: Removed. * Misc/MemoryMeasure.mm: Removed. * WebKit.iOS.exp: Removed MemoryMeasure symbols. Source/WebKitLegacy/mac: * Configurations/WebKitLegacy.xcconfig: Removed MemoryMeasure.h from EXCLUDED_SOURCE_FILE_NAMES. * Misc/WebCache.mm: (+[WebCache emptyInMemoryResources]): Removed invocation of MemoryMeasure. This is no longer used for anything. * History/BackForwardList.mm: * Plugins/Hosted/ProxyRuntimeObject.mm: * Plugins/Hosted/WebHostedNetscapePluginView.mm: * WebCoreSupport/SearchPopupMenuMac.mm: * WebCoreSupport/WebAlternativeTextClient.mm: * WebCoreSupport/WebSecurityOriginInternal.h: * WebInspector/WebInspector.mm: * WebView/WebFramePrivate.h: * WebView/WebScriptWorld.h: * WebView/WebView.mm: More #import, less #pragma once. Source/WTF: * wtf/cocoa/Entitlements.mm: * wtf/cocoa/FileSystemCocoa.mm: * wtf/cocoa/MainThreadCocoa.mm: * wtf/cocoa/SystemTracingCocoa.cpp: * wtf/mac/DeprecatedSymbolsUsedBySafari.mm: * wtf/mac/SchedulePairMac.mm: * wtf/text/cocoa/StringCocoa.mm: * wtf/text/cocoa/TextStreamCocoa.mm: More #import. Tools: * DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm: * DumpRenderTree/ios/DumpRenderTreeAppMain.mm: * DumpRenderTree/mac/AccessibilityCommonMac.h: * DumpRenderTree/mac/DumpRenderTreeMain.mm: * TestRunnerShared/cocoa/ClassMethodSwizzler.mm: * TestRunnerShared/cocoa/InstanceMethodSwizzler.mm: * TestRunnerShared/cocoa/LayoutTestSpellChecker.h: * TestRunnerShared/mac/NSPasteboardAdditions.h: * TestRunnerShared/spi/AppKitTestSPI.h: * TestRunnerShared/spi/PencilKitTestSPI.h: * TestWebKitAPI/DataDetectorsCoreSPI.h: * TestWebKitAPI/EditingTestHarness.h: * TestWebKitAPI/EditingTestHarness.mm: * TestWebKitAPI/Tests/WTF/ns/RetainPtr.mm: * TestWebKitAPI/Tests/WebCore/LineBreaking.mm: * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm: * TestWebKitAPI/Tests/WebCore/cocoa/DatabaseTrackerTest.mm: * TestWebKitAPI/Tests/WebKit/AGXCompilerService.mm: * TestWebKitAPI/Tests/WebKit/AccessibilityRemoteUIApp.mm: * TestWebKitAPI/Tests/WebKit/BacklightLevelNotification.mm: * TestWebKitAPI/Tests/WebKit/Battery.mm: * TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm: * TestWebKitAPI/Tests/WebKit/EnableAccessibility.mm: * TestWebKitAPI/Tests/WebKit/FindMatches.mm: * TestWebKitAPI/Tests/WebKit/GrantAccessToMobileAssets.mm: * TestWebKitAPI/Tests/WebKit/GrantAccessToPreferencesService.mm: * TestWebKitAPI/Tests/WebKit/LocalizedDeviceModel.mm: * TestWebKitAPI/Tests/WebKit/MimeTypes.mm: * TestWebKitAPI/Tests/WebKit/NoHistoryItemScrollToFragment.mm: * TestWebKitAPI/Tests/WebKit/PasteboardNotifications.mm: * TestWebKitAPI/Tests/WebKit/PictureInPictureSupport.mm: * TestWebKitAPI/Tests/WebKit/PreferenceChanges.mm: * TestWebKitAPI/Tests/WebKit/SleepDisabler.mm: * TestWebKitAPI/Tests/WebKit/ViewportSizeForViewportUnits.mm: * TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm: * TestWebKitAPI/Tests/WebKit/WebFilter.mm: * TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm: * TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm: * TestWebKitAPI/Tests/WebKit/mac/CustomBundleObject.h: * TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm: * TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter_Bundle.mm: * TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm: * TestWebKitAPI/Tests/WebKit/mac/ForceLightAppearanceInBundle.mm: * TestWebKitAPI/Tests/WebKit/mac/ForceLightAppearanceInBundle_Bundle.mm: * TestWebKitAPI/Tests/WebKitCocoa/AnimatedResize.mm: * TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm: * TestWebKitAPI/Tests/WebKitCocoa/CloseWebViewAfterEnterFullscreen.mm: * TestWebKitAPI/Tests/WebKitCocoa/CloseWebViewDuringEnterFullscreen.mm: * TestWebKitAPI/Tests/WebKitCocoa/CookieAcceptPolicy.mm: * TestWebKitAPI/Tests/WebKitCocoa/CookiePrivateBrowsing.mm: * TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm: * TestWebKitAPI/Tests/WebKitCocoa/CopyRTF.mm: * TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm: * TestWebKitAPI/Tests/WebKitCocoa/CustomUserAgent.mm: * TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm: * TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm: * TestWebKitAPI/Tests/WebKitCocoa/DeviceManagementRestrictions.mm: * TestWebKitAPI/Tests/WebKitCocoa/DoAfterNextPresentationUpdateAfterCrash.mm: * TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm: * TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm: * TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm: * TestWebKitAPI/Tests/WebKitCocoa/FindInPageAPI.mm: * TestWebKitAPI/Tests/WebKitCocoa/FirstVisuallyNonEmptyMilestone.mm: * TestWebKitAPI/Tests/WebKitCocoa/FixedLayoutSize.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm: * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm: * TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm: * TestWebKitAPI/Tests/WebKitCocoa/JavaScriptDuringNavigation.mm: * TestWebKitAPI/Tests/WebKitCocoa/LoadFileThenReload.mm: * TestWebKitAPI/Tests/WebKitCocoa/LoadFileURL.mm: * TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm: * TestWebKitAPI/Tests/WebKitCocoa/MediaBufferingPolicy.mm: * TestWebKitAPI/Tests/WebKitCocoa/MediaType.mm: * TestWebKitAPI/Tests/WebKitCocoa/ModalAlerts.mm: * TestWebKitAPI/Tests/WebKitCocoa/Navigation.mm: * TestWebKitAPI/Tests/WebKitCocoa/NavigationAction.mm: * TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm: * TestWebKitAPI/Tests/WebKitCocoa/NetworkProcessCrashNonPersistentDataStore.mm: * TestWebKitAPI/Tests/WebKitCocoa/NoPauseWhenSwitchingTabs.mm: * TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm: * TestWebKitAPI/Tests/WebKitCocoa/NowPlayingControlsTests.mm: * TestWebKitAPI/Tests/WebKitCocoa/ObservedRenderingProgressEventsAfterCrash.mm: * TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm: * TestWebKitAPI/Tests/WebKitCocoa/OverrideViewportArguments.mm: * TestWebKitAPI/Tests/WebKitCocoa/PageZoom.mm: * TestWebKitAPI/Tests/WebKitCocoa/ParserYieldTokenTests.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm: * TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm: * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm: * TestWebKitAPI/Tests/WebKitCocoa/PreferredAudioBufferSize.mm: * TestWebKitAPI/Tests/WebKitCocoa/ProcessSuspendMediaBuffering.mm: * TestWebKitAPI/Tests/WebKitCocoa/ReparentWebViewTimeout.mm: * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm: * TestWebKitAPI/Tests/WebKitCocoa/ResponsivenessTimer.mm: * TestWebKitAPI/Tests/WebKitCocoa/ResponsivenessTimerDoesntFireEarly.mm: * TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm: * TestWebKitAPI/Tests/WebKitCocoa/ShouldGoToBackForwardListItem.mm: * TestWebKitAPI/Tests/WebKitCocoa/ShouldOpenExternalURLsInNewWindowActions.mm: * TestWebKitAPI/Tests/WebKitCocoa/ShrinkToFit.mm: * TestWebKitAPI/Tests/WebKitCocoa/StopSuspendResumeAllMedia.mm: * TestWebKitAPI/Tests/WebKitCocoa/StorageQuota.mm: * TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm: * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm: * TestWebKitAPI/Tests/WebKitCocoa/TabOutOfWebView.mm: * TestWebKitAPI/Tests/WebKitCocoa/TestURLSchemeHandler.h: * TestWebKitAPI/Tests/WebKitCocoa/TestURLSchemeHandler.mm: * TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm: * TestWebKitAPI/Tests/WebKitCocoa/TextSize.mm: * TestWebKitAPI/Tests/WebKitCocoa/TextWidth.mm: * TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm: * TestWebKitAPI/Tests/WebKitCocoa/UserInitiatedActionInNavigationAction.mm: * TestWebKitAPI/Tests/WebKitCocoa/VideoControlsManager.mm: * TestWebKitAPI/Tests/WebKitCocoa/VideoQualityDisplayCompositing.mm: * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm: * TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm: * TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm: * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewFindString.mm: * TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm: * TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm: * TestWebKitAPI/Tests/WebKitCocoa/_WKInputDelegate.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm: * TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm: * TestWebKitAPI/Tests/ios/AccessibilityTestsIOS.mm: * TestWebKitAPI/Tests/ios/DataDetectorsTestIOS.mm: * TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm: * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm: * TestWebKitAPI/Tests/ios/OverflowScrollViewTests.mm: * TestWebKitAPI/Tests/ios/RenderingProgressTests.mm: * TestWebKitAPI/Tests/ios/ScrollViewInsetTests.mm: * TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm: * TestWebKitAPI/Tests/ios/SelectionByWord.mm: * TestWebKitAPI/Tests/ios/SelectionModifyByParagraphBoundary.mm: * TestWebKitAPI/Tests/ios/TestInputDelegate.h: * TestWebKitAPI/Tests/ios/TestInputDelegate.mm: * TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm: * TestWebKitAPI/Tests/ios/UIPasteboardTests.mm: * TestWebKitAPI/Tests/ios/WKScrollViewTests.mm: * TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm: * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm: * TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm: * TestWebKitAPI/Tests/mac/AdditionalSupportedImageTypes.mm: * TestWebKitAPI/Tests/mac/BackForwardList.mm: * TestWebKitAPI/Tests/mac/BackgroundColor.mm: * TestWebKitAPI/Tests/mac/CandidateTests.mm: * TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm: * TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm: * TestWebKitAPI/Tests/mac/DynamicDeviceScaleFactor.mm: * TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm: * TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm: * TestWebKitAPI/Tests/mac/IsNavigationActionTrusted.mm: * TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm: * TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm: * TestWebKitAPI/Tests/mac/SSLKeyGenerator.mm: * TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm: * TestWebKitAPI/Tests/mac/SetDocumentURI.mm: * TestWebKitAPI/Tests/mac/SimplifyMarkup.mm: * TestWebKitAPI/Tests/mac/SubresourceErrorCrash.mm: * TestWebKitAPI/Tests/mac/TypingStyleCrash.mm: * TestWebKitAPI/Tests/mac/WKWebViewMacEditingTests.mm: * TestWebKitAPI/Tests/mac/WebScriptObjectDescription.mm: * TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm: * TestWebKitAPI/cocoa/DragAndDropSimulator.h: * TestWebKitAPI/cocoa/NSItemProviderAdditions.h: * TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm: * TestWebKitAPI/cocoa/TestContextMenuDriver.h: * TestWebKitAPI/cocoa/TestNavigationDelegate.h: * TestWebKitAPI/cocoa/TestProtocol.mm: * TestWebKitAPI/cocoa/TestUIDelegate.h: * TestWebKitAPI/cocoa/UtilitiesCocoa.mm: * TestWebKitAPI/ios/PencilKitTestSPI.h: * TestWebKitAPI/mac/JavaScriptTestMac.mm: * TestWebKitAPI/mac/NSFontPanelTesting.h: * TestWebKitAPI/mac/NSFontPanelTesting.mm: * TestWebKitAPI/mac/OffscreenWindow.h: * TestWebKitAPI/mac/PlatformUtilitiesMac.mm: * TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm: * TestWebKitAPI/mac/TestDraggingInfo.h: * TestWebKitAPI/mac/TestFilePromiseReceiver.h: * TestWebKitAPI/mac/TestFontOptions.h: * TestWebKitAPI/mac/TestInspectorBar.h: * TestWebKitAPI/mac/WebKitAgnosticTest.mm: * WebKitTestRunner/InjectedBundle/mac/AccessibilityCommonMac.h: * WebKitTestRunner/cocoa/TestWebsiteDataStoreDelegate.h: * WebKitTestRunner/mac/PoseAsClass.mm: More #import, less #pragma once. Canonical link: https://commits.webkit.org/223626@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 858df3e commit 10a179e

473 files changed

Lines changed: 1780 additions & 1670 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/JSAPIWrapperObject.mm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
* THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
27-
#include "JSAPIWrapperObject.h"
28-
29-
#include "JSCInlines.h"
30-
#include "JSCallbackObject.h"
31-
#include "JSVirtualMachineInternal.h"
32-
#include "Structure.h"
33-
#include <wtf/NeverDestroyed.h>
26+
#import "config.h"
27+
#import "JSAPIWrapperObject.h"
28+
29+
#import "JSCInlines.h"
30+
#import "JSCallbackObject.h"
31+
#import "JSVirtualMachineInternal.h"
32+
#import "Structure.h"
33+
#import <wtf/NeverDestroyed.h>
3434

3535
#if JSC_OBJC_API_ENABLED
3636

‎Source/JavaScriptCore/API/JSContext.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#ifndef JSContext_h
27-
#define JSContext_h
28-
29-
#include <JavaScriptCore/JavaScript.h>
30-
#include <JavaScriptCore/WebKitAvailability.h>
26+
#import <JavaScriptCore/JavaScript.h>
27+
#import <JavaScriptCore/WebKitAvailability.h>
3128

3229
#if JSC_OBJC_API_ENABLED
3330

@@ -234,5 +231,3 @@ JSC_CLASS_AVAILABLE(macos(10.9), ios(7.0))
234231
@end
235232

236233
#endif
237-
238-
#endif // JSContext_h

‎Source/JavaScriptCore/API/JSContext.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
26+
#import "config.h"
2727

2828
#import "APICast.h"
2929
#import "Completion.h"

‎Source/JavaScriptCore/API/JSScriptInternal.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#pragma once
26+
#if JSC_OBJC_API_ENABLED
2727

2828
#import "JSScript.h"
2929
#import "SourceCode.h"
3030
#import <wtf/RefPtr.h>
3131

32-
#if JSC_OBJC_API_ENABLED
33-
3432
NS_ASSUME_NONNULL_BEGIN
3533

3634
namespace JSC {

‎Source/JavaScriptCore/API/JSValue.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
26+
#import "config.h"
2727

2828
#import "APICast.h"
2929
#import "DateInstance.h"

‎Source/JavaScriptCore/API/JSVirtualMachine.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
26+
#import "config.h"
2727

2828
#import "JavaScriptCore.h"
2929

‎Source/JavaScriptCore/API/JSVirtualMachinePrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "JSExportMacros.h"
27-
#include <JavaScriptCore/JavaScript.h>
26+
#import "JSExportMacros.h"
27+
#import <JavaScriptCore/JavaScript.h>
2828

2929
#if JSC_OBJC_API_ENABLED
3030

‎Source/JavaScriptCore/API/JSWrapperMap.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
26+
#import "config.h"
2727
#import "JavaScriptCore.h"
2828

2929
#if JSC_OBJC_API_ENABLED
@@ -45,7 +45,7 @@
4545
#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
4646
#endif
4747

48-
#include <mach-o/dyld.h>
48+
#import <mach-o/dyld.h>
4949

5050
#if PLATFORM(APPLETV)
5151
#else

‎Source/JavaScriptCore/API/ObjCCallbackFunction.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
26+
#import "config.h"
2727
#import "JavaScriptCore.h"
2828

2929
#if JSC_OBJC_API_ENABLED

‎Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
* THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#include "config.h"
27-
#include "CurrentThisInsideBlockGetterTest.h"
26+
#import "config.h"
27+
#import "CurrentThisInsideBlockGetterTest.h"
2828

2929
#if JSC_OBJC_API_ENABLED
3030

0 commit comments

Comments
 (0)