Skip to content

Commit f41bb66

Browse files
committed
Fix build with MSVC 2019
Fixes: QTBUG-96037 Change-Id: Icb86f20e2ecd854e0f710df1e53042b7f17cdf16 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
1 parent 0fd1fa1 commit f41bb66

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

chromium/base/trace_event/trace_arguments.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "base/base_export.h"
1717
#include "base/trace_event/common/trace_event_common.h"
1818
#include "base/tracing_buildflags.h"
19+
#include "build/build_config.h" // COMPILER_MSVC
1920
#include "third_party/perfetto/include/perfetto/protozero/scattered_heap_buffer.h"
2021
#include "third_party/perfetto/include/perfetto/tracing/traced_value.h"
2122
#include "third_party/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.h"

chromium/content/renderer/pepper/pepper_plugin_instance_impl.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ class PluginObject;
113113
class PPB_Graphics3D_Impl;
114114
class RenderFrameImpl;
115115

116+
// Windows defines 'PostMessage', so we have to undef it.
117+
#ifdef PostMessage
118+
#undef PostMessage
119+
#endif
120+
116121
// Represents one time a plugin appears on one web page.
117122
//
118123
// Note: to get from a PP_Instance to a PepperPluginInstance*, use the

chromium/services/network/network_usage_accumulator.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
namespace network {
88

9-
struct NetworkUsageAccumulator::NetworkUsageParam {
10-
int64_t total_bytes_received = 0;
11-
int64_t total_bytes_sent = 0;
12-
};
13-
149
NetworkUsageAccumulator::NetworkUsageAccumulator() = default;
1510

1611
NetworkUsageAccumulator::~NetworkUsageAccumulator() = default;

chromium/services/network/network_usage_accumulator.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkUsageAccumulator
3636
std::vector<mojom::NetworkUsagePtr> GetTotalNetworkUsages() const;
3737

3838
private:
39-
struct NetworkUsageParam;
39+
struct NetworkUsageParam {
40+
int64_t total_bytes_received = 0;
41+
int64_t total_bytes_sent = 0;
42+
};
4043

4144
// Number of active processes is usually small, but could go as high as
4245
// |PhysicalMemoryMB / 80|.

0 commit comments

Comments
 (0)