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/viz/client | |
| 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/viz/client')
| -rw-r--r-- | chromium/components/viz/client/client_resource_provider.cc | 4 | ||||
| -rw-r--r-- | chromium/components/viz/client/frame_eviction_manager.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chromium/components/viz/client/client_resource_provider.cc b/chromium/components/viz/client/client_resource_provider.cc index 68fa8738572..ee2871b3f49 100644 --- a/chromium/components/viz/client/client_resource_provider.cc +++ b/chromium/components/viz/client/client_resource_provider.cc @@ -375,7 +375,7 @@ ClientResourceProvider::ScopedSkSurface::ScopedSkSurface( SkSurfaceProps surface_props = ComputeSurfaceProps(can_use_lcd_text); // This type is used only for gpu raster, which implies gpu compositing. bool gpu_compositing = true; - surface_ = SkSurface::MakeFromBackendTextureAsRenderTarget( + surface_ = SkSurface::MakeFromBackendTexture( gr_context, backend_texture, kTopLeft_GrSurfaceOrigin, msaa_sample_count, ResourceFormatToClosestSkColorType(gpu_compositing, format), color_space, &surface_props); @@ -383,7 +383,7 @@ ClientResourceProvider::ScopedSkSurface::ScopedSkSurface( ClientResourceProvider::ScopedSkSurface::~ScopedSkSurface() { if (surface_) - surface_->flush(); + surface_->flushAndSubmit(); } SkSurfaceProps ClientResourceProvider::ScopedSkSurface::ComputeSurfaceProps( diff --git a/chromium/components/viz/client/frame_eviction_manager.cc b/chromium/components/viz/client/frame_eviction_manager.cc index 3a5c8cb684d..48056fdc038 100644 --- a/chromium/components/viz/client/frame_eviction_manager.cc +++ b/chromium/components/viz/client/frame_eviction_manager.cc @@ -103,6 +103,7 @@ size_t FrameEvictionManager::GetMaxNumberOfSavedFrames() const { FrameEvictionManager::FrameEvictionManager() : memory_pressure_listener_(new base::MemoryPressureListener( + FROM_HERE, base::BindRepeating(&FrameEvictionManager::OnMemoryPressure, base::Unretained(this)))) { max_number_of_saved_frames_ = |