Remove Surface::flush() and use Context::flush() instead. (#2525)

DEPS

@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "6bf0581bd6c2b9794a52abffa35e782ee82bfcd0",
+        "commit": "9d6b7464dd22e3a0aa9aa22e0a789cbfed1fed73",
         "dir": "third_party/tgfx"
       },
       {

src/platform/ohos/JPAGImageView.cpp

@@ -811,8 +811,7 @@ bool JPAGImageView::present(std::shared_ptr<tgfx::Image> image) {
   tgfx::Matrix imageMatrix = tgfx::Matrix::MakeScale(1.0 / _renderScale);
   imageMatrix.postConcat(_matrix);
   canvas->drawImage(image, imageMatrix);
-  surface->flush();
-  context->submit();
+  context->flushAndSubmit();
   targetWindow->present(context);
   context->purgeResourcesNotUsedSince(std::chrono::steady_clock::now());
   device->unlock();

src/rendering/PAGSurface.cpp

@@ -85,7 +85,7 @@ bool PAGSurface::clearAll() {
   contentVersion = 0;  // 清空画布后 contentVersion 还原为初始值 0.
   auto canvas = surface->getCanvas();
   canvas->clear();
-  surface->flush();
+  context->flush();
   drawable->setTimeStamp(0);
   drawable->present(context);
   unlockContext();
@@ -218,10 +218,10 @@ bool PAGSurface::draw(RenderCache* cache, std::shared_ptr<Graphic> graphic,
   }
   onDraw(graphic, surface, cache);
   if (signalSemaphore == nullptr) {
-    surface->flush();
+    context->flush();
   } else {
     tgfx::BackendSemaphore semaphore = {};
-    surface->flush(&semaphore);
+    context->flush(&semaphore);
     signalSemaphore->initGL(semaphore.glSync());
   }
   cache->detachFromContext();

src/rendering/filters/DisplacementMapFilter.cpp

@@ -147,7 +147,7 @@ void DisplacementMapFilter::updateMapTexture(RenderCache* cache, const Graphic*
   if (displacementMapBehavior == DisplacementMapBehavior::TileMap) {
     canvas.restore();
   }
-  mapSurface->flush();
+  cache->getContext()->flush();
 }
 
 struct SelectorCoeffs {

src/rendering/filters/GradientOverlayFilter.cpp

@@ -95,6 +95,6 @@ void GradientOverlayFilter::draw(tgfx::Context* context, const FilterSource* sou
   auto rect = tgfx::Rect::MakeWH(width, height);
   targetCanvas->drawRect(rect, paint);
   targetCanvas->restore();
-  targetSurface->flush();
+  context->flush();
 }
 }  // namespace pag

src/rendering/filters/gaussianblur/GaussianBlurFilter.cpp

@@ -68,6 +68,6 @@ void GaussianBlurFilter::draw(tgfx::Context* context, const FilterSource* source
   targetCanvas->setMatrix(ToMatrix(target));
   targetCanvas->drawImage(std::move(image), offset.x, offset.y);
   targetCanvas->restore();
-  targetSurface->flush();
+  context->flush();
 }
 }  // namespace pag

src/rendering/filters/layerstyle/DropShadowFilter.cpp

@@ -132,7 +132,7 @@ void DropShadowFilter::onDrawModeNotSpread(tgfx::Context* context, const FilterS
       blurYSize * source->scale.y, color));
   paint.setAlpha(opacity);
   targetCanvas->drawImage(std::move(image), &paint);
-  targetSurface->flush();
+  context->flush();
 }
 
 void DropShadowFilter::onDrawModeNotFullSpread(tgfx::Context* context, const FilterSource* source,
@@ -175,7 +175,7 @@ void DropShadowFilter::onDrawModeNotFullSpread(tgfx::Context* context, const Fil
       blurYSize * source->scale.y, color));
   paint.setAlpha(opacity);
   targetCanvas->drawImage(std::move(image), &paint);
-  targetSurface->flush();
+  context->flush();
 }
 
 void DropShadowFilter::onDrawModeFullSpread(tgfx::Context* context, const FilterSource* source,

src/rendering/filters/layerstyle/OuterGlowFilter.cpp

@@ -126,7 +126,7 @@ void OuterGlowFilter::onDrawModeNotSpread(tgfx::Context* context, const FilterSo
       blurYSize * source->scale.y, color));
   paint.setAlpha(opacity);
   targetCanvas->drawImage(std::move(image), &paint);
-  targetSurface->flush();
+  context->flush();
 }
 
 void OuterGlowFilter::onDrawModeNotFullSpread(tgfx::Context* context, const FilterSource* source,
@@ -169,7 +169,7 @@ void OuterGlowFilter::onDrawModeNotFullSpread(tgfx::Context* context, const Filt
       blurYSize * source->scale.y, color));
   paint.setAlpha(opacity);
   targetCanvas->drawImage(std::move(image), &paint);
-  targetSurface->flush();
+  context->flush();
 }
 
 void OuterGlowFilter::onDrawModeFullSpread(tgfx::Context* context, const FilterSource* source,

src/rendering/renderers/FilterRenderer.cpp

@@ -467,10 +467,9 @@ void FilterRenderer::DrawWithFilter(Canvas* parentCanvas, const FilterModifier*
                                             filterSource->scale);
   }
 
-  // 必须要flush，要不然framebuffer还没真正画到canvas，就被其他图层的filter串改了该framebuffer
-  auto parentSurface = parentCanvas->getSurface();
-  parentSurface->flush();
   auto context = parentCanvas->getContext();
+  // 必须要flush，要不然framebuffer还没真正画到canvas，就被其他图层的filter串改了该framebuffer
+  context->flush();
   ApplyFilters(context, filterNodes, contentBounds, filterSource.get(), filterTarget.get());
   // Reset the GL states stored in the context, they may be modified during the filter being applied.
   context->resetState();