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

Side by Side Diff: content/public/test/test_synchronous_compositor_android.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_ 5 #ifndef CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_
6 #define CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_ 6 #define CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "cc/output/compositor_frame_ack.h" 14 #include "cc/output/compositor_frame_ack.h"
15 #include "content/public/browser/android/synchronous_compositor.h" 15 #include "content/public/browser/android/synchronous_compositor.h"
16 #include "content/public/browser/android/synchronous_compositor_client.h" 16 #include "content/public/browser/android/synchronous_compositor_client.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor { 20 class CONTENT_EXPORT TestSynchronousCompositor : public SynchronousCompositor {
21 public: 21 public:
22 TestSynchronousCompositor(); 22 TestSynchronousCompositor();
23 ~TestSynchronousCompositor() override; 23 ~TestSynchronousCompositor() override;
(...skipping 13 matching lines...) Expand all
37 bool DemandDrawSw(SkCanvas* canvas) override; 37 bool DemandDrawSw(SkCanvas* canvas) override;
38 void SetMemoryPolicy(size_t bytes_limit) override {} 38 void SetMemoryPolicy(size_t bytes_limit) override {}
39 void DidChangeRootLayerScrollOffset( 39 void DidChangeRootLayerScrollOffset(
40 const gfx::ScrollOffset& root_offset) override {} 40 const gfx::ScrollOffset& root_offset) override {}
41 void SynchronouslyZoomBy(float zoom_delta, 41 void SynchronouslyZoomBy(float zoom_delta,
42 const gfx::Point& anchor) override {} 42 const gfx::Point& anchor) override {}
43 void SetIsActive(bool is_active) override {} 43 void SetIsActive(bool is_active) override {}
44 void OnComputeScroll(base::TimeTicks animate_time) override {} 44 void OnComputeScroll(base::TimeTicks animate_time) override {}
45 45
46 void SetHardwareFrame(uint32_t output_surface_id, 46 void SetHardwareFrame(uint32_t output_surface_id,
47 scoped_ptr<cc::CompositorFrame> frame); 47 std::unique_ptr<cc::CompositorFrame> frame);
48 48
49 struct ReturnedResources { 49 struct ReturnedResources {
50 ReturnedResources(); 50 ReturnedResources();
51 ~ReturnedResources(); 51 ~ReturnedResources();
52 52
53 uint32_t output_surface_id; 53 uint32_t output_surface_id;
54 cc::ReturnedResourceArray resources; 54 cc::ReturnedResourceArray resources;
55 }; 55 };
56 using FrameAckArray = std::vector<ReturnedResources>; 56 using FrameAckArray = std::vector<ReturnedResources>;
57 void SwapReturnedResources(FrameAckArray* array); 57 void SwapReturnedResources(FrameAckArray* array);
58 58
59 private: 59 private:
60 SynchronousCompositorClient* client_; 60 SynchronousCompositorClient* client_;
61 SynchronousCompositor::Frame hardware_frame_; 61 SynchronousCompositor::Frame hardware_frame_;
62 FrameAckArray frame_ack_array_; 62 FrameAckArray frame_ack_array_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(TestSynchronousCompositor); 64 DISALLOW_COPY_AND_ASSIGN(TestSynchronousCompositor);
65 }; 65 };
66 66
67 } // namespace content 67 } // namespace content
68 68
69 #endif // CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_ 69 #endif // CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_
OLDNEW
« no previous file with comments | « content/public/test/test_renderer_host.h ('k') | content/public/test/test_synchronous_compositor_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698