Title: [225544] branches/safari-604.5.100-branch/Source/WebCore
- Revision
- 225544
- Author
- [email protected]
- Date
- 2017-12-05 14:03:40 -0800 (Tue, 05 Dec 2017)
Log Message
Cherry-pick r225528. rdar://problem/35839452
Modified Paths
Diff
Modified: branches/safari-604.5.100-branch/Source/WebCore/ChangeLog (225543 => 225544)
--- branches/safari-604.5.100-branch/Source/WebCore/ChangeLog 2017-12-05 22:03:38 UTC (rev 225543)
+++ branches/safari-604.5.100-branch/Source/WebCore/ChangeLog 2017-12-05 22:03:40 UTC (rev 225544)
@@ -1,3 +1,19 @@
+2017-12-05 Jason Marcell <[email protected]>
+
+ Cherry-pick r225528. rdar://problem/35839452
+
+ 2017-12-05 Alex Christensen <[email protected]>
+
+ Fix non-unified build after r225381
+ https://bugs.webkit.org/show_bug.cgi?id=180434
+
+ Reviewed by Keith Miller.
+
+ * loader/ResourceTimingInformation.cpp:
+ FrameLoader.h is included in other files that are combined with this file in unified builds,
+ but we need to merge r225381 to a branch that doesn't use unified builds. This build failure
+ would've come up randomly in the future when we add files, too.
+
2017-12-04 Jason Marcell <[email protected]>
Cherry-pick r225381. rdar://problem/35839452
Modified: branches/safari-604.5.100-branch/Source/WebCore/loader/ResourceTimingInformation.cpp (225543 => 225544)
--- branches/safari-604.5.100-branch/Source/WebCore/loader/ResourceTimingInformation.cpp 2017-12-05 22:03:38 UTC (rev 225543)
+++ branches/safari-604.5.100-branch/Source/WebCore/loader/ResourceTimingInformation.cpp 2017-12-05 22:03:40 UTC (rev 225544)
@@ -32,6 +32,7 @@
#include "DOMWindow.h"
#include "Document.h"
#include "Frame.h"
+#include "FrameLoader.h"
#include "HTMLFrameOwnerElement.h"
#include "LoadTiming.h"
#include "Performance.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes