| Index: cc/output/compositor_frame.h
|
| diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h
|
| deleted file mode 100644
|
| index 0f925cbb12cecdb3b018702c10aaa402bfd4868c..0000000000000000000000000000000000000000
|
| --- a/cc/output/compositor_frame.h
|
| +++ /dev/null
|
| @@ -1,34 +0,0 @@
|
| -// Copyright 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_
|
| -#define CC_OUTPUT_COMPOSITOR_FRAME_H_
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "cc/output/compositor_frame_metadata.h"
|
| -#include "cc/output/delegated_frame_data.h"
|
| -#include "cc/output/gl_frame_data.h"
|
| -#include "cc/output/software_frame_data.h"
|
| -
|
| -namespace cc {
|
| -
|
| -class CompositorFrame {
|
| - public:
|
| - CompositorFrame();
|
| - ~CompositorFrame();
|
| -
|
| - CompositorFrameMetadata metadata;
|
| - scoped_ptr<DelegatedFrameData> delegated_frame_data;
|
| - scoped_ptr<GLFrameData> gl_frame_data;
|
| - scoped_ptr<SoftwareFrameData> software_frame_data;
|
| -
|
| - void AssignTo(CompositorFrame* target);
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(CompositorFrame);
|
| -};
|
| -
|
| -} // namespace cc
|
| -
|
| -#endif // CC_OUTPUT_COMPOSITOR_FRAME_H_
|
|
|