Changeset 228413 in webkit


Ignore:
Timestamp:
Feb 12, 2018 6:26:17 PM (6 years ago)
Author:
Ross Kirsling
Message:

Unify UserAgent into WebCore/platform.
​https://bugs.webkit.org/show_bug.cgi?id=182716

Reviewed by Michael Catanzaro.

No change in functionality.

  • SourcesCocoa.txt:
  • SourcesIOS.txt:
  • SourcesMac.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • page/cocoa/UserAgent.h: Removed.
  • platform/UserAgent.h:
  • platform/cocoa/UserAgentCocoa.mm: Renamed from Source/WebCore/page/cocoa/UserAgent.mm.
  • platform/ios/UserAgentIOS.mm: Renamed from Source/WebCore/page/ios/UserAgentIOS.mm.
  • platform/mac/UserAgentMac.mm: Renamed from Source/WebCore/page/mac/UserAgentMac.mm.
Location:
trunk/Source/WebCore
Files:
1 deleted
6 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r228412 r228413  
     12018-02-12  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        Unify UserAgent into WebCore/platform.
     4        https://bugs.webkit.org/show_bug.cgi?id=182716
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        No change in functionality.
     9
     10        * SourcesCocoa.txt:
     11        * SourcesIOS.txt:
     12        * SourcesMac.txt:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * page/cocoa/UserAgent.h: Removed.
     15        * platform/UserAgent.h:
     16        * platform/cocoa/UserAgentCocoa.mm: Renamed from Source/WebCore/page/cocoa/UserAgent.mm.
     17        * platform/ios/UserAgentIOS.mm: Renamed from Source/WebCore/page/ios/UserAgentIOS.mm.
     18        * platform/mac/UserAgentMac.mm: Renamed from Source/WebCore/page/mac/UserAgentMac.mm.
     19
    1202018-02-12  Antoine Quint  <graouts@apple.com>
    221

  • trunk/Source/WebCore/SourcesCocoa.txt

    r226468 r228413  
    9999page/cocoa/ResourceUsageThreadCocoa.mm
    100100page/cocoa/SettingsBaseCocoa.mm
    101 page/cocoa/UserAgent.mm
    102101
    103102page/mac/ChromeMac.mm
    … …  
    159158platform/cocoa/TelephoneNumberDetectorCocoa.cpp
    160159platform/cocoa/ThemeCocoa.mm
     160platform/cocoa/UserAgentCocoa.mm
    161161platform/cocoa/VideoFullscreenModelVideoElement.mm
    162162platform/cocoa/VideoToolboxSoftLink.cpp

  • trunk/Source/WebCore/SourcesIOS.txt

    r224846 r228413  
    5959page/ios/EventHandlerIOS.mm
    6060page/ios/FrameIOS.mm
    61 page/ios/UserAgentIOS.mm
    6261page/ios/WebEventRegion.mm
    6362
    … …  
    9291platform/ios/ScrollViewIOS.mm
    9392platform/ios/ThemeIOS.mm @no-unify
     93platform/ios/UserAgentIOS.mm
    9494platform/ios/ValidationBubbleIOS.mm @no-unify
    9595platform/ios/VideoFullscreenInterfaceAVKit.mm @no-unify

  • trunk/Source/WebCore/SourcesMac.txt

    r228308 r228413  
    4343page/mac/ServicesOverlayController.mm
    4444page/mac/TextIndicatorWindow.mm
    45 page/mac/UserAgentMac.mm
    4645page/mac/WheelEventDeltaFilterMac.mm
    4746
    … …  
    9897platform/mac/ThreadCheck.mm @no-unify
    9998platform/mac/UserActivityMac.mm
     99platform/mac/UserAgentMac.mm
    100100platform/mac/ValidationBubbleMac.mm
    101101platform/mac/WebCoreFullScreenPlaceholderView.mm

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r228333 r228413  
    645645                2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    646646                262391361A648CEE007251A3 /* ContentExtensionsDebugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 262391351A648CEE007251A3 /* ContentExtensionsDebugging.h */; settings = {ATTRIBUTES = (Private, ); }; };
    647                 26255F0318878E110006E1FD /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 26255F0118878E110006E1FD /* UserAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    648647                262EC41A1D078FB900BA78FC /* EventTrackingRegions.h in Headers */ = {isa = PBXBuildFile; fileRef = 262EC4191D078F3D00BA78FC /* EventTrackingRegions.h */; settings = {ATTRIBUTES = (Private, ); }; };
    649648                265541391489811C000DFC5D /* KeyEventCodesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 265541371489811C000DFC5D /* KeyEventCodesIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    28742873                A31C4E4F16E02AB4002F7957 /* OESTextureHalfFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = A31C4E4E16E02AB4002F7957 /* OESTextureHalfFloat.h */; };
    28752874                A31C4E5416E02B40002F7957 /* JSOESTextureHalfFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */; };
     2875                A3AF9D8620326861006CAD06 /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AF9D8220325324006CAD06 /* UserAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28762876                A3BB59F41457A40D00AC56FE /* DocumentEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = A3BB59F21457A40D00AC56FE /* DocumentEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28772877                A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = A3E2642F14748991005A8588 /* WorkerEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    61826182                2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserGestureIndicator.h; sourceTree = "<group>"; };
    61836183                262391351A648CEE007251A3 /* ContentExtensionsDebugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionsDebugging.h; sourceTree = "<group>"; };
    6184                 26255EFF18878DFF0006E1FD /* UserAgentIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentIOS.mm; sourceTree = "<group>"; };
    6185                 26255F0118878E110006E1FD /* UserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgent.h; sourceTree = "<group>"; };
    6186                 26255F0218878E110006E1FD /* UserAgentMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentMac.mm; sourceTree = "<group>"; };
    61876184                262EC4191D078F3D00BA78FC /* EventTrackingRegions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTrackingRegions.h; sourceTree = "<group>"; };
    61886185                262EC41C1D110B1F00BA78FC /* EventTrackingRegions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTrackingRegions.cpp; sourceTree = "<group>"; };
    … …  
    84738470                5D5975B119635F1100D00878 /* SystemVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemVersion.h; sourceTree = "<group>"; };
    84748471                5D5975B219635F1100D00878 /* SystemVersion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemVersion.mm; sourceTree = "<group>"; };
    8475                 5D5975B61963637B00D00878 /* UserAgent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgent.mm; sourceTree = "<group>"; };
    84768472                5D925B650F64D4DD00B847F0 /* ScrollAlignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollAlignment.cpp; sourceTree = "<group>"; };
    84778473                5D925B660F64D4DD00B847F0 /* ScrollAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAlignment.h; sourceTree = "<group>"; };
    … …  
    1087810874                A31C4E5116E02B08002F7957 /* JSOESTextureHalfFloat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloat.cpp; sourceTree = "<group>"; };
    1087910875                A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloat.h; sourceTree = "<group>"; };
     10876                A3AF9D81203252EE006CAD06 /* UserAgentCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentCocoa.mm; sourceTree = "<group>"; };
     10877                A3AF9D8220325324006CAD06 /* UserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgent.h; sourceTree = "<group>"; };
     10878                A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentIOS.mm; sourceTree = "<group>"; };
     10879                A3AF9D84203256A3006CAD06 /* UserAgentMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentMac.mm; sourceTree = "<group>"; };
    1088010880                A3BB59F11457A40D00AC56FE /* DocumentEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentEventQueue.cpp; sourceTree = "<group>"; };
    1088110881                A3BB59F21457A40D00AC56FE /* DocumentEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentEventQueue.h; sourceTree = "<group>"; };
    … …  
    1547915479                                FE6938B51045D67E008EABB6 /* EventHandlerIOS.mm */,
    1548015480                                FED13D3B0CEA936A00D89466 /* FrameIOS.mm */,
    15481                                 26255EFF18878DFF0006E1FD /* UserAgentIOS.mm */,
    1548215481                                225A16B30D5C11E900090295 /* WebEventRegion.h */,
    1548315482                                225A16B40D5C11E900090295 /* WebEventRegion.mm */,
    … …  
    1834218341                                A5071E881C56D4FA009951BE /* ResourceUsageThreadCocoa.mm */,
    1834318342                                A182D5B61BE722620087A7CC /* SettingsBaseCocoa.mm */,
    18344                                 26255F0118878E110006E1FD /* UserAgent.h */,
    18345                                 5D5975B61963637B00D00878 /* UserAgent.mm */,
    1834618343                        );
    1834718344                        path = cocoa;
    … …  
    1867118668                                6593923909AE435C002C531F /* URLMac.mm */,
    1867218669                                868160D3187669E70021E79D /* UserActivityMac.mm */,
     18670                                A3AF9D84203256A3006CAD06 /* UserAgentMac.mm */,
    1867318671                                83C45B8B1DC2B663008871BA /* ValidationBubbleMac.mm */,
    1867418672                                52B0D4C11C57FF910077CE53 /* VideoFullscreenInterfaceMac.h */,
    … …  
    1981219810                                2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */,
    1981319811                                2D4F96F41A1ECC240098BF88 /* TextIndicatorWindow.mm */,
    19814                                 26255F0218878E110006E1FD /* UserAgentMac.mm */,
    1981519812                                F587854C02DE375901EA4122 /* WebCoreFrameView.h */,
    1981619813                                2E9B5D8E1B66A94E008C6A24 /* WheelEventDeltaFilterMac.h */,
    … …  
    2091820915                                1F72BF08187FD4270009BCB3 /* TileControllerMemoryHandlerIOS.cpp */,
    2091920916                                1F72BF09187FD4270009BCB3 /* TileControllerMemoryHandlerIOS.h */,
     20917                                A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */,
    2092020918                                837B7D1F1DC3F54C00D051FC /* ValidationBubbleIOS.mm */,
    2092120919                                3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */,
    … …  
    2105621054                                310D71941B335C9D009C7B73 /* ThemeCocoa.h */,
    2105721055                                310D71931B335C9D009C7B73 /* ThemeCocoa.mm */,
     21056                                A3AF9D81203252EE006CAD06 /* UserAgentCocoa.mm */,
    2105821057                                52B0D4BF1C57FD660077CE53 /* VideoFullscreenChangeObserver.h */,
    2105921058                                52D5A1A41C57488900DE34A3 /* VideoFullscreenModel.h */,
    … …  
    2398923988                                868160D1187669C40021E79D /* UserActivity.cpp */,
    2399023989                                868160D2187669C40021E79D /* UserActivity.h */,
     23990                                A3AF9D8220325324006CAD06 /* UserAgent.h */,
    2399123991                                71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */,
    2399223992                                83C45B8D1DC2B67C008871BA /* ValidationBubble.h */,
    … …  
    3007330073                                A72763BF16689BFB002FCACB /* UserActionElementSet.h in Headers */,
    3007430074                                868160D618766A130021E79D /* UserActivity.h in Headers */,
    30075                                 26255F0318878E110006E1FD /* UserAgent.h in Headers */,
     30075                                A3AF9D8620326861006CAD06 /* UserAgent.h in Headers */,
    3007630076                                CDAB6D3117C9259500C60B34 /* UserAgentScripts.h in Headers */,
    3007730077                                656581B209D14EE6000E61D7 /* UserAgentStyleSheets.h in Headers */,

  • trunk/Source/WebCore/platform/UserAgent.h

    r226657 r228413  
    2727#pragma once
    2828
    29 #if PLATFORM(COCOA)
    30 // FIXME: Remove Source/WebCore/page/cocoa/UserAgent.h
    31 #include_next "UserAgent.h"
    32 #else
    33 
    3429#include <wtf/text/WTFString.h>
    3530
    3631namespace WebCore {
     32
     33#if PLATFORM(COCOA)
     34WEBCORE_EXPORT String standardUserAgentWithApplicationName(const String& applicationName);
     35
     36String systemMarketingVersionForUserAgentString();
     37String userAgentBundleVersion();
     38#else
    3739class URL;
    3840
    3941WEBCORE_EXPORT String standardUserAgent(const String& applicationName = emptyString(), const String& applicationVersion = emptyString());
    4042WEBCORE_EXPORT String standardUserAgentForURL(const URL&);
     43#endif
    4144
    4245}
    43 
    44 #endif
Note: See TracChangeset for help on using the changeset viewer.