trunk/src/ui/compositor/test/default_context_factory.h - Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..."

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: trunk/src/ui/compositor/test/default_context_factory.h

Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 10 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 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 UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_	5 #ifndef UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_

6 #define UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_	6 #define UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_

7	7

8 #include "ui/compositor/compositor.h"	8 #include "ui/compositor/compositor.h"

9	9

10 namespace webkit {	10 namespace webkit {

(...skipping 19 matching lines...) Expand all Loading...
30 Layer* layer) OVERRIDE;	30 Layer* layer) OVERRIDE;

31 virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE;	31 virtual void RemoveReflector(scoped_refptr<Reflector> reflector) OVERRIDE;

32	32

33 virtual scoped_refptr<cc::ContextProvider>	33 virtual scoped_refptr<cc::ContextProvider>

34 OffscreenCompositorContextProvider() OVERRIDE;	34 OffscreenCompositorContextProvider() OVERRIDE;

35 virtual scoped_refptr<cc::ContextProvider>	35 virtual scoped_refptr<cc::ContextProvider>

36 SharedMainThreadContextProvider() OVERRIDE;	36 SharedMainThreadContextProvider() OVERRIDE;

37 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;	37 virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;

38 virtual bool DoesCreateTestContexts() OVERRIDE;	38 virtual bool DoesCreateTestContexts() OVERRIDE;

39	39

	40 bool Initialize();

	41

40 private:	42 private:

41 scoped_refptr<webkit::gpu::ContextProviderInProcess>	43 scoped_refptr<webkit::gpu::ContextProviderInProcess>

42 offscreen_compositor_contexts_;	44 offscreen_compositor_contexts_;

43 scoped_refptr<webkit::gpu::ContextProviderInProcess>	45 scoped_refptr<webkit::gpu::ContextProviderInProcess>

44 shared_main_thread_contexts_;	46 shared_main_thread_contexts_;

45	47

46 DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);	48 DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);

47 };	49 };

48	50

49 } // namespace ui	51 } // namespace ui

50	52

51 #endif // UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_	53 #endif // UI_COMPOSITOR_TEST_DEFAULT_CONTEXT_FACTORY_H_

OLD	NEW