Title: [205616] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 205616
- Author
- [email protected]
- Date
- 2016-09-08 03:15:14 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205286 - URTBF after r205161 to fix !ENABLE(WEB_TIMING) build.
* bindings/js/JSPerformanceTimingCustom.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205615 => 205616)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 10:13:54 UTC (rev 205615)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 10:15:14 UTC (rev 205616)
@@ -1,3 +1,9 @@
+2016-09-01 Csaba Osztrogonác <[email protected]>
+
+ URTBF after r205161 to fix !ENABLE(WEB_TIMING) build.
+
+ * bindings/js/JSPerformanceTimingCustom.cpp:
+
2016-09-01 Myles C. Maxfield <[email protected]>
Clean up TextRun-related code
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSPerformanceTimingCustom.cpp (205615 => 205616)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSPerformanceTimingCustom.cpp 2016-09-08 10:13:54 UTC (rev 205615)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/JSPerformanceTimingCustom.cpp 2016-09-08 10:15:14 UTC (rev 205616)
@@ -26,6 +26,8 @@
#include "config.h"
#include "JSPerformanceTiming.h"
+#if ENABLE(WEB_TIMING)
+
#include "DOMWrapperWorld.h"
#include <runtime/IdentifierInlines.h>
#include <runtime/JSObject.h>
@@ -68,3 +70,5 @@
}
}
+
+#endif // ENABLE(WEB_TIMING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
