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/services/shape_detection | |
| 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/services/shape_detection')
3 files changed, 3 insertions, 1 deletions
diff --git a/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java b/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java index 19f96b32d2c..e96cb1ffa9e 100644 --- a/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java +++ b/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java @@ -24,7 +24,7 @@ import org.chromium.skia.mojom.ImageInfo; * Test suite for conversion-to-Frame utils. */ @RunWith(BaseRobolectricTestRunner.class) -@Config(manifest = Config.NONE) +@Config(sdk = 21, manifest = Config.NONE) public class BitmapUtilsTest { private static final int VALID_WIDTH = 1; private static final int VALID_HEIGHT = 1; diff --git a/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h b/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h index 9438277f6eb..809c4b57521 100644 --- a/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h +++ b/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h @@ -12,6 +12,7 @@ #import <Foundation/Foundation.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" namespace shape_detection { diff --git a/chromium/services/shape_detection/detection_utils_win.cc b/chromium/services/shape_detection/detection_utils_win.cc index 2d8c73dc4e6..f865ebb60ca 100644 --- a/chromium/services/shape_detection/detection_utils_win.cc +++ b/chromium/services/shape_detection/detection_utils_win.cc @@ -6,6 +6,7 @@ #include <utility> +#include "base/check_op.h" #include "base/logging.h" #include "base/numerics/checked_math.h" #include "base/win/winrt_storage_util.h" |