summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-29 16:42:23 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-31 10:40:36 +0000
commit5d96bbdec2be60b300f38853560b31937967d663 (patch)
tree44ed534baf4051ed55de2061d23966ea0f0adeb3
parente0d9f51b7c854b9496cfc983f8c72e3cfe38835b (diff)
downloadqtwebengine-chromium-5d96bbdec2be60b300f38853560b31937967d663.tar.gz
Fix include of <algorithm>
Needed when std::min or std::max is used. Change-Id: I3483391bde40884670f04830bebaaf7c209cb1c4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--chromium/media/base/byte_queue.cc2
-rw-r--r--chromium/media/base/feedback_signal_accumulator.h2
-rw-r--r--chromium/pdf/document_layout.cc2
-rw-r--r--chromium/pdf/draw_utils/coordinates.cc2
-rw-r--r--chromium/third_party/blink/public/platform/web_time_range.h2
-rw-r--r--chromium/ui/events/blink/prediction/least_squares_predictor.cc2
-rw-r--r--chromium/ui/events/blink/prediction/linear_predictor.cc4
-rw-r--r--chromium/ui/events/blink/prediction/linear_resampling.cc2
8 files changed, 17 insertions, 1 deletions
diff --git a/chromium/media/base/byte_queue.cc b/chromium/media/base/byte_queue.cc
index 245fafa6685..9e560605c4d 100644
--- a/chromium/media/base/byte_queue.cc
+++ b/chromium/media/base/byte_queue.cc
@@ -7,6 +7,8 @@
#include "base/logging.h"
#include "base/numerics/checked_math.h"
+#include <algorithm>
+
namespace media {
ByteQueue::ByteQueue() : buffer_(new uint8_t[size_]) {}
diff --git a/chromium/media/base/feedback_signal_accumulator.h b/chromium/media/base/feedback_signal_accumulator.h
index 1acc6998615..e75bdbb922c 100644
--- a/chromium/media/base/feedback_signal_accumulator.h
+++ b/chromium/media/base/feedback_signal_accumulator.h
@@ -7,6 +7,8 @@
#include "base/time/time.h"
+#include <algorithm>
+
namespace media {
// Utility class for maintaining an exponentially-decaying average of feedback
diff --git a/chromium/pdf/document_layout.cc b/chromium/pdf/document_layout.cc
index 51064a3496f..c510f4731b4 100644
--- a/chromium/pdf/document_layout.cc
+++ b/chromium/pdf/document_layout.cc
@@ -10,6 +10,8 @@
#include "ppapi/cpp/var.h"
#include "ppapi/cpp/var_dictionary.h"
+#include <algorithm>
+
namespace chrome_pdf {
namespace {
diff --git a/chromium/pdf/draw_utils/coordinates.cc b/chromium/pdf/draw_utils/coordinates.cc
index 49c272f269c..76d6b020411 100644
--- a/chromium/pdf/draw_utils/coordinates.cc
+++ b/chromium/pdf/draw_utils/coordinates.cc
@@ -9,6 +9,8 @@
#include "base/logging.h"
#include "ppapi/cpp/point.h"
+#include <algorithm>
+
namespace chrome_pdf {
namespace draw_utils {
diff --git a/chromium/third_party/blink/public/platform/web_time_range.h b/chromium/third_party/blink/public/platform/web_time_range.h
index 2c17f7c8ce5..95a68d086e5 100644
--- a/chromium/third_party/blink/public/platform/web_time_range.h
+++ b/chromium/third_party/blink/public/platform/web_time_range.h
@@ -33,6 +33,8 @@
#include "third_party/blink/public/platform/web_vector.h"
+#include <algorithm>
+
namespace blink {
class WebTimeRange {
diff --git a/chromium/ui/events/blink/prediction/least_squares_predictor.cc b/chromium/ui/events/blink/prediction/least_squares_predictor.cc
index 9a5a1c364ea..3eeda431a02 100644
--- a/chromium/ui/events/blink/prediction/least_squares_predictor.cc
+++ b/chromium/ui/events/blink/prediction/least_squares_predictor.cc
@@ -5,6 +5,8 @@
#include "ui/events/blink/prediction/least_squares_predictor.h"
#include "ui/events/blink/prediction/predictor_factory.h"
+#include <algorithm>
+
namespace ui {
namespace {
diff --git a/chromium/ui/events/blink/prediction/linear_predictor.cc b/chromium/ui/events/blink/prediction/linear_predictor.cc
index 7e8e514f272..14f46f206f4 100644
--- a/chromium/ui/events/blink/prediction/linear_predictor.cc
+++ b/chromium/ui/events/blink/prediction/linear_predictor.cc
@@ -5,6 +5,8 @@
#include "ui/events/blink/prediction/linear_predictor.h"
#include "ui/events/blink/prediction/predictor_factory.h"
+#include <algorithm>
+
namespace ui {
LinearPredictor::LinearPredictor(EquationOrder order) {
@@ -123,4 +125,4 @@ base::TimeDelta LinearPredictor::TimeInterval() const {
return kTimeInterval;
}
-} // namespace ui \ No newline at end of file
+} // namespace ui
diff --git a/chromium/ui/events/blink/prediction/linear_resampling.cc b/chromium/ui/events/blink/prediction/linear_resampling.cc
index 693cfd1c01d..e20b363755c 100644
--- a/chromium/ui/events/blink/prediction/linear_resampling.cc
+++ b/chromium/ui/events/blink/prediction/linear_resampling.cc
@@ -6,6 +6,8 @@
#include "ui/events/blink/prediction/predictor_factory.h"
+#include <algorithm>
+
namespace ui {
namespace {