diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-29 16:42:23 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-21 16:28:34 +0200 |
commit | 6110097a2877b99ef8f9dd8c6056ba2bc2cd7f77 (patch) | |
tree | 46ef9d3cca9b1c0fd18c618a22b5420a8de62fbe | |
parent | 0b705419d259138cdc73d753064b3b239e972fd0 (diff) | |
download | qtwebengine-chromium-6110097a2877b99ef8f9dd8c6056ba2bc2cd7f77.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/components/sessions/core/session_command.cc | 1 | ||||
-rw-r--r-- | chromium/media/base/byte_queue.cc | 2 | ||||
-rw-r--r-- | chromium/media/base/feedback_signal_accumulator.h | 2 | ||||
-rw-r--r-- | chromium/pdf/document_layout.cc | 2 | ||||
-rw-r--r-- | chromium/pdf/draw_utils/coordinates.cc | 3 | ||||
-rw-r--r-- | chromium/third_party/blink/public/platform/web_time_range.h | 2 | ||||
-rw-r--r-- | chromium/third_party/perfetto/include/perfetto/trace_processor/basic_types.h | 1 | ||||
-rw-r--r-- | chromium/third_party/perfetto/src/trace_processor/trace_sorter.h | 1 | ||||
-rw-r--r-- | chromium/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc | 2 | ||||
-rw-r--r-- | chromium/ui/base/prediction/kalman_predictor.cc | 2 | ||||
-rw-r--r-- | chromium/ui/base/prediction/linear_resampling.cc | 2 | ||||
-rw-r--r-- | chromium/ui/events/gestures/physics_based_fling_curve.cc | 3 | ||||
-rw-r--r-- | chromium/ui/gfx/font.cc | 2 | ||||
-rw-r--r-- | chromium/ui/gfx/range/range.h | 1 |
14 files changed, 25 insertions, 1 deletions
diff --git a/chromium/components/sessions/core/session_command.cc b/chromium/components/sessions/core/session_command.cc index 2de11d95439..6c41976dbe9 100644 --- a/chromium/components/sessions/core/session_command.cc +++ b/chromium/components/sessions/core/session_command.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <algorithm> #include <limits> #include "base/pickle.h" diff --git a/chromium/media/base/byte_queue.cc b/chromium/media/base/byte_queue.cc index ed3d67ebca3..99f1ee65048 100644 --- a/chromium/media/base/byte_queue.cc +++ b/chromium/media/base/byte_queue.cc @@ -10,6 +10,8 @@ #include "base/check_op.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 9f5b12c460c..3b8c4c5f728 100644 --- a/chromium/pdf/document_layout.cc +++ b/chromium/pdf/document_layout.cc @@ -12,6 +12,8 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" +#include <algorithm> + namespace chrome_pdf { namespace { diff --git a/chromium/pdf/draw_utils/coordinates.cc b/chromium/pdf/draw_utils/coordinates.cc index 91f6a78a63b..5cc5db778bc 100644 --- a/chromium/pdf/draw_utils/coordinates.cc +++ b/chromium/pdf/draw_utils/coordinates.cc @@ -4,6 +4,7 @@ #include "pdf/draw_utils/coordinates.h" +#include <algorithm> #include <math.h> #include <algorithm> @@ -13,6 +14,8 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_f.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 4b0a59bf330..b99b70e1415 100644 --- a/chromium/third_party/blink/public/platform/web_time_range.h +++ b/chromium/third_party/blink/public/platform/web_time_range.h @@ -35,6 +35,8 @@ #include "third_party/blink/public/platform/web_vector.h" +#include <algorithm> + namespace blink { class WebTimeRange { diff --git a/chromium/third_party/perfetto/include/perfetto/trace_processor/basic_types.h b/chromium/third_party/perfetto/include/perfetto/trace_processor/basic_types.h index 53774e37085..df41ca8d4ae 100644 --- a/chromium/third_party/perfetto/include/perfetto/trace_processor/basic_types.h +++ b/chromium/third_party/perfetto/include/perfetto/trace_processor/basic_types.h @@ -21,6 +21,7 @@ #include <math.h> #include <stdarg.h> #include <stdint.h> +#include <algorithm> #include <functional> #include <string> diff --git a/chromium/third_party/perfetto/src/trace_processor/trace_sorter.h b/chromium/third_party/perfetto/src/trace_processor/trace_sorter.h index 7b3ae38820b..c45f5dc93bc 100644 --- a/chromium/third_party/perfetto/src/trace_processor/trace_sorter.h +++ b/chromium/third_party/perfetto/src/trace_processor/trace_sorter.h @@ -17,6 +17,7 @@ #ifndef SRC_TRACE_PROCESSOR_TRACE_SORTER_H_ #define SRC_TRACE_PROCESSOR_TRACE_SORTER_H_ +#include <algorithm> #include <vector> #include "perfetto/ext/base/circular_queue.h" diff --git a/chromium/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc b/chromium/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc index 1fbb8d5d6ad..889632103a4 100644 --- a/chromium/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc +++ b/chromium/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc @@ -11,6 +11,8 @@ #include "build/chromeos_buildflags.h" #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" +#include <algorithm> + namespace ui { namespace { diff --git a/chromium/ui/base/prediction/kalman_predictor.cc b/chromium/ui/base/prediction/kalman_predictor.cc index 2678cfe640d..34a9eb53b8c 100644 --- a/chromium/ui/base/prediction/kalman_predictor.cc +++ b/chromium/ui/base/prediction/kalman_predictor.cc @@ -10,6 +10,8 @@ #include "base/numerics/math_constants.h" #include "ui/base/ui_base_features.h" +#include <algorithm> + namespace { // Influence of acceleration during each prediction sample diff --git a/chromium/ui/base/prediction/linear_resampling.cc b/chromium/ui/base/prediction/linear_resampling.cc index 92bd5f07b2d..b99a6693901 100644 --- a/chromium/ui/base/prediction/linear_resampling.cc +++ b/chromium/ui/base/prediction/linear_resampling.cc @@ -10,6 +10,8 @@ #include "base/strings/string_number_conversions.h" #include "ui/base/ui_base_features.h" +#include <algorithm> + namespace ui { namespace { diff --git a/chromium/ui/events/gestures/physics_based_fling_curve.cc b/chromium/ui/events/gestures/physics_based_fling_curve.cc index d480d7c4970..cc0370b40a8 100644 --- a/chromium/ui/events/gestures/physics_based_fling_curve.cc +++ b/chromium/ui/events/gestures/physics_based_fling_curve.cc @@ -4,6 +4,7 @@ #include "ui/events/gestures/physics_based_fling_curve.h" +#include <algorithm> #include <cmath> namespace { @@ -159,4 +160,4 @@ PhysicsBasedFlingCurve::CalculateDurationAndConfigureControlPoints( return base::TimeDelta::FromSecondsD(duration); } -} // namespace ui
\ No newline at end of file +} // namespace ui diff --git a/chromium/ui/gfx/font.cc b/chromium/ui/gfx/font.cc index 50a071a20fa..7e02f68f660 100644 --- a/chromium/ui/gfx/font.cc +++ b/chromium/ui/gfx/font.cc @@ -10,6 +10,8 @@ #include "build/build_config.h" #include "ui/gfx/platform_font.h" +#include <algorithm> + namespace gfx { //////////////////////////////////////////////////////////////////////////////// diff --git a/chromium/ui/gfx/range/range.h b/chromium/ui/gfx/range/range.h index b2f6cc44c5c..c0fbf80eda1 100644 --- a/chromium/ui/gfx/range/range.h +++ b/chromium/ui/gfx/range/range.h @@ -8,6 +8,7 @@ #include <stddef.h> #include <stdint.h> +#include <algorithm> #include <limits> #include <ostream> #include <string> |