update: migrate demo_skia to M120

Author: keyou

README.md

@@ -50,7 +50,7 @@ Demo list:
 1. [M120] `demo_views`: Demonstrate the use of `//ui/views` to create UI;
 1. `demo_apk`: Demonstrate the creation of Android applications, the use of base::android::* and JNI;
 1. `demo_android_skia`: Demonstrate the use of Skia for software rendering and hardware rendering on Android;
-1. [M110] `demo_skia`: Demonstrate the use of Skia for software rendering and hardware rendering on Linux;
+1. [M120] `demo_skia`: Demonstrate the use of Skia for software rendering and hardware rendering on Linux;
 1. `demo_x11`: Demonstrate using X11 to create transparent windows;
 1. `demo_x11_glx`: Demonstrate the use of glx in a transparent window;
 1. `demo_x11_egl`: Demonstrate the use of egl in a transparent window;

README_zh.md

@@ -43,7 +43,7 @@ Demo 列表：
 1. [M120] `demo_views`: 演示使用 `//ui/views` 创建 UI；
 1. `demo_apk`: 演示创建 Android 应用，base::android::* 和 JNI 的使用；
 1. `demo_android_skia`: 演示在 Android 上使用 Skia 进行软件渲染和硬件渲染；
-1. [M110] `demo_skia`: 演示在 Linux 上使用 Skia 进行软件渲染和硬件渲染；
+1. [M120] `demo_skia`: 演示在 Linux 上使用 Skia 进行软件渲染和硬件渲染；
 1. `demo_x11`: 演示使用 X11 创建透明窗口；
 1. `demo_x11_glx`: 演示在透明窗口中使用 glx;
 1. `demo_x11_egl`: 演示在透明窗口中使用 egl；

demo_skia/demo_skia.cc

@@ -1,54 +1,20 @@
 #include "base/at_exit.h"
-#include "base/callback.h"
 #include "base/command_line.h"
-#include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_type.h"
-#include "base/path_service.h"
-#include "base/power_monitor/power_monitor.h"
-#include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "base/task/single_thread_task_executor.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
-#include "base/test/task_environment.h"
-#include "base/test/test_discardable_memory_allocator.h"
-#include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
-#include "build/build_config.h"
-#include "build/buildflag.h"
-#include "components/viz/common/quads/solid_color_draw_quad.h"
-#include "components/viz/demo/host/demo_host.h"
-#include "components/viz/demo/service/demo_service.h"
-#include "components/viz/host/host_frame_sink_manager.h"
-#include "components/viz/host/renderer_settings_creation.h"
-#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
-#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
-#include "components/viz/service/main/viz_compositor_thread_runner_impl.h"
-#include "mojo/core/embedder/embedder.h"
-#include "mojo/core/embedder/scoped_ipc_support.h"
-#include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "mojo/public/cpp/bindings/pending_remote.h"
-#include "services/viz/privileged/mojom/viz_main.mojom.h"
-#include "ui/base/hit_test.h"
-#include "ui/base/ime/init/input_method_initializer.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/base/x/visual_picker_glx.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
-#include "ui/events/event_constants.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/font_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/skia_util.h"
-#include "ui/gfx/x/xproto.h"
-#include "ui/gl/gl_switches.h"
-#include "ui/gl/init/gl_factory.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/platform_window/platform_window_init_properties.h"
@@ -58,7 +24,6 @@
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
-#include "ui/wm/core/wm_state.h"
 #endif
 
 #if defined(USE_X11)
@@ -87,7 +52,7 @@ namespace demo {
 // compositor.
 class DemoWindowHost : public ui::PlatformWindowDelegate {
  public:
-  DemoWindowHost(base::OnceClosure close_closure)
+  explicit DemoWindowHost(base::OnceClosure close_closure)
       : close_closure_(std::move(close_closure)) {}
   ~DemoWindowHost() override = default;
 
@@ -201,7 +166,7 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
         action = 2;
       else
         return;
-      auto located_event = event->AsLocatedEvent();
+      auto* located_event = event->AsLocatedEvent();
       auto location = located_event->location();
       if (action != 2)
         DLOG(INFO) << "action,x,y= " << action << "," << location.x() << ","
@@ -241,11 +206,7 @@ int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
   // 设置日志格式
   logging::SetLogItems(true, true, true, false);
-  // 启动 Trace
-  auto trace_config =
-      base::trace_event::TraceConfig("startup" /*, "trace-to-console"*/);
-  base::trace_event::TraceLog::GetInstance()->SetEnabled(
-      trace_config, base::trace_event::TraceLog::RECORDING_MODE);
+
   // 创建主消息循环，等价于 MessagLoop
   base::SingleThreadTaskExecutor main_task_executor(base::MessagePumpType::UI);
   // 初始化线程池，会创建新的线程，在新的线程中会创建新消息循环MessageLoop

demo_skia/skia_canvas.cc

@@ -1,16 +1,12 @@
 
 #include "demo/demo_skia/skia_canvas.h"
 
-#include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "base/lazy_instance.h"
+#include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/common/trace_event_common.h"
-#include "base/trace_event/trace_event.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/trace_event/trace_log.h"
-#include "demo/demo_skia/skia_canvas_gl.h"
 
 namespace demo_jni {
 
@@ -64,16 +60,6 @@ void FlushTrace() {
       }));
 }
 
-// static int SkiaCanvasInit(
-//     bool useGL) {
-//   DLOG(INFO) << "[demo_android_skia] JNI_SkiaCanvas_Init";
-//   if (!g_message_loop) {
-//     DemoMain();
-//   }
-//   if (useGL)
-//     return reinterpret_cast<intptr_t>(new SkiaCanvasGL(env, caller, surface));
-// }
-
 SkiaCanvas::SkiaCanvas(gfx::AcceleratedWidget widget,int width,int height)
     : nativeWindow_(widget),
       width_(width),
@@ -97,6 +83,8 @@ SkiaCanvas::SkiaCanvas(gfx::AcceleratedWidget widget,int width,int height)
                                 base::Unretained(this)));
 }
 
+SkiaCanvas::~SkiaCanvas() = default;
+
 void SkiaCanvas::InitializeOnRenderThread() {}
 
 // Android 系统会控制触摸事件的频率在 60 pps
@@ -175,7 +163,7 @@ void SkiaCanvas::OnRenderOnRenderThread() {
     TRACE_EVENT0("shell", "paint");
     auto paint_start_time = base::TimeTicks::Now();
     TRACE_EVENT0("shell", "BeginPaint");
-    auto canvas = BeginPaint();
+    auto* canvas = BeginPaint();
     TRACE_EVENT0("shell", "draw");
     canvas->clear(background_);
     canvas->drawPath(skPath_, pathPaint_);
@@ -208,7 +196,7 @@ void SkiaCanvas::ShowFrameRateOnRenderThread() {
      << " swap= " << (total_swap_time_ / frame_count_).InMilliseconds() << " ms"
      << " touch= " << (total_touch_time_ / touch_count_).InMilliseconds()
      << " ms";
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
       base::BindOnce(&SkiaCanvas::ShowInfo, base::Unretained(this), ss.str()));
 }

demo_skia/skia_canvas.h

@@ -2,24 +2,19 @@
 #define DEMO_DEMO_SKIA_SKIA_CANVAS_H
 
 #include "base/threading/thread.h"
-
-#include "ui/gfx/native_widget_types.h"
-
-#include "base/logging.h"
+#include "base/timer/timer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkSurface.h"
-
-#include "base/timer/timer.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace demo_jni {
 
 class SkiaCanvas {
  public:
   void OnTouch(int action, float x, float y);
-  virtual ~SkiaCanvas() {}
+  virtual ~SkiaCanvas();
   virtual void Resize(int width, int height) {}
 
  protected:

demo_skia/skia_canvas_gl.cc

@@ -1,23 +1,19 @@
 
 #include "demo/demo_skia/skia_canvas_gl.h"
 
-#include "base/bind.h"
-#include "base/lazy_instance.h"
+#include "base/logging.h"
 #include "base/trace_event/trace_event.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkDeferredDisplayListRecorder.h"
 #include "third_party/skia/include/core/SkExecutor.h"
-#include "third_party/skia/include/core/SkImageInfo.h"
-#include "third_party/skia/include/core/SkPath.h"
-#include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/core/SkSurfaceCharacterization.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
-#include "ui/gl/gl_version_info.h"
-#include "ui/gl/init/create_gr_gl_interface.h"
+#include "third_party/skia/include/gpu/mock/GrMockTypes.h"
+#include "third_party/skia/include/private/chromium/GrDeferredDisplayList.h"
+#include "third_party/skia/include/private/chromium/GrSurfaceCharacterization.h"
 
 #ifndef GL_RGBA8
 #define GL_RGBA8 0x8058
@@ -446,7 +442,7 @@ void SkiaCanvasGL::InitializeOnRenderThread() {
   DCHECK(grGLInterface_);
 
   grContext_ =
-      GrDirectContext::MakeGL(grGLInterface_, CreateGrContextOptions());
+      GrDirectContexts::MakeGL(grGLInterface_, CreateGrContextOptions());
   DCHECK(grContext_);
   SkiaCanvas::InitializeOnRenderThread();
 }
@@ -482,22 +478,23 @@ SkCanvas* SkiaCanvasGL::BeginPaint() {
   fb_info.fFBOID = buffer;
   fb_info.fFormat = color_format_ /*GL_RGBA8*/;
 
-  GrBackendRenderTarget backendRT(width_, height_, sampleCount_, stencilBits_,
-                                  fb_info);
+  GrMockRenderTargetInfo m;
+  GrBackendRenderTarget backendRT = GrBackendRenderTargets::MakeGL(
+      width_, height_, sampleCount_, stencilBits_, fb_info);
   SkSurfaceProps props(SkSurfaceProps::kUseDistanceFieldFonts_Flag,
                        SkPixelGeometry::kRGB_H_SkPixelGeometry);
-  skSurface_ = SkSurface::MakeFromBackendRenderTarget(
+  skSurface_ = SkSurfaces::WrapBackendRenderTarget(
       grContext_.get(), backendRT, kBottomLeft_GrSurfaceOrigin,
       color_format_ == GL_RGBA8 ? kRGBA_8888_SkColorType : kRGB_565_SkColorType,
       nullptr, &props);
   SkCanvas* canvas;
   if (use_ddl_) {
-    SkSurfaceCharacterization characterization;
+    GrSurfaceCharacterization characterization;
     bool result = skSurface_->characterize(&characterization);
     DCHECK(result) << "Failed to characterize raster SkSurface.";
     // 使用 ddl 来记录绘制操作，并不执行真正的绘制
     recorder_ =
-        std::make_unique<SkDeferredDisplayListRecorder>(characterization);
+        std::make_unique<GrDeferredDisplayListRecorder>(characterization);
 
     canvas = recorder_->getCanvas();
   }
@@ -509,10 +506,10 @@ void SkiaCanvasGL::OnPaint(SkCanvas* canvas) {
   if (use_ddl_) {
     // 必须在list销毁前flush
     auto list = recorder_->detach();
-    DCHECK(skSurface_->draw(list));
-    skSurface_->flush();
-  } else
-    skSurface_->flush();
+    DCHECK(skgpu::ganesh::DrawDDL(skSurface_, list));
+  }
+  grContext_->flushAndSubmit();
+  // glFinish();
 }
 
 void SkiaCanvasGL::SwapBuffer() {

demo_skia/skia_canvas_gl.h

@@ -14,11 +14,11 @@
 
 #include "demo/demo_skia/skia_canvas.h"
 
-#include "third_party/skia/include/core/SkDeferredDisplayListRecorder.h"
+// #include "third_party/skia/include/core/SkDeferredDisplayListRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/gpu/GrContextOptions.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
+#include "third_party/skia/include/private/chromium/GrDeferredDisplayListRecorder.h"
 
 namespace demo_jni {
 
@@ -44,7 +44,7 @@ class SkiaCanvasGL : public SkiaCanvas {
   sk_sp<const GrGLInterface> grGLInterface_;
   sk_sp<GrDirectContext> grContext_;
   bool use_ddl_ = false;
-  std::unique_ptr<SkDeferredDisplayListRecorder> recorder_;
+  std::unique_ptr<GrDeferredDisplayListRecorder> recorder_;
 };
 
 } // namespace demo_jni

demo_skia/skia_canvas_software.cc

@@ -1,8 +1,6 @@
 
 #include "demo/demo_skia/skia_canvas_software.h"
 
-#include "base/bind.h"
-#include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/x/connection.h"
 
@@ -14,6 +12,8 @@ SkiaCanvasSoftware::SkiaCanvasSoftware(gfx::AcceleratedWidget widget,int width,i
   tag_ = "SkiaCanvasSoftware";
 }
 
+SkiaCanvasSoftware::~SkiaCanvasSoftware() = default;
+
 void SkiaCanvasSoftware::InitializeOnRenderThread() {
   TRACE_EVENT0("shell", "SkiaCanvasSoftware::InitializeOnRenderThread");
   x11_presenter_ = std::make_unique<ui::X11SoftwareBitmapPresenter>(
@@ -22,7 +22,7 @@ void SkiaCanvasSoftware::InitializeOnRenderThread() {
   // 当 format = AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM = 4
   // 时，一个像素占2个字节，所以x2
   // memset(buffer.bits, 0xAA, buffer.stride * buffer.height * 2);
-  auto canvas = BeginPaint();
+  auto* canvas = BeginPaint();
   canvas->clear(background_);
   //canvas->drawCircle(20, 20, 20, circlePaint_);
   OnPaint(canvas);

demo_skia/skia_canvas_software.h

@@ -10,6 +10,7 @@ namespace demo_jni {
 class SkiaCanvasSoftware : public SkiaCanvas {
  public:
   SkiaCanvasSoftware(gfx::AcceleratedWidget widget,int width,int height);
+  ~SkiaCanvasSoftware() override;
   void InitializeOnRenderThread() override;
   void Resize(int width, int height) override;
   void OnPaint(SkCanvas* canvas) override;