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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin_compositing_helper.h

Issue 26023004: aura: Allow delegated frames to be used by more than one impl layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: frameprovider: are_layers_attached checks Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
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 #include <vector>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "gpu/command_buffer/common/mailbox.h" 14 #include "gpu/command_buffer/common/mailbox.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 16
17 namespace base { 17 namespace base {
18 class SharedMemory; 18 class SharedMemory;
19 } 19 }
20 20
21 namespace cc { 21 namespace cc {
22 class CompositorFrame; 22 class CompositorFrame;
23 class Layer; 23 class Layer;
24 class SolidColorLayer; 24 class SolidColorLayer;
25 class TextureLayer; 25 class TextureLayer;
26 class DelegatedFrameProvider;
27 class DelegatedFrameResourceCollection;
26 class DelegatedRendererLayer; 28 class DelegatedRendererLayer;
27 } 29 }
28 30
29 namespace WebKit { 31 namespace WebKit {
30 class WebPluginContainer; 32 class WebPluginContainer;
31 class WebLayer; 33 class WebLayer;
32 } 34 }
33 35
34 namespace content { 36 namespace content {
35 37
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 int last_route_id_; 93 int last_route_id_;
92 uint32 last_output_surface_id_; 94 uint32 last_output_surface_id_;
93 int last_host_id_; 95 int last_host_id_;
94 bool last_mailbox_valid_; 96 bool last_mailbox_valid_;
95 bool ack_pending_; 97 bool ack_pending_;
96 bool software_ack_pending_; 98 bool software_ack_pending_;
97 std::vector<unsigned> unacked_software_frames_; 99 std::vector<unsigned> unacked_software_frames_;
98 100
99 gfx::Size buffer_size_; 101 gfx::Size buffer_size_;
100 102
103 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
104 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
105
101 scoped_refptr<cc::SolidColorLayer> background_layer_; 106 scoped_refptr<cc::SolidColorLayer> background_layer_;
102 scoped_refptr<cc::TextureLayer> texture_layer_; 107 scoped_refptr<cc::TextureLayer> texture_layer_;
103 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; 108 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
104 scoped_ptr<WebKit::WebLayer> web_layer_; 109 scoped_ptr<WebKit::WebLayer> web_layer_;
105 WebKit::WebPluginContainer* container_; 110 WebKit::WebPluginContainer* container_;
106 111
107 scoped_refptr<BrowserPluginManager> browser_plugin_manager_; 112 scoped_refptr<BrowserPluginManager> browser_plugin_manager_;
108 }; 113 };
109 114
110 } // namespace content 115 } // namespace content
111 116
112 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_ 117 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_COMPOSITING_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698