aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h')
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
index 0c30711ac49d..d8e874b85037 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-03-17 10:18:29 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-11-13 06:36:47 UTC
+++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h
@@ -12,7 +12,7 @@
#include "third_party/blink/renderer/controller/controller_export.h"
#include "third_party/blink/renderer/controller/memory_usage_monitor.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h"
#endif
@@ -13,8 +13,8 @@
// MemoryUsageMonitor implementation for Android and Linux.
class CONTROLLER_EXPORT MemoryUsageMonitorPosix
: public MemoryUsageMonitor
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
,
public mojom::blink::MemoryUsageMonitorLinux
#endif
@@ -22,8 +22,8 @@
public:
MemoryUsageMonitorPosix() = default;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
static void Bind(
mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver);
#endif
@@ -31,8 +31,8 @@
uint64_t* vm_size,
uint64_t* vm_hwm_size);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// mojom::MemoryUsageMonitorLinux implementations:
void SetProcFiles(base::File statm_file, base::File status_file) override;
#endif
@@ -40,8 +40,8 @@
base::ScopedFD statm_fd_;
base::ScopedFD status_fd_;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this};
#endif
};