Index: content/browser/compositor/delegated_frame_host.h |
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h |
index 5b2588d34a80eb14ac0d316452cb094bfb7309bf..293314a74d62dc6dd9af8f3302db61e51ab1ccc0 100644 |
--- a/content/browser/compositor/delegated_frame_host.h |
+++ b/content/browser/compositor/delegated_frame_host.h |
@@ -13,7 +13,6 @@ |
#include "content/browser/renderer_host/delegated_frame_evictor.h" |
#include "content/browser/renderer_host/dip_util.h" |
#include "content/browser/renderer_host/render_widget_host_impl.h" |
-#include "content/common/gpu/client/gl_helper.h" |
#include "content/public/browser/render_process_host.h" |
#include "ui/compositor/compositor.h" |
#include "ui/compositor/compositor_observer.h" |
@@ -29,6 +28,7 @@ class VideoFrame; |
namespace content { |
class DelegatedFrameHost; |
+class ReadbackYUVInterface; |
class RenderWidgetHostViewFrameSubscriber; |
class RenderWidgetHostImpl; |
class ResizeLock; |
@@ -258,7 +258,7 @@ class CONTENT_EXPORT DelegatedFrameHost |
scoped_refptr<ui::CompositorLock> released_front_lock_; |
enum CanLockCompositorState { |
- YES, |
+ YES_CAN_LOCK, |
ccameron
2014/05/06 00:20:32
Objective C uses YES/NO for booleans, so this had
|
// We locked, so at some point we'll need to kick a frame. |
YES_DID_LOCK, |
// No. A lock timed out, we need to kick a new frame before locking again. |