MultiDisplayList can contain either a SkiaDisplayList or a CanvasOpBuffer. However DisplayList itself still points to the SkiaDisplayList-only wrapper to avoid any std::variant or std::visit overhead just yet. Also fixes a memory leak in CanvasFrontend from an uninitialized std::optional and a few minor leaks in unit tests. Test: build & hwui_unit passes Fixes: 184680809 Change-Id: Ifa6b723b6456f5d3eeac1201e76f337250103d6f Merged-In: Ifa6b723b6456f5d3eeac1201e76f337250103d6f (cherry picked from commit d34d6cec97c8f1be92f676aeb79c83d57cf8c6ba)
44 lines
1.4 KiB
C++
44 lines
1.4 KiB
C++
/*
|
|
* Copyright (C) 2021 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "renderthread/EglManager.h"
|
|
#include "tests/common/TestContext.h"
|
|
|
|
using namespace android;
|
|
using namespace android::uirenderer;
|
|
using namespace android::uirenderer::renderthread;
|
|
using namespace android::uirenderer::test;
|
|
|
|
TEST(EglManager, doesSurfaceLeak) {
|
|
EglManager eglManager;
|
|
eglManager.initialize();
|
|
|
|
ASSERT_TRUE(eglManager.hasEglContext());
|
|
|
|
auto colorSpace = SkColorSpace::MakeSRGB();
|
|
for (int i = 0; i < 100; i++) {
|
|
TestContext context;
|
|
auto result =
|
|
eglManager.createSurface(context.surface().get(), ColorMode::Default, colorSpace);
|
|
EXPECT_TRUE(result);
|
|
EGLSurface surface = result.unwrap();
|
|
eglManager.destroySurface(surface);
|
|
}
|
|
|
|
eglManager.destroy();
|
|
} |