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

Side by Side Diff: cc/tiles/image_controller.h

Issue 2537683002: cc: Add image decode queue functionality to image manager. (Closed)
Patch Set: test fix Created 3 years, 11 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 | « cc/tiles/gpu_image_decode_cache_unittest.cc ('k') | cc/tiles/image_controller.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 CC_TILES_IMAGE_CONTROLLER_H_ 5 #ifndef CC_TILES_IMAGE_CONTROLLER_H_
6 #define CC_TILES_IMAGE_CONTROLLER_H_ 6 #define CC_TILES_IMAGE_CONTROLLER_H_
7 7
8 #include <set>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h"
14 #include "base/threading/simple_thread.h"
12 #include "cc/base/cc_export.h" 15 #include "cc/base/cc_export.h"
16 #include "cc/base/unique_notifier.h"
13 #include "cc/playback/draw_image.h" 17 #include "cc/playback/draw_image.h"
14 #include "cc/raster/tile_task.h" 18 #include "cc/raster/tile_task.h"
15 #include "cc/tiles/image_decode_cache.h" 19 #include "cc/tiles/image_decode_cache.h"
16 20
17 namespace cc { 21 namespace cc {
18 22
19 class CC_EXPORT ImageController { 23 class CC_EXPORT ImageController {
20 public: 24 public:
21 ImageController(); 25 using ImageDecodeRequestId = uint64_t;
22 ~ImageController(); 26 using ImageDecodedCallback = base::Callback<void(ImageDecodeRequestId)>;
27 explicit ImageController(
28 base::SequencedTaskRunner* origin_task_runner,
29 scoped_refptr<base::SequencedTaskRunner> worker_task_runner);
30 virtual ~ImageController();
23 31
24 void SetImageDecodeCache(ImageDecodeCache* cache); 32 void SetImageDecodeCache(ImageDecodeCache* cache);
25 void GetTasksForImagesAndRef( 33 void GetTasksForImagesAndRef(
26 std::vector<DrawImage>* images, 34 std::vector<DrawImage>* images,
27 std::vector<scoped_refptr<TileTask>>* tasks, 35 std::vector<scoped_refptr<TileTask>>* tasks,
28 const ImageDecodeCache::TracingInfo& tracing_info); 36 const ImageDecodeCache::TracingInfo& tracing_info);
29 void UnrefImages(const std::vector<DrawImage>& images); 37 void UnrefImages(const std::vector<DrawImage>& images);
30 void ReduceMemoryUsage(); 38 void ReduceMemoryUsage();
31 std::vector<scoped_refptr<TileTask>> SetPredecodeImages( 39 std::vector<scoped_refptr<TileTask>> SetPredecodeImages(
32 std::vector<DrawImage> predecode_images, 40 std::vector<DrawImage> predecode_images,
33 const ImageDecodeCache::TracingInfo& tracing_info); 41 const ImageDecodeCache::TracingInfo& tracing_info);
34 42
43 // Virtual for testing.
44 virtual void UnlockImageDecode(ImageDecodeRequestId id);
45
46 // This function requests that the given image be decoded and locked. Once the
47 // callback has been issued, it is passed an ID, which should be used to
48 // unlock this image. It is up to the caller to ensure that the image is later
49 // unlocked using UnlockImageDecode.
50 // Virtual for testing.
51 virtual ImageDecodeRequestId QueueImageDecode(
52 sk_sp<const SkImage> image,
53 const ImageDecodedCallback& callback);
54
35 private: 55 private:
56 struct ImageDecodeRequest {
57 ImageDecodeRequest();
58 ImageDecodeRequest(ImageDecodeRequestId id,
59 const DrawImage& draw_image,
60 const ImageDecodedCallback& callback,
61 scoped_refptr<TileTask> task,
62 bool need_unref);
63 ImageDecodeRequest(ImageDecodeRequest&& other);
64 ImageDecodeRequest(const ImageDecodeRequest& other);
65 ~ImageDecodeRequest();
66
67 ImageDecodeRequest& operator=(ImageDecodeRequest&& other);
68 ImageDecodeRequest& operator=(const ImageDecodeRequest& other);
69
70 ImageDecodeRequestId id;
71 DrawImage draw_image;
72 ImageDecodedCallback callback;
73 scoped_refptr<TileTask> task;
74 bool need_unref;
75 };
76
77 void StopWorkerTasks();
78
79 // Called from the worker thread.
80 void ProcessNextImageDecodeOnWorkerThread();
81
82 void ImageDecodeCompleted(ImageDecodeRequestId id);
83
36 ImageDecodeCache* cache_ = nullptr; 84 ImageDecodeCache* cache_ = nullptr;
37 std::vector<DrawImage> predecode_locked_images_; 85 std::vector<DrawImage> predecode_locked_images_;
38 86
87 static ImageDecodeRequestId s_next_image_decode_queue_id_;
88 std::unordered_map<ImageDecodeRequestId, DrawImage> requested_locked_images_;
89
90 base::SequencedTaskRunner* origin_task_runner_ = nullptr;
91 scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
92
93 // The variables defined below this lock (aside from weak_ptr_factory_) can
94 // only be accessed when the lock is acquired.
95 base::Lock lock_;
96 std::map<ImageDecodeRequestId, ImageDecodeRequest> image_decode_queue_;
97 std::map<ImageDecodeRequestId, ImageDecodeRequest>
98 requests_needing_completion_;
99 bool abort_tasks_ = false;
100
101 base::WeakPtrFactory<ImageController> weak_ptr_factory_;
102
39 DISALLOW_COPY_AND_ASSIGN(ImageController); 103 DISALLOW_COPY_AND_ASSIGN(ImageController);
40 }; 104 };
41 105
42 } // namespace cc 106 } // namespace cc
43 107
44 #endif // CC_TILES_IMAGE_CONTROLLER_H_ 108 #endif // CC_TILES_IMAGE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « cc/tiles/gpu_image_decode_cache_unittest.cc ('k') | cc/tiles/image_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698