REGRESSION(r145592): AutodrainedPool.h. RunLoopTimer.h, SchedulePair.h are being copied into
the wrong location
https://bugs.webkit.org/show_bug.cgi?id=112833
Reviewed by Darin Adler.
Source/WebCore:
Fix an incorrect include path.
* loader/DocumentLoader.h:
RunLoopTimer.h lives in wtf as of r145592.
Source/WTF:
* WTF.xcodeproj/project.pbxproj:
Make sure those three headers are copied with the rest of the WTF headers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index b98a58d..682739b 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-20 Jessie Berlin <jberlin@apple.com>
+
+ REGRESSION(r145592): AutodrainedPool.h. RunLoopTimer.h, SchedulePair.h are being copied into
+ the wrong location
+ https://bugs.webkit.org/show_bug.cgi?id=112833
+
+ Reviewed by Darin Adler.
+
+ * WTF.xcodeproj/project.pbxproj:
+ Make sure those three headers are copied with the rest of the WTF headers.
+
2013-03-20 Mark Rowe <mrowe@apple.com>
FastMalloc scavenge timer specifies an overly narrow leeway value.
diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
index af9bc47..e81587c 100644
--- a/Source/WTF/WTF.xcodeproj/project.pbxproj
+++ b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -32,12 +32,12 @@
0FDDBFA81666DFA300C55FEF /* StringPrintStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */; };
143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 143F611D1565F0F900DB514A /* RAMSize.cpp */; };
143F61201565F0F900DB514A /* RAMSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 143F611E1565F0F900DB514A /* RAMSize.h */; settings = {ATTRIBUTES = (); }; };
- 1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419016EAAF6D0024E146 /* RunLoopTimer.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419016EAAF6D0024E146 /* RunLoopTimer.h */; settings = {ATTRIBUTES = (); }; };
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 */; };
+ 1469419616EAAFF80024E146 /* SchedulePair.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419416EAAFF80024E146 /* SchedulePair.h */; settings = {ATTRIBUTES = (); }; };
1469419716EAAFF80024E146 /* SchedulePairMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419516EAAFF80024E146 /* SchedulePairMac.mm */; };
- 1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419A16EAB10A0024E146 /* AutodrainedPool.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419816EAB0410024E146 /* SchedulePairCF.cpp */; };
+ 1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419A16EAB10A0024E146 /* AutodrainedPool.h */; settings = {ATTRIBUTES = (); }; };
1469419D16EAB10A0024E146 /* AutodrainedPoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */; };
149EF16316BBFE0D000A4331 /* TriState.h in Headers */ = {isa = PBXBuildFile; fileRef = 149EF16216BBFE0D000A4331 /* TriState.h */; settings = {ATTRIBUTES = (); }; };
14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F3B0F615E45E4600210069 /* SaturatedArithmetic.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 /* SchedulePairCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulePairCF.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>"; };
@@ -1075,8 +1075,11 @@
files = (
A8A4737F151A825B004123FF /* Alignment.h in Headers */,
A8A47380151A825B004123FF /* AlwaysInline.h in Headers */,
+ 1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */,
A8A47382151A825B004123FF /* ArrayBuffer.h in Headers */,
A8A47384151A825B004123FF /* ArrayBufferView.h in Headers */,
+ 1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
+ 1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
A8A47385151A825B004123FF /* ASCIICType.h in Headers */,
A8A47434151A825B004123FF /* ASCIIFastPath.h in Headers */,
A8A47387151A825B004123FF /* Assertions.h in Headers */,
@@ -1088,7 +1091,6 @@
8134013915B092FD001FF0B8 /* Base64.h in Headers */,
A8A473A9151A825B004123FF /* bignum-dtoa.h in Headers */,
A8A473AB151A825B004123FF /* bignum.h in Headers */,
- 1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */,
4F0321BC156AA8D1006EBAF6 /* BitArray.h in Headers */,
A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
@@ -1200,7 +1202,6 @@
A876DBD8151816E500DADB95 /* Platform.h in Headers */,
A8A4740E151A825B004123FF /* Platform.h in Headers */,
A8A4740F151A825B004123FF /* PossiblyNull.h in Headers */,
- 1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
0F9D3363165DBA73005AD387 /* PrintStream.h in Headers */,
143F61201565F0F900DB514A /* RAMSize.h in Headers */,
A8A47415151A825B004123FF /* RandomNumber.h in Headers */,
@@ -1250,7 +1251,6 @@
A8A47450151A825B004123FF /* ThreadRestrictionVerifier.h in Headers */,
A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */,
A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
- 1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */,
149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
A8A47457151A825B004123FF /* TypedArrayBase.h in Headers */,
A8A47459151A825B004123FF /* TypeTraits.h in Headers */,
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0741f70..7a2d06c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-20 Jessie Berlin <jberlin@apple.com>
+
+ REGRESSION(r145592): AutodrainedPool.h. RunLoopTimer.h, SchedulePair.h are being copied into
+ the wrong location
+ https://bugs.webkit.org/show_bug.cgi?id=112833
+
+ Reviewed by Darin Adler.
+
+ Fix an incorrect include path.
+
+ * loader/DocumentLoader.h:
+ RunLoopTimer.h lives in wtf as of r145592.
+
2013-03-20 Kent Tamura <tkent@chromium.org>
Crash in Document::setFocusedNode if the frame of new focused node is detached in 'change' event handler
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
index c80930d..92d7117 100644
--- a/Source/WebCore/loader/DocumentLoader.h
+++ b/Source/WebCore/loader/DocumentLoader.h
@@ -46,7 +46,7 @@
#include <wtf/Vector.h>
#if HAVE(RUNLOOP_TIMER)
-#include "RunLoopTimer.h"
+#include <wtf/RunLoopTimer.h>
#endif
namespace WTF {
