diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/gfx/geometry | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gfx/geometry')
-rw-r--r-- | chromium/ui/gfx/geometry/matrix3_f.h | 2 | ||||
-rw-r--r-- | chromium/ui/gfx/geometry/mojom/geometry.mojom | 9 | ||||
-rw-r--r-- | chromium/ui/gfx/geometry/quad_f.h | 2 | ||||
-rw-r--r-- | chromium/ui/gfx/geometry/rect.h | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/chromium/ui/gfx/geometry/matrix3_f.h b/chromium/ui/gfx/geometry/matrix3_f.h index fea4852cf74..0b5cc128466 100644 --- a/chromium/ui/gfx/geometry/matrix3_f.h +++ b/chromium/ui/gfx/geometry/matrix3_f.h @@ -5,7 +5,7 @@ #ifndef UI_GFX_GEOMETRY_MATRIX3_F_H_ #define UI_GFX_GEOMETRY_MATRIX3_F_H_ -#include "base/logging.h" +#include "base/check.h" #include "ui/gfx/geometry/vector3d_f.h" namespace gfx { diff --git a/chromium/ui/gfx/geometry/mojom/geometry.mojom b/chromium/ui/gfx/geometry/mojom/geometry.mojom index 78d28f07773..82218aef7f6 100644 --- a/chromium/ui/gfx/geometry/mojom/geometry.mojom +++ b/chromium/ui/gfx/geometry/mojom/geometry.mojom @@ -4,18 +4,13 @@ module gfx.mojom; -// Don't make backwards-incompatible changes to this definition! -// It's used in PageState serialization, so backwards incompatible changes -// would cause stored PageState objects to be un-parseable. +[Stable] struct Point { int32 x; int32 y; }; -// Don't make backwards-incompatible changes to this definition! -// It's used in PageState serialization, so backwards incompatible changes -// would cause stored PageState objects to be un-parseable. Please contact the -// page state serialization owners before making such a change. +[Stable] struct PointF { float x; float y; diff --git a/chromium/ui/gfx/geometry/quad_f.h b/chromium/ui/gfx/geometry/quad_f.h index 00ade0e3749..3fe8cf10d5d 100644 --- a/chromium/ui/gfx/geometry/quad_f.h +++ b/chromium/ui/gfx/geometry/quad_f.h @@ -12,7 +12,7 @@ #include <iosfwd> #include <string> -#include "base/logging.h" +#include "base/check_op.h" #include "ui/gfx/geometry/geometry_export.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect_f.h" diff --git a/chromium/ui/gfx/geometry/rect.h b/chromium/ui/gfx/geometry/rect.h index 7fa7045f6f4..3ec89df0d47 100644 --- a/chromium/ui/gfx/geometry/rect.h +++ b/chromium/ui/gfx/geometry/rect.h @@ -16,7 +16,7 @@ #include <iosfwd> #include <string> -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/safe_integer_conversions.h" |