diff options
| author | Alec Mouri <alecmouri@google.com> | 2019-10-25 16:18:16 -0700 |
|---|---|---|
| committer | Alec Mouri <alecmouri@google.com> | 2019-10-25 16:18:16 -0700 |
| commit | da819e47f14657c6eddf4905da99b92743aaa2c0 (patch) | |
| tree | 991cbe6de0c62e8e6292d53ab7ba45e79151f9f9 | |
| parent | 8018eeace2a71c598e8da678845f960314acceea (diff) | |
[HWUI] Use ANativeWindow_get{Height, Width}
gui/Surface will eventually be removed since HWUI needs to depend on a
stable ABI, so use the NDK methods for querying width and height that
operates on ANativeWindow instead.
Bug: 137012798
Test: builds
Change-Id: I1309e31992190e7b44c6ea83f962f372b6b0afcf
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/SkiaDisplayListTests.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 93fd0c87a361..294a6b8baceb 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -565,8 +565,8 @@ SkISize CanvasContext::getNextFrameSize() const { ReliableSurface* surface = mNativeSurface.get(); if (surface) { SkISize size; - surface->query(NATIVE_WINDOW_WIDTH, &size.fWidth); - surface->query(NATIVE_WINDOW_HEIGHT, &size.fHeight); + size.fWidth = ANativeWindow_getWidth(surface); + size.fHeight = ANativeWindow_getHeight(surface); return size; } return {INT32_MAX, INT32_MAX}; diff --git a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp index 6fb164a99ae4..7d999c43b560 100644 --- a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp +++ b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp @@ -208,9 +208,8 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaDisplayList, prepareListAndChildren_vdOffscr test::TestContext testContext; testContext.setRenderOffscreen(true); auto surface = testContext.surface(); - int width, height; - surface->query(NATIVE_WINDOW_WIDTH, &width); - surface->query(NATIVE_WINDOW_HEIGHT, &height); + int width = ANativeWindow_getWidth(surface.get()); + int height = ANativeWindow_getHeight(surface.get()); canvasContext->setSurface(std::move(surface)); TreeInfo info(TreeInfo::MODE_FULL, *canvasContext.get()); |