content/browser/renderer_host/compositor_resize_lock_aura.h - Issue 140753005: Add the UI compositor to the Mac build

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/renderer_host/compositor_resize_lock_aura.h

Issue 140753005: Add the UI compositor to the Mac build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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_BROWSER_AURA_RESIZE_LOCK_AURA_H_	5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_

6 #define CONTENT_BROWSER_AURA_RESIZE_LOCK_AURA_H_	6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_

7	7

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

11 #include "content/browser/aura/resize_lock.h"	11 #include "content/browser/compositor/resize_lock.h"

12	12

13 namespace aura { class RootWindow; }	13 namespace aura { class RootWindow; }

14	14

15 namespace ui { class CompositorLock; }	15 namespace ui { class CompositorLock; }

16	16

17 namespace content {	17 namespace content {

18	18

19 // Used to prevent further resizes while a resize is pending.	19 // Used to prevent further resizes while a resize is pending.

20 class CompositorResizeLock : public ResizeLock {	20 class CompositorResizeLock : public ResizeLock {

21 public:	21 public:

(...skipping 14 matching lines...) Expand all Loading...
36 aura::RootWindow* root_window_;	36 aura::RootWindow* root_window_;

37 scoped_refptr<ui::CompositorLock> compositor_lock_;	37 scoped_refptr<ui::CompositorLock> compositor_lock_;

38 base::WeakPtrFactory<CompositorResizeLock> weak_ptr_factory_;	38 base::WeakPtrFactory<CompositorResizeLock> weak_ptr_factory_;

39 bool cancelled_;	39 bool cancelled_;

40	40

41 DISALLOW_COPY_AND_ASSIGN(CompositorResizeLock);	41 DISALLOW_COPY_AND_ASSIGN(CompositorResizeLock);

42 };	42 };

43	43

44 } // namespace content	44 } // namespace content

45	45

46 #endif // CONTENT_BROWSER_AURA_RESIZE_LOCK_AURA_H_	46 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_RESIZE_LOCK_AURA_H_

OLD	NEW