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/components/query_tiles/android | |
| 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/components/query_tiles/android')
| -rw-r--r-- | chromium/components/query_tiles/android/java/src/org/chromium/components/query_tiles/TestTileProvider.java | 8 | ||||
| -rw-r--r-- | chromium/components/query_tiles/android/tile_provider_bridge.cc | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chromium/components/query_tiles/android/java/src/org/chromium/components/query_tiles/TestTileProvider.java b/chromium/components/query_tiles/android/java/src/org/chromium/components/query_tiles/TestTileProvider.java index be6c51ee0d7..ae598f7e966 100644 --- a/chromium/components/query_tiles/android/java/src/org/chromium/components/query_tiles/TestTileProvider.java +++ b/chromium/components/query_tiles/android/java/src/org/chromium/components/query_tiles/TestTileProvider.java @@ -27,6 +27,14 @@ public class TestTileProvider implements TileProvider { } /** + * Builds and populates a {@link TestTileProvider} around the real provider. Convenient for + * matching purposes. + */ + public TestTileProvider(TileProvider realProvider) { + realProvider.getQueryTiles(tiles -> { mTiles = tiles; }); + } + + /** * Finds a tile by traversing the tree. * @param indices The indices for each child to select as the tree is traversed. * @return The matching {@link QueryTile} node. diff --git a/chromium/components/query_tiles/android/tile_provider_bridge.cc b/chromium/components/query_tiles/android/tile_provider_bridge.cc index e94cbc972c6..63f79b3aa25 100644 --- a/chromium/components/query_tiles/android/tile_provider_bridge.cc +++ b/chromium/components/query_tiles/android/tile_provider_bridge.cc @@ -10,6 +10,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" +#include "base/bind.h" #include "components/query_tiles/android/tile_conversion_bridge.h" #include "components/query_tiles/jni_headers/TileProviderBridge_jni.h" #include "ui/gfx/android/java_bitmap.h" |