OLD | NEW |
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_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ | 5 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ |
6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ | 6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <string> | 11 #include <string> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "base/memory/shared_memory.h" | 16 #include "base/memory/shared_memory.h" |
17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
18 #include "cc/surfaces/surface_id.h" | 18 #include "cc/surfaces/surface_id.h" |
19 #include "content/common/content_export.h" | 19 #include "content/common/content_export.h" |
20 #include "ui/gfx/geometry/size.h" | 20 #include "ui/gfx/geometry/size.h" |
21 | 21 |
22 namespace base { | 22 namespace base { |
23 class SharedMemory; | 23 class SharedMemory; |
24 } | 24 } |
25 | 25 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 bool opaque_; | 115 bool opaque_; |
116 | 116 |
117 gfx::Size buffer_size_; | 117 gfx::Size buffer_size_; |
118 | 118 |
119 // The lifetime of this weak pointer should be greater than the lifetime of | 119 // The lifetime of this weak pointer should be greater than the lifetime of |
120 // other member objects, as they may access this pointer during their | 120 // other member objects, as they may access this pointer during their |
121 // destruction. | 121 // destruction. |
122 base::WeakPtr<BrowserPlugin> browser_plugin_; | 122 base::WeakPtr<BrowserPlugin> browser_plugin_; |
123 RenderFrameProxy* render_frame_proxy_; | 123 RenderFrameProxy* render_frame_proxy_; |
124 | 124 |
125 scoped_ptr<blink::WebLayer> web_layer_; | 125 std::unique_ptr<blink::WebLayer> web_layer_; |
126 cc::SurfaceId surface_id_; | 126 cc::SurfaceId surface_id_; |
127 blink::WebFrame* frame_; | 127 blink::WebFrame* frame_; |
128 | 128 |
129 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); | 129 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); |
130 }; | 130 }; |
131 | 131 |
132 } // namespace content | 132 } // namespace content |
133 | 133 |
134 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ | 134 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ |
OLD | NEW |