Title: [175108] branches/safari-600.3-branch/Source/WebCore
- Revision
- 175108
- Author
- [email protected]
- Date
- 2014-10-23 02:25:54 -0700 (Thu, 23 Oct 2014)
Log Message
Merged r172964. rdar://problem/18428706
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175107 => 175108)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-23 09:24:51 UTC (rev 175107)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-23 09:25:54 UTC (rev 175108)
@@ -1,5 +1,15 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge r172964.
+
+ 2014-08-26 Tim Horton <[email protected]>
+
+ Fix the build after r172963
+
+ * page/DOMTimer.h:
+
+2014-10-23 Babak Shafiei <[email protected]>
+
Merge r172963.
2014-08-25 Gavin Barraclough <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h (175107 => 175108)
--- branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h 2014-10-23 09:24:51 UTC (rev 175107)
+++ branches/safari-600.3-branch/Source/WebCore/page/DOMTimer.h 2014-10-23 09:25:54 UTC (rev 175108)
@@ -28,8 +28,8 @@
#define DOMTimer_h
#include "SuspendableTimer.h"
-#include <WTF/RefCounted.h>
#include <memory>
+#include <wtf/RefCounted.h>
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
