Diff
Modified: trunk/Source/WTF/ChangeLog (145742 => 145743)
--- trunk/Source/WTF/ChangeLog 2013-03-13 20:23:01 UTC (rev 145742)
+++ trunk/Source/WTF/ChangeLog 2013-03-13 20:23:27 UTC (rev 145743)
@@ -1,3 +1,21 @@
+2013-03-13 James Robinson <[email protected]>
+
+ SchedulePair.cpp is CF-specific
+ https://bugs.webkit.org/show_bug.cgi?id=112204
+
+ Reviewed by Oliver Hunt.
+
+ This renames SchedulePair.cpp SchedulePairCF.cpp, since it depends on CF, and excludes it from chromium's gyp
+ files.
+
+ * WTF.gyp/WTF.gyp:
+ Add CF to the exclusion filter for the Chromium port.
+ * WTF.gypi:
+ Add SchedulePairCF.cpp
+ * WTF.xcodeproj/project.pbxproj:
+ Update project file to point to new .cpp location
+ * wtf/SchedulePairCF.cpp: Renamed from Source/WTF/wtf/SchedulePair.cpp.
+
2013-03-13 Allan Sandfeld Jensen <[email protected]>
Support C++11 features in GCC <4.6
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (145742 => 145743)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2013-03-13 20:23:01 UTC (rev 145742)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2013-03-13 20:23:27 UTC (rev 145743)
@@ -116,7 +116,7 @@
['exclude', '../wtf/unicode/qt4'],
['exclude', '../wtf/unicode/wchar'],
['exclude', '/(gtk|gobject)/.*\\.(cpp|h)$'],
- ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
+ ['exclude', '(Default|CF|Gtk|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
['exclude', 'wtf/OSRandomSource\\.cpp$'],
['exclude', 'wtf/MainThread.cpp$'],
['exclude', 'wtf/MetaAllocator\\.(cpp|h)$'],
Modified: trunk/Source/WTF/WTF.gypi (145742 => 145743)
--- trunk/Source/WTF/WTF.gypi 2013-03-13 20:23:01 UTC (rev 145742)
+++ trunk/Source/WTF/WTF.gypi 2013-03-13 20:23:27 UTC (rev 145743)
@@ -204,6 +204,7 @@
'wtf/RunLoopTimerCF.cpp',
'wtf/SHA1.cpp',
'wtf/SHA1.h',
+ 'wtf/SchedulePairCF.cpp',
'wtf/SchedulePairMac.mm',
'wtf/SegmentedVector.h',
'wtf/SizeLimits.cpp',
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (145742 => 145743)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-03-13 20:23:01 UTC (rev 145742)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-03-13 20:23:27 UTC (rev 145743)
@@ -35,8 +35,8 @@
1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419016EAAF6D0024E146 /* RunLoopTimer.h */; settings = {ATTRIBUTES = (Private, ); }; };
1469419316EAAF6D0024E146 /* RunLoopTimerCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419116EAAF6D0024E146 /* RunLoopTimerCF.cpp */; };
1469419616EAAFF80024E146 /* SchedulePair.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419416EAAFF80024E146 /* SchedulePair.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419816EAB0410024E146 /* SchedulePairCF.cpp */; };
1469419716EAAFF80024E146 /* SchedulePairMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419516EAAFF80024E146 /* SchedulePairMac.mm */; };
- 1469419916EAB0410024E146 /* SchedulePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419816EAB0410024E146 /* SchedulePair.cpp */; };
1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419A16EAB10A0024E146 /* AutodrainedPool.h */; settings = {ATTRIBUTES = (Private, ); }; };
1469419D16EAB10A0024E146 /* AutodrainedPoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */; };
149EF16316BBFE0D000A4331 /* TriState.h in Headers */ = {isa = PBXBuildFile; fileRef = 149EF16216BBFE0D000A4331 /* TriState.h */; settings = {ATTRIBUTES = (); }; };
@@ -345,8 +345,8 @@
1469419016EAAF6D0024E146 /* RunLoopTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoopTimer.h; sourceTree = "<group>"; };
1469419116EAAF6D0024E146 /* RunLoopTimerCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopTimerCF.cpp; sourceTree = "<group>"; };
1469419416EAAFF80024E146 /* SchedulePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchedulePair.h; sourceTree = "<group>"; };
+ 1469419816EAB0410024E146 /* SchedulePairCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulePairCF.cpp; sourceTree = "<group>"; };
1469419516EAAFF80024E146 /* SchedulePairMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SchedulePairMac.mm; sourceTree = "<group>"; };
- 1469419816EAB0410024E146 /* SchedulePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulePair.cpp; sourceTree = "<group>"; };
1469419A16EAB10A0024E146 /* AutodrainedPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutodrainedPool.h; sourceTree = "<group>"; };
1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutodrainedPoolMac.mm; sourceTree = "<group>"; };
149EF16216BBFE0D000A4331 /* TriState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriState.h; sourceTree = "<group>"; };
@@ -851,7 +851,7 @@
1469419116EAAF6D0024E146 /* RunLoopTimerCF.cpp */,
14F3B0F615E45E4600210069 /* SaturatedArithmetic.h */,
1469419416EAAFF80024E146 /* SchedulePair.h */,
- 1469419816EAB0410024E146 /* SchedulePair.cpp */,
+ 1469419816EAB0410024E146 /* SchedulePairCF.cpp */,
1469419516EAAFF80024E146 /* SchedulePairMac.mm */,
A8A47306151A825B004123FF /* SegmentedVector.h */,
A8A47307151A825B004123FF /* SentinelLinkedList.h */,
@@ -1412,7 +1412,7 @@
A8A4743C151A825B004123FF /* StringBuilder.cpp in Sources */,
A8A47440151A825B004123FF /* StringImpl.cpp in Sources */,
0FDDBFA71666DFA300C55FEF /* StringPrintStream.cpp in Sources */,
- 1469419916EAB0410024E146 /* SchedulePair.cpp in Sources */,
+ 1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */,
A8A47443151A825B004123FF /* StringStatics.cpp in Sources */,
A8A473B7151A825B004123FF /* strtod.cc in Sources */,
A8A47431151A825B004123FF /* TCSystemAlloc.cpp in Sources */,
Deleted: trunk/Source/WTF/wtf/SchedulePair.cpp (145742 => 145743)
--- trunk/Source/WTF/wtf/SchedulePair.cpp 2013-03-13 20:23:01 UTC (rev 145742)
+++ trunk/Source/WTF/wtf/SchedulePair.cpp 2013-03-13 20:23:27 UTC (rev 145743)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SchedulePair.h"
-
-namespace WTF {
-
-bool SchedulePair::operator==(const SchedulePair& other) const
-{
- if (runLoop() != other.runLoop())
- return false;
- CFStringRef thisMode = mode();
- CFStringRef otherMode = other.mode();
- if (!thisMode || !otherMode)
- return thisMode == otherMode;
- return CFEqual(thisMode, otherMode);
-}
-
-} // namespace
Copied: trunk/Source/WTF/wtf/SchedulePairCF.cpp (from rev 145741, trunk/Source/WTF/wtf/SchedulePair.cpp) (0 => 145743)
--- trunk/Source/WTF/wtf/SchedulePairCF.cpp (rev 0)
+++ trunk/Source/WTF/wtf/SchedulePairCF.cpp 2013-03-13 20:23:27 UTC (rev 145743)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * 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.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "SchedulePair.h"
+
+namespace WTF {
+
+bool SchedulePair::operator==(const SchedulePair& other) const
+{
+ if (runLoop() != other.runLoop())
+ return false;
+ CFStringRef thisMode = mode();
+ CFStringRef otherMode = other.mode();
+ if (!thisMode || !otherMode)
+ return thisMode == otherMode;
+ return CFEqual(thisMode, otherMode);
+}
+
+} // namespace
