Move UUID from WebCore/platform to WTF
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Apr 2017 06:30:17 +0000 (06:30 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Apr 2017 06:30:17 +0000 (06:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=171372

Reviewed by Michael Catanzaro.

Source/WebCore:

UUID only contains createCanonicalUUIDString() that is platform independent and doesn't depend on anything from
WebCore, only from WTF.

* CMakeLists.txt:
* Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp:
* Modules/mediacontrols/MediaControlsHost.cpp:
* Modules/mediastream/RTCPeerConnection.cpp:
* Modules/webaudio/MediaStreamAudioSource.cpp:
* Modules/webdatabase/DatabaseTracker.cpp:
* WebCore.order:
* WebCore.xcodeproj/project.pbxproj:
* editing/mac/EditorMac.mm:
* fileapi/BlobURL.cpp:
* loader/appcache/ApplicationCacheHost.cpp:
* loader/appcache/ApplicationCacheStorage.cpp:
* platform/URL.cpp:
* platform/glib/FileSystemGlib.cpp:
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
* platform/mediastream/CaptureDeviceManager.cpp:
* platform/mediastream/MediaStreamPrivate.h:
* platform/mediastream/MediaStreamTrackPrivate.cpp:
* platform/mediastream/RealtimeMediaSource.cpp:
* platform/mediastream/mac/AVCaptureDeviceManager.mm:
* platform/mediastream/mac/AVMediaCaptureSource.mm:
* platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
* platform/mock/MockRealtimeAudioSource.cpp:
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
* platform/mock/MockRealtimeVideoSource.cpp:
* testing/MockCDMFactory.cpp:

Source/WebKit2:

* UIProcess/Automation/WebAutomationSession.cpp:
(WebKit::WebAutomationSession::handleForWebPageProxy):
(WebKit::WebAutomationSession::handleForWebFrameID):
* UIProcess/gtk/WaylandCompositor.cpp:
* WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::createUUID):
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::openWithNativeApplication):

Source/WTF:

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/UUID.cpp: Renamed from Source/WebCore/platform/UUID.cpp.
* wtf/UUID.h: Renamed from Source/WebCore/platform/UUID.h.

Tools:

* WebKitTestRunner/TestController.cpp:

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

44 files changed:
Source/WTF/ChangeLog
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/wtf/CMakeLists.txt
Source/WTF/wtf/UUID.cpp [moved from Source/WebCore/platform/UUID.cpp with 98% similarity]
Source/WTF/wtf/UUID.h [moved from Source/WebCore/platform/UUID.h with 95% similarity]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp
Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp
Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
Source/WebCore/WebCore.order
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/editing/mac/EditorMac.mm
Source/WebCore/fileapi/BlobURL.cpp
Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
Source/WebCore/platform/URL.cpp
Source/WebCore/platform/glib/FileSystemGlib.cpp
Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
Source/WebCore/platform/mediastream/MediaStreamPrivate.h
Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp
Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm
Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm
Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp
Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp
Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp
Source/WebCore/testing/MockCDMFactory.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp
Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp
Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp
Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm
Tools/ChangeLog
Tools/WebKitTestRunner/TestController.cpp

index 9547517..f77d41e 100644 (file)
@@ -1,3 +1,15 @@
+2017-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Move UUID from WebCore/platform to WTF
+        https://bugs.webkit.org/show_bug.cgi?id=171372
+
+        Reviewed by Michael Catanzaro.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/CMakeLists.txt:
+        * wtf/UUID.cpp: Renamed from Source/WebCore/platform/UUID.cpp.
+        * wtf/UUID.h: Renamed from Source/WebCore/platform/UUID.h.
+
 2017-04-26  Keith Miller  <keith_miller@apple.com>
 
         LocklessBag needs a destructor
index f8f9b2a..b8d028c 100644 (file)
                70ECA60E1B02426800449739 /* SymbolImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 70ECA60B1B02426800449739 /* SymbolImpl.h */; };
                70ECA60F1B02426800449739 /* UniquedStringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 70ECA60C1B02426800449739 /* UniquedStringImpl.h */; };
                79EC70611C99F9BC003A3AE2 /* SmallPtrSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7936D6A91C99F8AE000D1AED /* SmallPtrSet.h */; };
+               7AFEC6AF1EB22AC600DADE36 /* UUID.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFEC6AE1EB22AC600DADE36 /* UUID.h */; };
+               7AFEC6B11EB22B5900DADE36 /* UUID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AFEC6B01EB22B5900DADE36 /* UUID.cpp */; };
                7C3F723A1D78811A00674E26 /* Brigand.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F72391D78811900674E26 /* Brigand.h */; };
                7CBBA07419BB7FDC00BBF025 /* OSObjectPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBBA07319BB7FDC00BBF025 /* OSObjectPtr.h */; };
                7CD0D5A91D5534A7000CC9E1 /* Variant.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD0D5A71D55322A000CC9E1 /* Variant.h */; };
                70ECA60B1B02426800449739 /* SymbolImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolImpl.h; sourceTree = "<group>"; };
                70ECA60C1B02426800449739 /* UniquedStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniquedStringImpl.h; sourceTree = "<group>"; };
                7936D6A91C99F8AE000D1AED /* SmallPtrSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallPtrSet.h; sourceTree = "<group>"; };
+               7AFEC6AE1EB22AC600DADE36 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
+               7AFEC6B01EB22B5900DADE36 /* UUID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UUID.cpp; sourceTree = "<group>"; };
                7C3F72391D78811900674E26 /* Brigand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Brigand.h; sourceTree = "<group>"; };
                7CBBA07319BB7FDC00BBF025 /* OSObjectPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSObjectPtr.h; sourceTree = "<group>"; };
                7CD0D5A71D55322A000CC9E1 /* Variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Variant.h; sourceTree = "<group>"; };
                                0FED67B51B22D4D80066CE15 /* TinyPtrSet.h */,
                                149EF16216BBFE0D000A4331 /* TriState.h */,
                                83FBA93119DF459700F30ADB /* TypeCasts.h */,
+                               7AFEC6B01EB22B5900DADE36 /* UUID.cpp */,
+                               7AFEC6AE1EB22AC600DADE36 /* UUID.h */,
                                A8A4735C151A825B004123FF /* UnionFind.h */,
                                5C7C88D31D0A3A0A009D2F6D /* UniqueRef.h */,
                                A8A4736F151A825B004123FF /* ValueCheck.h */,
                                A8A4743E151A825B004123FF /* StringConcatenate.h in Headers */,
                                7CD4C2701E2C82B900929470 /* StringConcatenateNumbers.h in Headers */,
                                0F2AC5611E89F70C0001EE3F /* Range.h in Headers */,
+                               7AFEC6AF1EB22AC600DADE36 /* UUID.h in Headers */,
                                A8A4742C151A825B004123FF /* StringExtras.h in Headers */,
                                A8A4743F151A825B004123FF /* StringHash.h in Headers */,
                                7CEAE5AD1EA6E10F00DB6890 /* NotFound.h in Headers */,
                                70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */,
                                1C181C7F1D3078DA00F5FA16 /* TextBreakIterator.cpp in Sources */,
                                1C181C961D30800A00F5FA16 /* TextBreakIteratorInternalICUMac.mm in Sources */,
+                               7AFEC6B11EB22B5900DADE36 /* UUID.cpp in Sources */,
                                A8A47448151A825B004123FF /* ThreadHolderPthreads.cpp in Sources */,
                                A8A4744A151A825B004123FF /* Threading.cpp in Sources */,
                                A8A4744E151A825B004123FF /* ThreadingPthreads.cpp in Sources */,
index 1dd3761..8e44390 100644 (file)
@@ -140,6 +140,7 @@ set(WTF_HEADERS
     ThreadingPrimitives.h
     TimeWithDynamicClockType.h
     TinyPtrSet.h
+    UUID.h
     UniqueRef.h
     VMTags.h
     ValueCheck.h
@@ -248,6 +249,7 @@ set(WTF_SOURCES
     ThreadMessage.cpp
     Threading.cpp
     TimeWithDynamicClockType.cpp
+    UUID.cpp
     WTFThreadData.cpp
     WallTime.cpp
     WordLock.cpp
similarity index 98%
rename from Source/WebCore/platform/UUID.cpp
rename to Source/WTF/wtf/UUID.cpp
index a6aaf27..fb5fe5b 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/HexNumber.h>
 #include <wtf/text/StringBuilder.h>
 
-namespace WebCore {
+namespace WTF {
 
 String createCanonicalUUIDString()
 {
@@ -59,4 +59,4 @@ String createCanonicalUUIDString()
     return builder.toString();
 }
 
-}
+} // namespace WTF
similarity index 95%
rename from Source/WebCore/platform/UUID.h
rename to Source/WTF/wtf/UUID.h
index fcbcba7..8a78755 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
+namespace WTF {
 
 // Creates a UUID that consists of 32 hexadecimal digits and returns its canonical form.
 // The canonical form is displayed in 5 groups separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters.
@@ -43,6 +43,8 @@ namespace WebCore {
 // data source. Version 4 UUIDs have the form xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx with hexadecimal digits for x and one of 8,
 // 9, A, or B for y.
 
-WEBCORE_EXPORT String createCanonicalUUIDString();
+WTF_EXPORT_PRIVATE String createCanonicalUUIDString();
 
 }
+
+using WTF::createCanonicalUUIDString;
index 0796af5..03187ea 100644 (file)
@@ -2210,7 +2210,6 @@ set(WebCore_SOURCES
     platform/Timer.cpp
     platform/URL.cpp
     platform/URLParser.cpp
-    platform/UUID.cpp
     platform/UserActivity.cpp
     platform/WebCoreCrossThreadCopier.cpp
     platform/WebGLStateTracker.cpp
index cd18d96..4d7931b 100644 (file)
@@ -1,3 +1,45 @@
+2017-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Move UUID from WebCore/platform to WTF
+        https://bugs.webkit.org/show_bug.cgi?id=171372
+
+        Reviewed by Michael Catanzaro.
+
+        UUID only contains createCanonicalUUIDString() that is platform independent and doesn't depend on anything from
+        WebCore, only from WTF.
+
+        * CMakeLists.txt:
+        * Modules/encryptedmedia/legacy/LegacyCDMSessionClearKey.cpp:
+        * Modules/mediacontrols/MediaControlsHost.cpp:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        * Modules/webaudio/MediaStreamAudioSource.cpp:
+        * Modules/webdatabase/DatabaseTracker.cpp:
+        * WebCore.order:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/mac/EditorMac.mm:
+        * fileapi/BlobURL.cpp:
+        * loader/appcache/ApplicationCacheHost.cpp:
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        * platform/URL.cpp:
+        * platform/glib/FileSystemGlib.cpp:
+        * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+        * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
+        * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        * platform/mediastream/CaptureDeviceManager.cpp:
+        * platform/mediastream/MediaStreamPrivate.h:
+        * platform/mediastream/MediaStreamTrackPrivate.cpp:
+        * platform/mediastream/RealtimeMediaSource.cpp:
+        * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+        * platform/mediastream/mac/AVMediaCaptureSource.mm:
+        * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
+        * platform/mock/MockRealtimeAudioSource.cpp:
+        * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+        * platform/mock/MockRealtimeVideoSource.cpp:
+        * testing/MockCDMFactory.cpp:
+
 2017-04-27  Alex Christensen  <achristensen@webkit.org>
 
         Make navigation policy checking more robust
index e08a368..8eacfd5 100644 (file)
 #include "JSMainThreadExecState.h"
 #include "Logging.h"
 #include "TextEncoding.h"
-#include "UUID.h"
 #include "WebKitMediaKeyError.h"
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSONObject.h>
 #include <runtime/VM.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/UUID.h>
 #include <wtf/text/Base64.h>
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
index eeead0d..9b37687 100644 (file)
@@ -39,8 +39,8 @@
 #include "RenderTheme.h"
 #include "TextTrack.h"
 #include "TextTrackList.h"
-#include "UUID.h"
 #include <runtime/JSCJSValueInlines.h>
+#include <wtf/UUID.h>
 
 namespace WebCore {
 
index c6d7c1f..47bf64e 100644 (file)
@@ -51,8 +51,8 @@
 #include "RTCPeerConnectionIceEvent.h"
 #include "RTCSessionDescription.h"
 #include "RTCTrackEvent.h"
-#include "UUID.h"
 #include <wtf/MainThread.h>
+#include <wtf/UUID.h>
 #include <wtf/text/Base64.h>
 
 namespace WebCore {
index 4fb32e9..3da529f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "AudioSourceProvider.h"
 #include "NotImplemented.h"
-#include "UUID.h"
+#include <wtf/UUID.h>
 
 namespace WebCore {
 
index 04de1fb..97b1e66 100644 (file)
 #include "SecurityOriginHash.h"
 #include "SQLiteFileSystem.h"
 #include "SQLiteStatement.h"
-#include "UUID.h"
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/UUID.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index f6e786c..89fb083 100644 (file)
@@ -19386,7 +19386,6 @@ __ZN7WebCore4BlobC1EN3WTF10PassOwnPtrINS_8BlobDataEEEx
 __ZN7WebCore4BlobC2EN3WTF10PassOwnPtrINS_8BlobDataEEEx
 __ZN7WebCore7BlobURL17createInternalURLEv
 __ZN7WebCore7BlobURL13createBlobURLERKN3WTF6StringE
-__ZN7WebCore25createCanonicalUUIDStringEv
 __ZN3WTF28appendUnsignedAsHexFixedSizeINS_13StringBuilderEEEvjRT_jNS_17HexConversionModeE
 __ZNK3WTF12StringAppendINS0_INS0_IPKcNS_6StringEEEcEES3_EcvS3_Ev
 __ZN3WTF13tryMakeStringINS_12StringAppendINS1_IPKcNS_6StringEEEcEES4_EENS_10PassRefPtrINS_10StringImplEEET_T0_
index 6e3fedd..3fa813d 100644 (file)
                2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E37DFD812DBAFB800A6B233 /* DOMURL.h */; };
                2E37E00512DBC5A400A6B233 /* JSDOMURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E37E00312DBC5A400A6B233 /* JSDOMURL.cpp */; };
                2E37E00612DBC5A400A6B233 /* JSDOMURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E37E00412DBC5A400A6B233 /* JSDOMURL.h */; };
-               2E3BBF071162DA1100B9409A /* UUID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E3BBF051162DA1100B9409A /* UUID.cpp */; };
-               2E3BBF081162DA1100B9409A /* UUID.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E3BBF061162DA1100B9409A /* UUID.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2E3BC0CA117D3E0800B9409A /* JSFileError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E3BC0C8117D3E0800B9409A /* JSFileError.cpp */; };
                2E3BC0CB117D3E0800B9409A /* JSFileError.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E3BC0C9117D3E0800B9409A /* JSFileError.h */; };
                2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346330F546A8200B0F1BA /* Worker.cpp */; };
                2E37DFD912DBAFB800A6B233 /* DOMURL.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMURL.idl; sourceTree = "<group>"; };
                2E37E00312DBC5A400A6B233 /* JSDOMURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMURL.cpp; sourceTree = "<group>"; };
                2E37E00412DBC5A400A6B233 /* JSDOMURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMURL.h; sourceTree = "<group>"; };
-               2E3BBF051162DA1100B9409A /* UUID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UUID.cpp; sourceTree = "<group>"; };
-               2E3BBF061162DA1100B9409A /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
                2E3BC0C8117D3E0800B9409A /* JSFileError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileError.cpp; sourceTree = "<group>"; };
                2E3BC0C9117D3E0800B9409A /* JSFileError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileError.h; sourceTree = "<group>"; };
                2E4346330F546A8200B0F1BA /* Worker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Worker.cpp; sourceTree = "<group>"; };
                                868160D1187669C40021E79D /* UserActivity.cpp */,
                                868160D2187669C40021E79D /* UserActivity.h */,
                                71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */,
-                               2E3BBF051162DA1100B9409A /* UUID.cpp */,
-                               2E3BBF061162DA1100B9409A /* UUID.h */,
                                83C45B8D1DC2B67C008871BA /* ValidationBubble.h */,
                                9A1142031832D134000BB8AD /* ValueToString.h */,
                                515F79511CFCA3C700CCED93 /* WebCoreCrossThreadCopier.cpp */,
                                BC8BF15A1058141800A40A07 /* UserStyleSheetTypes.h in Headers */,
                                BCDF317C11F8D683003C5BF8 /* UserTypingGestureIndicator.h in Headers */,
                                1FAFBF1915A5FA7400083A20 /* UTIUtilities.h in Headers */,
-                               2E3BBF081162DA1100B9409A /* UUID.h in Headers */,
                                83C45B8E1DC2B68A008871BA /* ValidationBubble.h in Headers */,
                                F5A154281279534D00D0B0C0 /* ValidationMessage.h in Headers */,
                                F513A3EA15FF4841001526DB /* ValidationMessageClient.h in Headers */,
                                7C73FB07191EF417007DE061 /* UserMessageHandlersNamespace.cpp in Sources */,
                                BCDF317B11F8D683003C5BF8 /* UserTypingGestureIndicator.cpp in Sources */,
                                1FAFBF1815A5FA6E00083A20 /* UTIUtilities.mm in Sources */,
-                               2E3BBF071162DA1100B9409A /* UUID.cpp in Sources */,
                                837B7D201DC3F55000D051FC /* ValidationBubbleIOS.mm in Sources */,
                                83C45B8C1DC2B667008871BA /* ValidationBubbleMac.mm in Sources */,
                                F5A154271279534D00D0B0C0 /* ValidationMessage.cpp in Sources */,
index 63bc3d8..68d0a7a 100644 (file)
@@ -63,7 +63,6 @@
 #import "StyleProperties.h"
 #import "Text.h"
 #import "TypingCommand.h"
-#import "UUID.h"
 #import "WebNSAttributedStringExtras.h"
 #import "markup.h"
 
index 847ea49..dd7466f 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "URL.h"
 #include "SecurityOrigin.h"
-#include "UUID.h"
+#include <wtf/UUID.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 9114699..322f6b3 100644 (file)
@@ -45,6 +45,7 @@
 #include "ResourceRequest.h"
 #include "Settings.h"
 #include "SubresourceLoader.h"
+#include <wtf/UUID.h>
 
 namespace WebCore {
 
index 284ab6d..599b952 100644 (file)
 #include "SecurityOrigin.h"
 #include "SecurityOriginData.h"
 #include "URL.h"
-#include "UUID.h"
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/StringExtras.h>
+#include <wtf/UUID.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index b269e0a..6cbb723 100644 (file)
 #include "MIMETypeRegistry.h"
 #include "TextEncoding.h"
 #include "URLParser.h"
-#include "UUID.h"
 #include <stdio.h>
 #include <unicode/uidna.h>
 #include <wtf/HashMap.h>
 #include <wtf/HexNumber.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/UUID.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>
index 6fa3ea7..3cd547b 100644 (file)
 
 #include "FileMetadata.h"
 #include "NotImplemented.h"
-#include "UUID.h"
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <wtf/UUID.h>
 #include <wtf/glib/GLibUtilities.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/GUniquePtr.h>
index 86185fc..7a45429 100644 (file)
@@ -35,8 +35,8 @@
 #include "MediaPlayerPrivateAVFoundationCF.h"
 #include "NotImplemented.h"
 #include "SoftLinking.h"
-#include "UUID.h"
 #include <AVFoundationCF/AVFoundationCF.h>
+#include <wtf/UUID.h>
 #include <wtf/text/CString.h>
 
 // The softlink header files must be included after the AVCF and CoreMedia header files.
index f6ec1c6..4c23347 100644 (file)
@@ -35,7 +35,6 @@
 #import "MediaPlayer.h"
 #import "SoftLinking.h"
 #import "SourceBufferPrivateAVFObjC.h"
-#import "UUID.h"
 #import "WebCoreNSErrorExtras.h"
 #import <AVFoundation/AVError.h>
 #import <CoreMedia/CMBase.h>
index 2990f7c..0e68758 100644 (file)
 #import "MediaPlayer.h"
 #import "MediaPlayerPrivateAVFoundationObjC.h"
 #import "SoftLinking.h"
-#import "UUID.h"
 #import "WebCoreNSErrorExtras.h"
 #import <AVFoundation/AVAsset.h>
 #import <AVFoundation/AVAssetResourceLoader.h>
 #import <objc/objc-runtime.h>
 #import <runtime/TypedArrayInlines.h>
 #import <wtf/MainThread.h>
+#import <wtf/UUID.h>
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
 SOFT_LINK_CLASS(AVFoundation, AVURLAsset)
index 2d72afe..e8519e2 100644 (file)
 #import "MediaPlayer.h"
 #import "SoftLinking.h"
 #import "SourceBufferPrivateAVFObjC.h"
-#import "UUID.h"
 #import "WebCoreNSErrorExtras.h"
 #import <AVFoundation/AVError.h>
 #import <CoreMedia/CMBase.h>
 #import <objc/objc-runtime.h>
 #import <runtime/TypedArrayInlines.h>
+#import <wtf/UUID.h>
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
 SOFT_LINK_CLASS(AVFoundation, AVStreamDataParser);
index 40839d4..324b650 100644 (file)
@@ -61,7 +61,6 @@
 #import "TextTrackRepresentation.h"
 #import "TextureCacheCV.h"
 #import "URL.h"
-#import "UUID.h"
 #import "VideoTextureCopierCV.h"
 #import "VideoTrackPrivateAVFObjC.h"
 #import "WebCoreAVFResourceLoader.h"
index 2bf11ea..cda0534 100644 (file)
@@ -96,7 +96,6 @@
 #include "SharedBuffer.h"
 #include "WebKitClearKeyDecryptorGStreamer.h"
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
-#include "UUID.h"
 #include <runtime/JSCInlines.h>
 #include <runtime/TypedArrayInlines.h>
 #include <runtime/Uint8Array.h>
index 20ee717..8648ab7 100644 (file)
@@ -33,7 +33,6 @@
 #import "RealtimeMediaSource.h"
 #import "RealtimeMediaSourceCenter.h"
 #import "RealtimeMediaSourceSettings.h"
-#import "UUID.h"
 #import <wtf/MainThread.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/text/StringHash.h>
index 9b5aa2e..4e980f9 100644 (file)
 #include "FloatSize.h"
 #include "MediaStreamTrack.h"
 #include "MediaStreamTrackPrivate.h"
-#include "UUID.h"
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
 #include <wtf/MediaTime.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+#include <wtf/UUID.h>
 #include <wtf/Vector.h>
 #include <wtf/WeakPtr.h>
 
index d87ee5f..9ffd044 100644 (file)
@@ -32,7 +32,7 @@
 #include "AudioSourceProvider.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"
-#include "UUID.h"
+#include <wtf/UUID.h>
 
 namespace WebCore {
 
index b0d29e0..191daee 100644 (file)
@@ -39,8 +39,8 @@
 #include "MediaConstraints.h"
 #include "NotImplemented.h"
 #include "RealtimeMediaSourceCapabilities.h"
-#include "UUID.h"
 #include <wtf/MainThread.h>
+#include <wtf/UUID.h>
 #include <wtf/text/StringHash.h>
 
 namespace WebCore {
index cac1335..8b79090 100644 (file)
@@ -39,7 +39,6 @@
 #import "RealtimeMediaSourceSettings.h"
 #import "RealtimeMediaSourceSupportedConstraints.h"
 #import "SoftLinking.h"
-#import "UUID.h"
 #import <AVFoundation/AVCaptureDevice.h>
 #import <AVFoundation/AVCaptureSession.h>
 #import <objc/runtime.h>
index 4c34340..e7db948 100644 (file)
@@ -33,7 +33,6 @@
 #import "Logging.h"
 #import "MediaConstraints.h"
 #import "RealtimeMediaSourceSettings.h"
-#import "UUID.h"
 #import <AVFoundation/AVCaptureDevice.h>
 #import <AVFoundation/AVCaptureInput.h>
 #import <AVFoundation/AVCaptureOutput.h>
index 6ec8e8b..dbc32e5 100644 (file)
 #include "RealtimeAudioSourceOwr.h"
 #include "RealtimeMediaSourceCapabilities.h"
 #include "RealtimeVideoSourceOwr.h"
-#include "UUID.h"
 #include <owr/owr.h>
 #include <owr/owr_local.h>
 #include <owr/owr_media_source.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/UUID.h>
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
-
 namespace WebCore {
 
 RealtimeMediaSourceCenter& RealtimeMediaSourceCenter::platformCenter()
index 40788d7..2aeb3d4 100644 (file)
@@ -37,7 +37,7 @@
 #include "MediaConstraints.h"
 #include "NotImplemented.h"
 #include "RealtimeMediaSourceSettings.h"
-#include "UUID.h"
+#include <wtf/UUID.h>
 
 namespace WebCore {
 
index bd74886..e20c632 100644 (file)
@@ -40,7 +40,6 @@
 #include "MockRealtimeVideoSource.h"
 #include "RealtimeMediaSource.h"
 #include "RealtimeMediaSourceCapabilities.h"
-#include "UUID.h"
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index 2e66422..6a6074a 100644 (file)
@@ -41,9 +41,9 @@
 #include "NotImplemented.h"
 #include "PlatformLayer.h"
 #include "RealtimeMediaSourceSettings.h"
-#include "UUID.h"
 #include <math.h>
 #include <wtf/CurrentTime.h>
+#include <wtf/UUID.h>
 #include <wtf/text/StringView.h>
 
 namespace WebCore {
index f3b4a47..e9a9d04 100644 (file)
@@ -29,8 +29,8 @@
 #if ENABLE(ENCRYPTED_MEDIA)
 
 #include "InitDataRegistry.h"
-#include "UUID.h"
 #include <runtime/ArrayBuffer.h>
+#include <wtf/UUID.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/StringView.h>
 
index d7ae05c..c9ba85e 100644 (file)
@@ -1,3 +1,19 @@
+2017-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Move UUID from WebCore/platform to WTF
+        https://bugs.webkit.org/show_bug.cgi?id=171372
+
+        Reviewed by Michael Catanzaro.
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::handleForWebPageProxy):
+        (WebKit::WebAutomationSession::handleForWebFrameID):
+        * UIProcess/gtk/WaylandCompositor.cpp:
+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+        (WebKit::createUUID):
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::PDFPlugin::openWithNativeApplication):
+
 2017-04-27  Chris Dumez  <cdumez@apple.com>
 
         Align colspan/rowspan limits with the latest HTML specification
index 57d385d..7aea15c 100644 (file)
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 #include <JavaScriptCore/InspectorFrontendRouter.h>
 #include <WebCore/URL.h>
-#include <WebCore/UUID.h>
 #include <algorithm>
 #include <wtf/HashMap.h>
 #include <wtf/Optional.h>
+#include <wtf/UUID.h>
 #include <wtf/text/StringConcatenate.h>
 
 using namespace Inspector;
@@ -138,7 +138,7 @@ String WebAutomationSession::handleForWebPageProxy(const WebPageProxy& webPagePr
     if (iter != m_webPageHandleMap.end())
         return iter->value;
 
-    String handle = "page-" + WebCore::createCanonicalUUIDString().convertToASCIIUppercase();
+    String handle = "page-" + createCanonicalUUIDString().convertToASCIIUppercase();
 
     auto firstAddResult = m_webPageHandleMap.add(webPageProxy.pageID(), handle);
     RELEASE_ASSERT(firstAddResult.isNewEntry);
@@ -178,7 +178,7 @@ String WebAutomationSession::handleForWebFrameID(uint64_t frameID)
     if (iter != m_webFrameHandleMap.end())
         return iter->value;
 
-    String handle = "frame-" + WebCore::createCanonicalUUIDString().convertToASCIIUppercase();
+    String handle = "frame-" + createCanonicalUUIDString().convertToASCIIUppercase();
 
     auto firstAddResult = m_webFrameHandleMap.add(frameID, handle);
     RELEASE_ASSERT(firstAddResult.isNewEntry);
index f03fd08..64692da 100644 (file)
@@ -34,8 +34,8 @@
 #include <WebCore/GLContext.h>
 #include <WebCore/PlatformDisplayWayland.h>
 #include <WebCore/Region.h>
-#include <WebCore/UUID.h>
 #include <wayland-server-protocol.h>
+#include <wtf/UUID.h>
 
 #if USE(OPENGL_ES_2)
 #include <GLES2/gl2.h>
index c4922d8..43a74e4 100644 (file)
@@ -47,7 +47,7 @@
 #include <WebCore/HTMLFrameElementBase.h>
 #include <WebCore/JSElement.h>
 #include <WebCore/MainFrame.h>
-#include <WebCore/UUID.h>
+#include <wtf/UUID.h>
 
 namespace WebKit {
 
@@ -122,7 +122,7 @@ static JSValueRef evaluate(JSContextRef context, JSObjectRef function, JSObjectR
 
 static JSValueRef createUUID(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    return toJSValue(context, WebCore::createCanonicalUUIDString().convertToASCIIUppercase());
+    return toJSValue(context, createCanonicalUUIDString().convertToASCIIUppercase());
 }
 
 static JSValueRef evaluateJavaScriptCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
index 02d84a1..7fc608b 100644 (file)
 #import <WebCore/ScrollAnimator.h>
 #import <WebCore/ScrollbarTheme.h>
 #import <WebCore/Settings.h>
-#import <WebCore/UUID.h>
 #import <WebCore/WheelEventTestTrigger.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/CurrentTime.h>
+#import <wtf/UUID.h>
 
 using namespace WebCore;
 
@@ -1791,7 +1791,7 @@ void PDFPlugin::openWithNativeApplication()
 
         NSData *data = liveData();
 
-        m_temporaryPDFUUID = WebCore::createCanonicalUUIDString();
+        m_temporaryPDFUUID = createCanonicalUUIDString();
         ASSERT(m_temporaryPDFUUID);
 
         webFrame()->page()->savePDFToTemporaryFolderAndOpenWithNativeApplication(m_suggestedFilename, webFrame()->url(), static_cast<const unsigned char *>([data bytes]), [data length], m_temporaryPDFUUID);
index 9efb2d9..764fed6 100644 (file)
@@ -1,3 +1,12 @@
+2017-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Move UUID from WebCore/platform to WTF
+        https://bugs.webkit.org/show_bug.cgi?id=171372
+
+        Reviewed by Michael Catanzaro.
+
+        * WebKitTestRunner/TestController.cpp:
+
 2017-04-27  Alex Christensen  <achristensen@webkit.org>
 
         Add stub SPI for setting cookie storage path on _WKWebsiteDataStoreConfiguration
index 8216da4..47a17e0 100644 (file)
@@ -32,7 +32,6 @@
 #include "StringFunctions.h"
 #include "TestInvocation.h"
 #include "WebCoreTestSupport.h"
-#include <WebCore/UUID.h>
 #include <WebKit/WKArray.h>
 #include <WebKit/WKAuthenticationChallenge.h>
 #include <WebKit/WKAuthenticationDecisionListener.h>
@@ -74,6 +73,7 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RunLoop.h>
 #include <wtf/SetForScope.h>
+#include <wtf/UUID.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
@@ -1877,28 +1877,6 @@ void TestController::setUserMediaPermission(bool enabled)
     decidePolicyForUserMediaPermissionRequestIfPossible();
 }
 
-static String createCanonicalUUIDString()
-{
-    unsigned randomData[4];
-    cryptographicallyRandomValues(reinterpret_cast<unsigned char*>(randomData), sizeof(randomData));
-
-    // Format as Version 4 UUID.
-    StringBuilder builder;
-    builder.reserveCapacity(36);
-    appendUnsignedAsHexFixedSize(randomData[0], builder, 8, Lowercase);
-    builder.append('-');
-    appendUnsignedAsHexFixedSize(randomData[1] >> 16, builder, 4, Lowercase);
-    builder.appendLiteral("-4");
-    appendUnsignedAsHexFixedSize(randomData[1] & 0x00000fff, builder, 3, Lowercase);
-    builder.append('-');
-    appendUnsignedAsHexFixedSize((randomData[2] >> 30) | 0x8, builder, 1, Lowercase);
-    appendUnsignedAsHexFixedSize((randomData[2] >> 16) & 0x00000fff, builder, 3, Lowercase);
-    builder.append('-');
-    appendUnsignedAsHexFixedSize(randomData[2] & 0x0000ffff, builder, 4, Lowercase);
-    appendUnsignedAsHexFixedSize(randomData[3], builder, 8, Lowercase);
-    return builder.toString();
-}
-
 class OriginSettings : public RefCounted<OriginSettings> {
 public:
     explicit OriginSettings()