OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ | 5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ |
6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ | 6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
| 9 #include <vector> |
9 | 10 |
10 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
12 #include "content/common/content_export.h" | 13 #include "content/common/content_export.h" |
13 #include "gpu/command_buffer/common/mailbox.h" | 14 #include "gpu/command_buffer/common/mailbox.h" |
14 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
15 | 16 |
16 namespace base { | 17 namespace base { |
17 class SharedMemory; | 18 class SharedMemory; |
18 } | 19 } |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 void MailboxReleased(SwapBuffersInfo mailbox, | 86 void MailboxReleased(SwapBuffersInfo mailbox, |
86 unsigned sync_point, | 87 unsigned sync_point, |
87 bool lost_resource); | 88 bool lost_resource); |
88 int instance_id_; | 89 int instance_id_; |
89 int host_routing_id_; | 90 int host_routing_id_; |
90 int last_route_id_; | 91 int last_route_id_; |
91 uint32 last_output_surface_id_; | 92 uint32 last_output_surface_id_; |
92 int last_host_id_; | 93 int last_host_id_; |
93 bool last_mailbox_valid_; | 94 bool last_mailbox_valid_; |
94 bool ack_pending_; | 95 bool ack_pending_; |
| 96 bool software_ack_pending_; |
| 97 std::vector<unsigned> unacked_software_frames_; |
95 | 98 |
96 gfx::Size buffer_size_; | 99 gfx::Size buffer_size_; |
97 | 100 |
98 scoped_refptr<cc::SolidColorLayer> background_layer_; | 101 scoped_refptr<cc::SolidColorLayer> background_layer_; |
99 scoped_refptr<cc::TextureLayer> texture_layer_; | 102 scoped_refptr<cc::TextureLayer> texture_layer_; |
100 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; | 103 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; |
101 scoped_ptr<WebKit::WebLayer> web_layer_; | 104 scoped_ptr<WebKit::WebLayer> web_layer_; |
102 WebKit::WebPluginContainer* container_; | 105 WebKit::WebPluginContainer* container_; |
103 | 106 |
104 scoped_refptr<BrowserPluginManager> browser_plugin_manager_; | 107 scoped_refptr<BrowserPluginManager> browser_plugin_manager_; |
105 }; | 108 }; |
106 | 109 |
107 } // namespace content | 110 } // namespace content |
108 | 111 |
109 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ | 112 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ |
OLD | NEW |