update: migrate some demos to chromium 110 version

Author: keyou

README.md

@@ -20,25 +20,25 @@ This project is used to demonstrate how to use some basic mechanisms in chromium
 
 Demo list:
 
-1. [v91] `demo_exe`: The simplest demo to demonstrate gn and create your own exe;
-1. [v91] `demo_log`: Demo log library;
-1. [v91] `demo_tracing_console`: Demonstrate using Trace to output to the console;
-1. [v91] `demo_task_thread_pool`: Demonstrate the use of thread pool ThreadPool;
-1. [v91] `demo_task_executor`: Demonstrate using the message loop SingleThreadTaskExecutor;
-1. [v91] `demo_callback`: Demo Bind&Callback related content；
-1. [v91] `demo_mojo_single_process`: Demonstrate the use of the `mojo` library in a single process;
-1. [v91] `demo_mojo_multiple_process`: Demonstrate the use of the `mojo` library in multiple processes;
-1. [v91] `demo_mojo_multiple_process_binding`: Demonstrate using the binding layer of the `mojo` library in multiple processes;
+1. [v110] `demo_exe`: The simplest demo to demonstrate gn and create your own exe;
+1. [v110] `demo_log`: Demo log library;
+1. [v110] `demo_tracing_console`: Demonstrate using Trace to output to the console;
+1. [v110] `demo_task_thread_pool`: Demonstrate the use of thread pool ThreadPool;
+1. [v110] `demo_task_executor`: Demonstrate using the message loop SingleThreadTaskExecutor;
+1. [v110] `demo_callback`: Demo Bind&Callback related content；
+1. [v110] `demo_mojo_single_process`: Demonstrate the use of the `mojo` library in a single process;
+1. [v110] `demo_mojo_multiple_process`: Demonstrate the use of the `mojo` library in multiple processes;
+1. [v110] `demo_mojo_multiple_process_binding`: Demonstrate using the binding layer of the `mojo` library in multiple processes;
 1. [v91] `demo_services`: Demonstrate the use of servcies and multi-process architecture based on `mojo`;
-1. [v91] `demo_ipc`: Demonstrate the use of IPC interface based on `mojo`;
+1. [v110] `demo_ipc`: Demonstrate the use of IPC interface based on `mojo`;
 1. [v91] `demo_mojo_v8`: Demonstrate the use of js to access the mojo interface;
-1. [v91] `demo_memory`: Demonstrate the use of SharedMemory;
-1. [v91] `demo_tracing_perfetto`: Demonstrate the output of Trace as Json format (used to interface with perfetto);
-1. [v91] `demo_tracing_perfetto_content`: Demonstrate how the content module is connected to perfetto;
-1. [v91] `demo_resources`: Demo resources related content, including grit, l10n, pak, etc.;
-1. [v91] `demo_gl`: Demonstrate using `//ui/gl` for GPU rendering;
+1. [v110] `demo_memory`: Demonstrate the use of SharedMemory;
+1. [v110] `demo_tracing_perfetto`: Demonstrate the output of Trace as Json format (used to interface with perfetto);
+1. [v110] `demo_tracing_perfetto_content`: Demonstrate how the content module is connected to perfetto;
+1. [v110] `demo_resources`: Demo resources related content, including grit, l10n, pak, etc.;
+1. [v110] `demo_gl`: Demonstrate using `//ui/gl` for GPU rendering;
 1. `demo_viz_gui`: Demonstrate using `viz` to display the GUI interface;
-1. [v91] `demo_viz_offscreen`: Demonstrate using `viz` for off-screen rendering;
+1. [v110] `demo_viz_offscreen`: Demonstrate using `viz` for off-screen rendering;
 1. `demo_viz_gui_gpu`: Demonstrate the use of `viz` for hardware accelerated rendering;
 1. `demo_viz_layer`: Demonstrate the use of `viz` for interactive rendering;
 1. `demo_viz_layer_offscreen`, demonstrate using VIZ's `CopyOutput` interface for off-screen rendering;
@@ -101,6 +101,10 @@ Public documents are in the [docs](./docs) directory, and other documents are in
 
 ## Changelog
 
+### 2022.12.4
+
+- Migrate some demo to v110;
+
 ### 2022.4.27
 
 - Add demo_gin，demonstrate how to use gin to create a javascript runtime;

README_zh.md

@@ -13,25 +13,25 @@
 
 Demo 列表：
 
-1. [v91] `demo_exe`: 最简单的 demo，演示 gn 及创建自己的 exe；
-1. [v91] `demo_log`: 演示使用日志库；
-1. [v91] `demo_tracing_console`: 演示使用 Trace 输出到控制台；
-1. [v91] `demo_task_thread_pool`: 演示使用线程池 ThreadPool 位于demo_task下;
-1. [v91] `demo_task_executor`: 演示使用消息循环 SingleThreadTaskExecutor 位于demo_task下;
-1. [v91] `demo_callback`: 演示 Bind&Callback 相关内容；
-1. [v91] `demo_mojo_single_process`: 演示在单进程中使用 `mojo` 库；
-1. [v91] `demo_mojo_multiple_process`: 演示在多进程中使用 `mojo` 库；
-1. [v91] `demo_mojo_multiple_process_binding`: 演示在多进程中使用 `mojo` 库的 binding 层；
+1. [v110] `demo_exe`: 最简单的 demo，演示 gn 及创建自己的 exe；
+1. [v110] `demo_log`: 演示使用日志库；
+1. [v110] `demo_tracing_console`: 演示使用 Trace 输出到控制台；
+1. [v110] `demo_task_thread_pool`: 演示使用线程池 ThreadPool 位于demo_task下;
+1. [v110] `demo_task_executor`: 演示使用消息循环 SingleThreadTaskExecutor 位于demo_task下;
+1. [v110] `demo_callback_(once|repeating)`: 演示 Bind&Callback 相关内容；
+1. [v110] `demo_mojo_single_process`: 演示在单进程中使用 `mojo` 库；
+1. [v110] `demo_mojo_multiple_process`: 演示在多进程中使用 `mojo` 库；
+1. [v110] `demo_mojo_multiple_process_binding`: 演示在多进程中使用 `mojo` 库的 binding 层；
 1. [v91] `demo_services`: 演示使用基于 `mojo` 的 servcies 及多进程架构；
-1. [v91] `demo_ipc`: 演示使用基于 `mojo` 的 IPC 接口；
+1. [v110] `demo_ipc`: 演示使用基于 `mojo` 的 IPC 接口；
 1. [v91] `demo_mojo_v8`: 演示使用 js 访问 mojo 接口；
-1. [v91] `demo_memory`: 演示使用 SharedMemory；
-1. [v91] `demo_tracing_perfetto`: 演示将 Trace 输出为 Json 格式（用来对接 perfetto）；
-1. [v91] `demo_tracing_perfetto_content`: 演示 content 模块是如何对接 perfetto 的；
-1. [v91] `demo_resources`: 演示 resources 相关内容，包括 grit，l10n，pak 等；
-1. [v91] `demo_gl`: 演示使用 `//ui/gl` 进行 GPU 渲染；
+1. [v110] `demo_memory`: 演示使用 SharedMemory；
+1. [v110] `demo_tracing_perfetto`: 演示将 Trace 输出为 Json 格式（用来对接 perfetto）；
+1. [v110] `demo_tracing_perfetto_content`: 演示 content 模块是如何对接 perfetto 的；
+1. [v110] `demo_resources`: 演示 resources 相关内容，包括 grit，l10n，pak 等；
+1. [v110] `demo_gl`: 演示使用 `//ui/gl` 进行 GPU 渲染；
 1. `demo_viz_gui`: 演示使用 `viz` 显示 GUI 界面；
-1. [v91] `demo_viz_offscreen`: 演示使用 `viz` 进行离屏渲染；
+1. [v110] `demo_viz_offscreen`: 演示使用 `viz` 进行离屏渲染；
 1. `demo_viz_gui_gpu`: 演示使用 `viz` 进行硬件加速渲染；
 1. `demo_viz_layer`: 演示使用 `viz` 进行交互渲染；
 1. `demo_viz_layer_offscreen`, 演示使用 VIZ 的 `CopyOutput` 接口进行离屏渲染；
@@ -92,6 +92,11 @@ Demo 列表：
 - 添加 demo, 演示 `tab capture api` 的原理；
 
 ## 更新日志
+
+### 2022.12.4
+
+- 升级一些 demo 到 110 版本；
+
 ### 2022.04.27
 
 - 添加 demo_gin，演示如何使用gin创建一个简单的js运行时。

demo.cc

@@ -14,6 +14,26 @@
 #include "base/task/single_thread_task_executor.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 
+#include <errno.h>
+#include <limits.h>
+#include <sched.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "base/bind.h"
+#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/logging.h"
+#include "base/posix/eintr_wrapper.h"
+#include "base/process/launch.h"
+
 /**
  * 这个项目是个基础的入门demo，关于消息循环如果现在不明白可以先不用关注它，后面的
  * demo_task_executor 会专门演示它。
@@ -36,7 +56,19 @@ int main(int argc, char** argv) {
   // 复制当前文件来创建新的demo
   LOG(INFO) << "hello,world!";
 
+  const pid_t pid =
+      base::ForkWithFlags(CLONE_NEWUSER | SIGCHLD, nullptr, nullptr);
+
+  if (pid == -1) {
+    return -1;
+  }
+
+  if (pid == 0) {
+    _exit(0);
+  }
+
+
   LOG(INFO) << "running...";
-  base::RunLoop().Run();
+  // base::RunLoop().Run();
   return 0;
 }

demo_cc/BUILD.gn

@@ -23,10 +23,10 @@ template("cc") {
       "//ui/platform_window",
     ]
 
-    if (use_x11) {
+    if (ozone_platform_x11) {
       deps += [
         "//ui/events/platform/x11",
-        "//ui/platform_window/x11",
+        "//ui/ozone",
       ]
       #configs += [ "//build/config/linux:x11" ]
     }

demo_gl/BUILD.gn

@@ -27,10 +27,10 @@ executable("demo_gl") {
     # "//skia",
   ]
 
-  if (use_x11) {
+  if (ozone_platform_x11) {
     deps += [
       "//ui/events/platform/x11",
-      "//ui/platform_window/x11",
+      "//ui/ozone",
     ]
     #configs += [ "//build/config/linux:x11" ]
   }

demo_gl/demo_gl.cc

@@ -1,14 +1,10 @@
-/**
- * 由于目前手上没有 Linux 设备可供调试UI，因此这个 demo 可能不能够直接运行，可能需要添加某些参数配置或者环境初始化代码；
- */
-
 #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/macros.h"
+// #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/path_service.h"
@@ -135,6 +131,15 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
     // props.opacity = ui::PlatformWindowOpacity::kTranslucentWindow;
     // props.background_color = 0;
 #if defined(USE_OZONE)
+  // Make Ozone run in single-process mode.
+  ui::OzonePlatform::InitParams params;
+  params.single_process = true;
+
+  // This initialization must be done after TaskEnvironment has
+  // initialized the UI thread.
+  ui::OzonePlatform::InitializeForUI(params);
+  ui::OzonePlatform::InitializeForGPU(params);
+
     return ui::OzonePlatform::GetInstance()->CreatePlatformWindow(
         this, std::move(props));
 #elif defined(OS_WIN)
@@ -153,9 +158,9 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
     DCHECK_NE(widget_, gfx::kNullAcceleratedWidget);
     TRACE_EVENT0("shell", "InitializeDemo");
     if (!g_gl_surface) {
-      gl::init::InitializeGLOneOff();
+      gl::GLDisplay* display = gl::init::InitializeGLOneOff(0);
 
-      g_gl_surface = gl::init::CreateViewGLSurface(widget_);
+      g_gl_surface = gl::init::CreateViewGLSurface(display, widget_);
 
       scoped_refptr<gl::GLShareGroup> share_group =
           base::MakeRefCounted<gl::GLShareGroup>();
@@ -180,11 +185,11 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
     static unsigned int i = 0;
     glClearColor(1.f, (i++) % 10 / 10.f + 0.1f, 0, 1.f);
     glClear(GL_COLOR_BUFFER_BIT);
-    g_gl_surface->SwapBuffers(base::DoNothing());
+    g_gl_surface->SwapBuffers(base::DoNothing(), gl::FrameData());
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::BindOnce(&DemoWindowHost::InitializeDemo, base::Unretained(this)),
-        base::TimeDelta::FromSeconds(1));
+        base::Seconds(1));
   }
 
   // ui::PlatformWindowDelegate:
@@ -193,12 +198,12 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
   void OnWillDestroyAcceleratedWidget() override {}
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override {
     widget_ = widget;
-#if !defined(OS_WIN)
-    // 如果需要去除窗口边框，将true改为false
-    platform_window_->SetUseNativeFrame(true); // windows crash here
-#endif
-    if (platform_window_)
+
+    if (platform_window_) {
+      // 如果需要去除窗口边框，将true改为false
+      platform_window_->SetUseNativeFrame(true);
       InitializeDemo();
+    }
   }
 
   void OnDamageRect(const gfx::Rect& damaged_region) override {}
@@ -233,7 +238,8 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
     if (close_closure_)
       std::move(close_closure_).Run();
   }
-  void OnWindowStateChanged(ui::PlatformWindowState new_state) override {}
+  void OnWindowStateChanged(ui::PlatformWindowState old_state,
+                                    ui::PlatformWindowState new_state) override {}
   void OnLostCapture() override {}
   void OnAcceleratedWidgetDestroyed() override {}
   void OnActivationChanged(bool active) override {}
@@ -246,8 +252,6 @@ class DemoWindowHost : public ui::PlatformWindowDelegate {
   scoped_refptr<gl::GLSurface> g_gl_surface;
   scoped_refptr<gl::GLContext> g_gl_context;
   scoped_refptr<gpu::SharedContextState> g_context_state;
-
-  DISALLOW_COPY_AND_ASSIGN(DemoWindowHost);
 };
 
 }  // namespace demo
@@ -276,7 +280,7 @@ int main(int argc, char** argv) {
   base::ThreadPoolInstance::CreateAndStartWithDefaultParams("DemoGL");
 
   // 在Linux上，x11和aura都是默认开启的
-#if defined(USE_X11)
+// #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
   // gfx::InitializeThreadedX11();
@@ -288,7 +292,7 @@ int main(int argc, char** argv) {
   // 错误，默认的Xlib异常处理会打印错误日志然后强制结束程序。
   // 这些错误大多是并发导致的代码执行顺序问题，所以修改起来没有那么容易。
   // ui::SetDefaultX11ErrorHandlers();
-#endif
+// #endif
 
   auto event_source_ = ui::PlatformEventSource::CreateDefault();
 

demo_ipc/demo_ipc.cc

@@ -6,8 +6,9 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include <base/run_loop.h>
 #include "base/task/single_thread_task_executor.h"
-#include "base/task/post_task.h"
+// #include "base/task/post_task.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
@@ -33,7 +34,7 @@
 
 // For bindings API
 // #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/interface_ptr.h"
+// #include "mojo/public/cpp/bindings/interface_ptr.h"
 
 // For associated bindings API
 // #include "mojo/public/cpp/bindings/associated_binding.h"
@@ -52,28 +53,6 @@
 #include "ipc/message_filter.h"
 
 #include "demo_ipc_messages.h"
-
-// 在新版本中这些类被重命名,这里模拟新版本
-template <class T>
-using Remote = mojo::InterfacePtr<T>;
-template <class T>
-using PendingRemote = mojo::InterfacePtrInfo<T>;
-template <class T>
-using Receiver = mojo::Receiver<T>;
-// using Receiver = mojo::InterfaceRequest<T>;
-template <class T>
-using PendingReceiver = mojo::InterfaceRequest<T>;
-
-// 以下定义用于模拟新版本的关联接口
-template <class T>
-using AssociatedRemote = mojo::AssociatedRemote<T>;
-template <class T>
-using PendingAssociatedRemote = mojo::AssociatedInterfacePtrInfo<T>;
-template <class T>
-using AssociatedReceiver = mojo::AssociatedReceiver<T>;
-template <class T>
-using PendingAssociatedReceiver = mojo::AssociatedInterfaceRequest<T>;
-
 class ProducerListener : public IPC::Listener {
  public:
   ProducerListener(){}

demo_ipc/demo_ipc_messages.h

@@ -1,8 +1,10 @@
 #ifndef DEMO_IPC_MESSAGES_H_
 #define DEMO_IPC_MESSAGES_H_
 
+// #define IPC_MESSAGE_IMPL
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_message_start.h"
 #include "ipc/ipc_param_traits.h"
 
 // 使用 IPCTestMsgStart 来测试，它不能随意命名，必须存在于 ipc/ipc_message_start.h 中