Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: services/ui/demo/mus_demo.h

Issue 2194003002: services/ui: Have an explicit lifetime/ownership of ui::GpuService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot merge Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/ui/common/gpu_service.cc ('k') | services/ui/demo/mus_demo.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_ 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_
6 #define SERVICES_UI_DEMO_MUS_DEMO_H_ 6 #define SERVICES_UI_DEMO_MUS_DEMO_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
17 #include "services/shell/public/cpp/service.h" 17 #include "services/shell/public/cpp/service.h"
18 #include "services/ui/public/cpp/window_manager_delegate.h" 18 #include "services/ui/public/cpp/window_manager_delegate.h"
19 #include "services/ui/public/cpp/window_tree_client_delegate.h" 19 #include "services/ui/public/cpp/window_tree_client_delegate.h"
20 #include "third_party/skia/include/core/SkBitmap.h" 20 #include "third_party/skia/include/core/SkBitmap.h"
21 21
22 namespace ui { 22 namespace ui {
23 class BitmapUploader; 23 class BitmapUploader;
24 class GpuService;
25
24 namespace demo { 26 namespace demo {
25 27
26 // A simple MUS Demo mojo app. This app connects to the mojo:ui, creates a new 28 // A simple MUS Demo mojo app. This app connects to the mojo:ui, creates a new
27 // window and draws a spinning square in the center of the window. Provides a 29 // window and draws a spinning square in the center of the window. Provides a
28 // simple way to demonstrate that the graphic stack works as intended. 30 // simple way to demonstrate that the graphic stack works as intended.
29 class MusDemo : public shell::Service, 31 class MusDemo : public shell::Service,
30 public WindowTreeClientDelegate, 32 public WindowTreeClientDelegate,
31 public WindowManagerDelegate { 33 public WindowManagerDelegate {
32 public: 34 public:
33 MusDemo(); 35 MusDemo();
(...skipping 28 matching lines...) Expand all
62 void OnWmCancelMoveLoop(Window* window) override; 64 void OnWmCancelMoveLoop(Window* window) override;
63 65
64 // Allocate a bitmap the same size as the window to draw into. 66 // Allocate a bitmap the same size as the window to draw into.
65 void AllocBitmap(); 67 void AllocBitmap();
66 68
67 // Draws one frame, incrementing the rotation angle. 69 // Draws one frame, incrementing the rotation angle.
68 void DrawFrame(); 70 void DrawFrame();
69 71
70 Window* window_ = nullptr; 72 Window* window_ = nullptr;
71 WindowTreeClient* window_tree_client_ = nullptr; 73 WindowTreeClient* window_tree_client_ = nullptr;
74 std::unique_ptr<GpuService> gpu_service_;
72 75
73 // Used to send frames to mus. 76 // Used to send frames to mus.
74 std::unique_ptr<ui::BitmapUploader> uploader_; 77 std::unique_ptr<ui::BitmapUploader> uploader_;
75 78
76 // Bitmap that is the same size as our client window area. 79 // Bitmap that is the same size as our client window area.
77 SkBitmap bitmap_; 80 SkBitmap bitmap_;
78 81
79 // Timer for calling DrawFrame(). 82 // Timer for calling DrawFrame().
80 base::RepeatingTimer timer_; 83 base::RepeatingTimer timer_;
81 84
82 // Current rotation angle for drawing. 85 // Current rotation angle for drawing.
83 double angle_ = 0.0; 86 double angle_ = 0.0;
84 87
85 DISALLOW_COPY_AND_ASSIGN(MusDemo); 88 DISALLOW_COPY_AND_ASSIGN(MusDemo);
86 }; 89 };
87 90
88 } // namespace demo 91 } // namespace demo
89 } // namespace ui 92 } // namespace ui
90 93
91 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_ 94 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_
OLDNEW
« no previous file with comments | « services/ui/common/gpu_service.cc ('k') | services/ui/demo/mus_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698