From 80fc07e8f854cd7c632bc06443d5f120ed002524 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 8 Dec 2017 16:45:43 -0500 Subject: Create a Window::Layer interface to reduce sk_app glue code This also makes it possible to manage other parts of viewer, etc (like the stats screen, command set, even samples) as additional layers in the stack. For now, it just removes a lot of boilerplate. Bug: skia: Change-Id: Ic2f80690fc76c683b3736287dc2b738c50d38614 Reviewed-on: https://skia-review.googlesource.com/82688 Reviewed-by: Jim Van Verth Commit-Queue: Brian Osman --- example/HelloWorld.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'example/HelloWorld.cpp') diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp index fba7f7e5a0..5954e71532 100644 --- a/example/HelloWorld.cpp +++ b/example/HelloWorld.cpp @@ -18,21 +18,6 @@ Application* Application::Create(int argc, char** argv, void* platformData) { return new HelloWorld(argc, argv, platformData); } -static void on_backend_created_func(void* userData) { - HelloWorld* hw = reinterpret_cast(userData); - return hw->onBackendCreated(); -} - -static void on_paint_handler(SkCanvas* canvas, void* userData) { - HelloWorld* hw = reinterpret_cast(userData); - return hw->onPaint(canvas); -} - -static bool on_char_handler(SkUnichar c, uint32_t modifiers, void* userData) { - HelloWorld* hw = reinterpret_cast(userData); - return hw->onChar(c, modifiers); -} - HelloWorld::HelloWorld(int argc, char** argv, void* platformData) : fBackendType(Window::kNativeGL_BackendType) , fRotationAngle(0) { @@ -42,9 +27,7 @@ HelloWorld::HelloWorld(int argc, char** argv, void* platformData) fWindow->setRequestedDisplayParams(DisplayParams()); // register callbacks - fWindow->registerBackendCreatedFunc(on_backend_created_func, this); - fWindow->registerPaintFunc(on_paint_handler, this); - fWindow->registerCharFunc(on_char_handler, this); + fWindow->pushLayer(this); fWindow->attach(fBackendType); } -- cgit v1.2.3