Title: [211633] trunk/Source/WebCore
- Revision
- 211633
- Author
- carlo...@webkit.org
- Date
- 2017-02-03 06:21:28 -0800 (Fri, 03 Feb 2017)
Log Message
Unreviewed. Fix the buidl after r211631.
I added the OS(LINUX) ifdef to the wrong file by mistake.
* page/ResourceUsageThread.h:
* page/linux/ResourceUsageThreadLinux.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211632 => 211633)
--- trunk/Source/WebCore/ChangeLog 2017-02-03 13:04:50 UTC (rev 211632)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 14:21:28 UTC (rev 211633)
@@ -1,5 +1,14 @@
2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+ Unreviewed. Fix the buidl after r211631.
+
+ I added the OS(LINUX) ifdef to the wrong file by mistake.
+
+ * page/ResourceUsageThread.h:
+ * page/linux/ResourceUsageThreadLinux.cpp:
+
+2017-02-03 Carlos Garcia Campos <cgar...@igalia.com>
+
[GTK] Add initial implementation of resource usage overlay
https://bugs.webkit.org/show_bug.cgi?id=167731
Modified: trunk/Source/WebCore/page/ResourceUsageThread.h (211632 => 211633)
--- trunk/Source/WebCore/page/ResourceUsageThread.h 2017-02-03 13:04:50 UTC (rev 211632)
+++ trunk/Source/WebCore/page/ResourceUsageThread.h 2017-02-03 14:21:28 UTC (rev 211633)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(RESOURCE_USAGE) && OS(LINUX)
+#if ENABLE(RESOURCE_USAGE)
#include "ResourceUsageData.h"
#include <array>
@@ -87,4 +87,4 @@
} // namespace WebCore
-#endif // ENABLE(RESOURCE_USAGE) && OS(LINUX)
+#endif // ENABLE(RESOURCE_USAGE)
Modified: trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp (211632 => 211633)
--- trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp 2017-02-03 13:04:50 UTC (rev 211632)
+++ trunk/Source/WebCore/page/linux/ResourceUsageThreadLinux.cpp 2017-02-03 14:21:28 UTC (rev 211633)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ResourceUsageThread.h"
-#if ENABLE(RESOURCE_USAGE)
+#if ENABLE(RESOURCE_USAGE) && OS(LINUX)
#include "CurrentProcessMemoryStatus.h"
#include <errno.h>
@@ -168,4 +168,4 @@
} // namespace WebCore
-#endif // ENABLE(RESOURCE_USAGE)
+#endif // ENABLE(RESOURCE_USAGE) && OS(LINUX)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
