diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 03:42:11 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 03:42:11 +0000 |
| commit | bf189f6d9415107d901c8bc16a30ecacfa7d5f90 (patch) | |
| tree | fde26f10dbf02ff53ee12eb7169e68d2c99e9088 /cc/compositor_frame.h | |
| parent | 015995065ae92efd0a310c6dba94664ddbbc3252 (diff) | |
| download | chromium_src-bf189f6d9415107d901c8bc16a30ecacfa7d5f90.zip chromium_src-bf189f6d9415107d901c8bc16a30ecacfa7d5f90.tar.gz chromium_src-bf189f6d9415107d901c8bc16a30ecacfa7d5f90.tar.bz2 | |
Send compositor frame IPC with metadata.
This makes CompositorFrame contain one of two payloads: DelegatedFrameData for ubercomp and GLFrameData for the Aura model. This also adds CompositorFrameMetadata containing information useful for positioning subwindows relative to the webpage scroll position.
The message is sent when a new switch --enable-compositor-frame-message is set. This is enabled by default on Android and also suppresses Android-specific UpdateFrameInfo messages, which will be superceded by CompositorFrameMetadata.
BUG=152337,161945
Review URL: https://chromiumcodereview.appspot.com/11316128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/compositor_frame.h')
| -rw-r--r-- | cc/compositor_frame.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/compositor_frame.h b/cc/compositor_frame.h index b9f09c1..88ebe2f 100644 --- a/cc/compositor_frame.h +++ b/cc/compositor_frame.h @@ -5,11 +5,11 @@ #ifndef CC_COMPOSITOR_FRAME_H_ #define CC_COMPOSITOR_FRAME_H_ +#include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" -#include "cc/render_pass.h" -#include "cc/scoped_ptr_vector.h" -#include "cc/transferable_resource.h" -#include "ui/gfx/size.h" +#include "cc/compositor_frame_metadata.h" +#include "cc/delegated_frame_data.h" +#include "cc/gl_frame_data.h" namespace cc { @@ -18,9 +18,9 @@ class CC_EXPORT CompositorFrame { CompositorFrame(); ~CompositorFrame(); - gfx::Size size; - TransferableResourceList resource_list; - ScopedPtrVector<RenderPass> render_pass_list; + CompositorFrameMetadata metadata; + scoped_ptr<DelegatedFrameData> delegated_frame_data; + scoped_ptr<GLFrameData> gl_frame_data; }; } // namespace cc |