<https://webkit.org/b/120036> [iOS] Upstream Source/WTF Xcode project for iOS
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Aug 2013 00:02:42 +0000 (00:02 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Aug 2013 00:02:42 +0000 (00:02 +0000)
Reviewed by David Kilzer.

Include iOS only WebCoreThread.* files in an ios group, and clean up
the included files a bit.

* WTF.xcodeproj/project.pbxproj:
* wtf/ios/WebCoreThread.cpp:
* wtf/ios/WebCoreThread.h:

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

Source/WTF/ChangeLog
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/wtf/ios/WebCoreThread.cpp
Source/WTF/wtf/ios/WebCoreThread.h

index fcd5e6e21dd41b8dece22c2136a005528736339f..129681c2821d58d0efdc6aab9da515ae172afe8b 100644 (file)
@@ -1,3 +1,16 @@
+2013-08-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        <https://webkit.org/b/120036> [iOS] Upstream Source/WTF Xcode project for iOS
+
+        Reviewed by David Kilzer.
+
+        Include iOS only WebCoreThread.* files in an ios group, and clean up
+        the included files a bit.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/ios/WebCoreThread.cpp:
+        * wtf/ios/WebCoreThread.h:
+
 2013-08-19  Joseph Pecoraro  <pecoraro@apple.com>
 
         <https://webkit.org/b/119905> [iOS] Upstream Source/WTF
index 2cdc0a7454557107439253e527af816e1e36d7e3..1fc90fc3ae4e731be3001e682dc6d644b24c07c1 100644 (file)
@@ -51,6 +51,8 @@
                1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */; };
                1A1D8B9E1731879800141DA4 /* FunctionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */; };
                1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6BB768162F300500DD16DB /* StreamBuffer.h */; };
+               1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FA47C88152502DA00568D1B /* WebCoreThread.cpp */; };
+               1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FA47C89152502DA00568D1B /* WebCoreThread.h */; };
                26147B0A15DDCCDC00DDB907 /* IntegerToStringConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 26147B0815DDCCDC00DDB907 /* IntegerToStringConversion.h */; };
                2C05385415BC819000F21B96 /* GregorianDateTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C05385315BC819000F21B96 /* GregorianDateTime.h */; };
                2CCD892A15C0390200285083 /* GregorianDateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CCD892915C0390200285083 /* GregorianDateTime.cpp */; };
                1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionDispatcher.cpp; sourceTree = "<group>"; };
                1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NeverDestroyed.h; sourceTree = "<group>"; };
                1A6BB768162F300500DD16DB /* StreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = "<group>"; };
+               1FA47C88152502DA00568D1B /* WebCoreThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreThread.cpp; sourceTree = "<group>"; };
+               1FA47C89152502DA00568D1B /* WebCoreThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreThread.h; sourceTree = "<group>"; };
                26147B0815DDCCDC00DDB907 /* IntegerToStringConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegerToStringConversion.h; sourceTree = "<group>"; };
                2C05385315BC819000F21B96 /* GregorianDateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GregorianDateTime.h; sourceTree = "<group>"; };
                2CCD892915C0390200285083 /* GregorianDateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GregorianDateTime.cpp; sourceTree = "<group>"; };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+               1FA47C87152502DA00568D1B /* ios */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1FA47C88152502DA00568D1B /* WebCoreThread.cpp */,
+                               1FA47C89152502DA00568D1B /* WebCoreThread.h */,
+                       );
+                       path = ios;
+                       sourceTree = "<group>";
+               };
                5D247B5714689B8600E78B76 = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
                                A8A47281151A825A004123FF /* dtoa */,
+                               1FA47C87152502DA00568D1B /* ios */,
                                A8A472C4151A825A004123FF /* mac */,
                                A8A4731B151A825B004123FF /* text */,
                                A8A47339151A825B004123FF /* threads */,
                                A8A4747F151A825B004123FF /* VectorTraits.h in Headers */,
                                A8A47480151A825B004123FF /* VMTags.h in Headers */,
                                974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */,
+                               1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
                                A8A47446151A825B004123FF /* WTFString.h in Headers */,
                                A8A47487151A825B004123FF /* WTFThreadData.h in Headers */,
                        );
                                A8A4744E151A825B004123FF /* ThreadingPthreads.cpp in Sources */,
                                A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */,
                                A8A47469151A825B004123FF /* UTF8.cpp in Sources */,
+                               1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */,
                                A8A47445151A825B004123FF /* WTFString.cpp in Sources */,
                                A8A47486151A825B004123FF /* WTFThreadData.cpp in Sources */,
                        );
index de23f756bd50a646505376a9ae06e869e66b4633..427446603978889ae030dab14d1ef1e336b819a7 100644 (file)
@@ -6,10 +6,10 @@
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
+ *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
+ *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -23,8 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "config.h"
 #include "WebCoreThread.h"
 
+#if USE(WEB_THREAD)
 WTF_EXPORT_PRIVATE bool (*WebCoreWebThreadIsLockedOrDisabled)(void);
+#endif
index f397dfc03435927faecfb1021770e1d33c0af3f3..10e26a77cf925aa537995c47e1e06dcb797b9ef9 100644 (file)
@@ -6,10 +6,10 @@
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
+ *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
+ *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -24,9 +24,9 @@
  */
 
 // Since this is a shared header, with the same file name as a file in
-// WebCore we prefix this with JavaScriptCore to make it unique.
-#ifndef JavaScriptCore_WebCoreThread_h
-#define JavaScriptCore_WebCoreThread_h
+// WebCore we prefix this with WTF to make it unique.
+#ifndef WTF_WebCoreThread_h
+#define WTF_WebCoreThread_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,4 +38,4 @@ extern bool (*WebCoreWebThreadIsLockedOrDisabled)(void);
 }
 #endif
 
-#endif
+#endif // WTF_WebCoreThread_h