Skip to content

Commit ea8895f

Browse files
annevkannevk
committed
Move remaining shared WebCore mac files to ../cocoa
https://bugs.webkit.org/show_bug.cgi?id=327831 rdar://190224649 Reviewed by NOBODY (OOPS!). Make it more self-evident which files are actually shared across ports. All of these are compiled into the iOS build with code of their own, which 309708@main and related changes did not cover. This empties loader/mac and history/mac. SerializedPlatformDataCueMac becomes SerializedPlatformDataCueCocoa, and FrameSelectionCocoa.mm guards its Mac-only part with PLATFORM(MAC) instead of !PLATFORM(IOS_FAMILY). Addresses some of the style nits as well.
1 parent f311092 commit ea8895f

20 files changed

Lines changed: 89 additions & 98 deletions

‎Source/WebCore/PlatformCocoa.cmake‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
227227
"${WEBCORE_DIR}/loader/archive/cf"
228228
"${WEBCORE_DIR}/loader/cf"
229229
"${WEBCORE_DIR}/loader/cocoa"
230-
"${WEBCORE_DIR}/loader/mac"
231230
"${WEBCORE_DIR}/page/cocoa"
232231
"${WEBCORE_DIR}/page/scrolling/cocoa"
233232
"${WEBCORE_DIR}/page/writing-tools"
@@ -322,6 +321,7 @@ list(APPEND WebCore_SOURCES
322321

323322
editing/cocoa/AlternativeTextUIController.mm
324323
editing/cocoa/AutofillElements.cpp
324+
editing/cocoa/TextAlternativeWithRange.mm
325325

326326
editing/mac/UniversalAccessZoom.mm
327327

@@ -366,6 +366,7 @@ list(APPEND WebCore_SOURCES
366366
platform/cocoa/ParentalControlsContentFilter.mm
367367
platform/cocoa/PasteboardCocoa.mm
368368
platform/cocoa/SearchPopupMenuCocoa.mm
369+
platform/cocoa/SerializedPlatformDataCueCocoa.mm
369370
platform/cocoa/SharedBufferCocoa.mm
370371
platform/cocoa/SharedMemoryCocoa.mm
371372
platform/cocoa/SharedVideoFrameInfo.mm
@@ -569,7 +570,6 @@ list(APPEND WebCore_SOURCES
569570
dom/DataTransferMac.mm
570571

571572
editing/mac/EditorMac.mm
572-
editing/mac/TextAlternativeWithRange.mm
573573
editing/mac/TextUndoInsertionMarkupMac.mm
574574

575575
page/mac/EventHandlerMac.mm
@@ -604,7 +604,6 @@ list(APPEND WebCore_SOURCES
604604
platform/mac/ScrollViewMac.mm
605605
platform/mac/ScrollbarThemeMac.mm
606606
platform/mac/ScrollingEffectsController.mm
607-
platform/mac/SerializedPlatformDataCueMac.mm
608607
platform/mac/SuddenTermination.mm
609608
platform/mac/ThemeMac.mm
610609
platform/mac/ThreadCheck.mm
@@ -1147,15 +1146,17 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
11471146
editing/cocoa/AutofillElements.h
11481147
editing/cocoa/DataDetection.h
11491148
editing/cocoa/DataDetectorType.h
1149+
editing/cocoa/DictionaryLookup.h
11501150
editing/cocoa/EditingHTMLConverter.h
11511151
editing/cocoa/NodeHTMLConverter.h
1152+
editing/cocoa/TextAlternativeWithRange.h
11521153
editing/cocoa/TextAttachmentForSerialization.h
11531154

11541155
loader/archive/cf/LegacyWebArchive.h
11551156

11561157
loader/cache/CachedRawResource.h
11571158

1158-
loader/mac/LoaderNSURLExtras.h
1159+
loader/cocoa/LoaderNSURLExtras.h
11591160

11601161
page/CaptionUserPreferencesMediaAF.h
11611162

@@ -1164,6 +1165,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
11641165
page/cocoa/DataDetectionResultsStorage.h
11651166
page/cocoa/DataDetectorElementInfo.h
11661167
page/cocoa/ImageOverlayDataDetectionResultIdentifier.h
1168+
page/cocoa/WebCoreFrameView.h
11671169
page/cocoa/WebTextIndicatorLayer.h
11681170

11691171
page/ios/WebEventRegion.h
@@ -1229,6 +1231,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
12291231
platform/cocoa/PlaybackSessionModelMediaElement.h
12301232
platform/cocoa/PowerSourceNotifier.h
12311233
platform/cocoa/SearchPopupMenuCocoa.h
1234+
platform/cocoa/SerializedPlatformDataCueCocoa.h
12321235
platform/cocoa/SharedVideoFrameInfo.h
12331236
platform/cocoa/StringUtilities.h
12341237
platform/cocoa/SystemBattery.h
@@ -1564,13 +1567,9 @@ endif ()
15641567
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
15651568
accessibility/mac/WebAccessibilityObjectWrapperMac.h
15661569

1567-
editing/mac/DictionaryLookup.h
1568-
editing/mac/TextAlternativeWithRange.h
15691570
editing/mac/TextUndoInsertionMarkupMac.h
15701571
editing/mac/UniversalAccessZoom.h
15711572

1572-
page/mac/WebCoreFrameView.h
1573-
15741573
platform/gamepad/mac/HIDGamepadProvider.h
15751574
platform/gamepad/mac/MultiGamepadProvider.h
15761575

@@ -1794,7 +1793,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
17941793
platform/mac/LocalDefaultSystemAppearance.h
17951794
platform/mac/PowerObserverMac.h
17961795
platform/mac/RevealUtilities.h
1797-
platform/mac/SerializedPlatformDataCueMac.h
17981796
platform/mac/WebCoreFullScreenPlaceholderView.h
17991797
platform/mac/WebPlaybackControlsManager.h
18001798

‎Source/WebCore/SourcesCocoa.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,21 @@ editing/cocoa/EditorCocoa.mm @nonARC
193193
editing/cocoa/FontAttributeChangesCocoa.mm @nonARC
194194
editing/cocoa/FontAttributesCocoa.mm @nonARC
195195
editing/cocoa/FontShadowCocoa.mm @nonARC
196+
editing/cocoa/FrameSelectionCocoa.mm @nonARC
196197
editing/cocoa/HTMLConverter.mm @nonARC @no-unify-when(bundle<=8) @cost:4
197198
editing/cocoa/NodeHTMLConverter.mm @nonARC @no-unify-when(bundle<=8) @cost:10
198199
editing/cocoa/EditingHTMLConverter.mm @nonARC @no-unify-when(bundle<=8) @cost:9
200+
editing/cocoa/TextAlternativeWithRange.mm @nonARC @no-unify-when(bundle<=8)
199201
editing/cocoa/WebArchiveResourceFromNSAttributedString.mm @nonARC
200202
editing/cocoa/WebArchiveResourceWebResourceHandler.mm @nonARC
201203
editing/cocoa/WebContentReaderCocoa.mm @nonARC
202204
editing/cocoa/WebCoreTextAttachment.mm @nonARC
203205
editing/ios/DictationCommandIOS.cpp
204206
editing/ios/EditorIOS.mm @nonARC
205207
editing/mac/EditorMac.mm @nonARC
206-
editing/mac/FrameSelectionMac.mm @nonARC
207-
editing/mac/TextAlternativeWithRange.mm @nonARC @no-unify-when(bundle<=8)
208208
editing/mac/TextUndoInsertionMarkupMac.mm @nonARC
209209
fileapi/FileCocoa.mm @nonARC
210-
history/mac/HistoryItemMac.mm @nonARC
210+
history/cocoa/HistoryItemCocoa.mm @nonARC
211211
html/HTMLMediaElementCocoa.mm @nonARC
212212
html/canvas/GPUCanvasContextCocoa.mm @nonARC
213213
html/shadow/YouTubeEmbedShadowElement.cpp
@@ -217,16 +217,18 @@ inspector/mac/PageDebuggerMac.mm @nonARC
217217
loader/archive/cf/LegacyWebArchive.cpp
218218
loader/archive/cf/LegacyWebArchiveMac.mm @nonARC
219219
loader/cocoa/DiskCacheMonitorCocoa.mm @nonARC
220+
loader/cocoa/DocumentLoaderCocoa.cpp
221+
loader/cocoa/LoaderNSURLExtras.mm @nonARC
220222
loader/cocoa/PrivateClickMeasurementCocoa.mm @nonARC
223+
loader/cocoa/ResourceLoaderCocoa.mm @nonARC
221224
loader/cocoa/SubresourceLoaderCocoa.mm @nonARC
222225
loader/ios/LegacyPreviewLoader.mm @nonARC
223-
loader/mac/DocumentLoaderMac.cpp
224-
loader/mac/LoaderNSURLExtras.mm @nonARC
225-
loader/mac/ResourceLoaderMac.mm @nonARC
226226
page/CaptionUserPreferencesMediaAF.cpp
227227
page/cocoa/CaptionUserPreferencesMediaAFCocoa.mm @nonARC
228+
page/cocoa/ChromeCocoa.mm @nonARC
228229
page/cocoa/ContentChangeObserver.cpp @header:RenderStyleGetters
229230
page/cocoa/DOMTimerHoldingTank.cpp
231+
page/cocoa/DragControllerCocoa.mm @nonARC
230232
page/cocoa/EventHandlerCocoa.mm @nonARC
231233
page/cocoa/MemoryReleaseCocoa.mm @nonARC
232234
page/cocoa/PageCocoa.mm @nonARC
@@ -238,9 +240,7 @@ page/cocoa/WebTextIndicatorLayer.mm @nonARC
238240
page/ios/EventHandlerIOS.mm @nonARC
239241
page/ios/FrameIOS.mm @nonARC
240242
page/ios/WebEventRegion.mm @nonARC
241-
page/mac/ChromeMac.mm @nonARC
242243
page/mac/CorrectionIndicator.mm @nonARC
243-
page/mac/DragControllerMac.mm @nonARC
244244
page/mac/EventHandlerMac.mm @nonARC
245245
page/mac/ImageOverlayControllerMac.mm @nonARC
246246
page/mac/ServicesOverlayController.mm @nonARC
@@ -329,6 +329,7 @@ platform/cocoa/PowerSourceNotifier.mm @nonARC
329329
platform/cocoa/PublicSuffixStoreCocoa.mm @nonARC
330330
platform/cocoa/RemoteCommandListenerCocoa.mm @nonARC
331331
platform/cocoa/SearchPopupMenuCocoa.mm @nonARC
332+
platform/cocoa/SerializedPlatformDataCueCocoa.mm @nonARC
332333
platform/cocoa/SerializedPlatformDataCueValue.mm @nonARC @no-unify-when(bundle<=8)
333334
platform/cocoa/SharedBufferCocoa.mm @nonARC
334335
platform/cocoa/SharedMemoryCocoa.mm @nonARC
@@ -647,7 +648,6 @@ platform/mac/ScrollbarsControllerMac.mm @nonARC @no-unify-when(bundle<=8) @cost:
647648
platform/mac/ScrollbarThemeMac.mm @nonARC @no-unify-when(bundle<=8) @cost:3
648649
platform/mac/ScrollingEffectsController.mm @nonARC
649650
platform/mac/ScrollingMomentumCalculatorMac.mm @nonARC
650-
platform/mac/SerializedPlatformDataCueMac.mm @nonARC
651651
platform/mac/SuddenTermination.mm @nonARC
652652
platform/mac/ThemeMac.mm @nonARC
653653
platform/mac/ThreadCheck.mm @nonARC @no-unify-when(bundle<=8)

0 commit comments

Comments
 (0)