webkit/compositor_bindings/web_compositor_support_impl.cc - Issue 10905100: Ensure that include paths used by webkit_compositor_bindings work in WebKit as well.

Side by Side Diff: webkit/compositor_bindings/web_compositor_support_impl.cc

Issue 10905100: Ensure that include paths used by webkit_compositor_bindings work in WebKit as well. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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

« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "webkit/compositor_bindings/web_compositor_support_impl.h"	5 #include "webkit/compositor_bindings/web_compositor_support_impl.h"

6	6

7 #if defined(USE_LIBCC_FOR_COMPOSITOR)	7 #if defined(USE_LIBCC_FOR_COMPOSITOR)

8 #include "webkit/compositor_bindings/WebLayerImpl.h"	8 #include "webkit/compositor_bindings/WebLayerImpl.h"

9 #include "webkit/compositor_bindings/WebLayerTreeViewImpl.h"	9 #include "webkit/compositor_bindings/WebLayerTreeViewImpl.h"

10 #include "webkit/compositor_bindings/WebContentLayerImpl.h"	10 #include "webkit/compositor_bindings/WebContentLayerImpl.h"

11 #include "webkit/compositor_bindings/WebExternalTextureLayerImpl.h"	11 #include "webkit/compositor_bindings/WebExternalTextureLayerImpl.h"

12 #include "webkit/compositor_bindings/WebIOSurfaceLayerImpl.h"	12 #include "webkit/compositor_bindings/WebIOSurfaceLayerImpl.h"

13 #include "webkit/compositor_bindings/WebSolidColorLayerImpl.h"	13 #include "webkit/compositor_bindings/WebSolidColorLayerImpl.h"

14 #include "webkit/compositor_bindings/WebImageLayerImpl.h"	14 #include "webkit/compositor_bindings/WebImageLayerImpl.h"

15 #include "webkit/compositor_bindings/WebVideoLayerImpl.h"	15 #include "webkit/compositor_bindings/WebVideoLayerImpl.h"

16 #include "webkit/compositor_bindings/WebScrollbarLayerImpl.h"	16 #include "webkit/compositor_bindings/WebScrollbarLayerImpl.h"

17 #include "webkit/compositor_bindings/WebAnimationImpl.h"	17 #include "webkit/compositor_bindings/WebAnimationImpl.h"

18 #include "webkit/compositor_bindings/WebFloatAnimationCurveImpl.h"	18 #include "webkit/compositor_bindings/WebFloatAnimationCurveImpl.h"

19 #include "webkit/compositor_bindings/WebTransformAnimationCurveImpl.h"	19 #include "webkit/compositor_bindings/WebTransformAnimationCurveImpl.h"

20 #else	20 #else

21 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"	21 #include "Source/Platform/chromium/public/WebAnimation.h"

22 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"	22 #include "Source/Platform/chromium/public/WebContentLayer.h"

23 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL ayer.h"	23 #include "Source/Platform/chromium/public/WebExternalTextureLayer.h"

24 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatAnimationCu rve.h"	24 #include "Source/Platform/chromium/public/WebFloatAnimationCurve.h"

25 #include "third_party/WebKit/Source/Platform/chromium/public/WebIOSurfaceLayer.h "	25 #include "Source/Platform/chromium/public/WebIOSurfaceLayer.h"

26 #include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h"	26 #include "Source/Platform/chromium/public/WebImageLayer.h"

27 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"	27 #include "Source/Platform/chromium/public/WebLayer.h"

28 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarLayer.h "	28 #include "Source/Platform/chromium/public/WebScrollbarLayer.h"

29 #include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer. h"	29 #include "Source/Platform/chromium/public/WebSolidColorLayer.h"

30 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformAnimati onCurve.h"	30 #include "Source/Platform/chromium/public/WebTransformAnimationCurve.h"

31 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoLayer.h"	31 #include "Source/Platform/chromium/public/WebVideoLayer.h"

32 #endif	32 #endif

33	33

34 using WebKit::WebAnimation;	34 using WebKit::WebAnimation;

35 using WebKit::WebAnimationCurve;	35 using WebKit::WebAnimationCurve;

36 using WebKit::WebContentLayer;	36 using WebKit::WebContentLayer;

37 using WebKit::WebContentLayerClient;	37 using WebKit::WebContentLayerClient;

38 using WebKit::WebExternalTextureLayer;	38 using WebKit::WebExternalTextureLayer;

39 using WebKit::WebExternalTextureLayerClient;	39 using WebKit::WebExternalTextureLayerClient;

40 using WebKit::WebFloatAnimationCurve;	40 using WebKit::WebFloatAnimationCurve;

41 using WebKit::WebIOSurfaceLayer;	41 using WebKit::WebIOSurfaceLayer;

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 WebTransformAnimationCurve*	169 WebTransformAnimationCurve*

170 WebCompositorSupportImpl::createTransformAnimationCurve() {	170 WebCompositorSupportImpl::createTransformAnimationCurve() {

171 #if defined(USE_LIBCC_FOR_COMPOSITOR)	171 #if defined(USE_LIBCC_FOR_COMPOSITOR)

172 return new WebKit::WebTransformAnimationCurveImpl();	172 return new WebKit::WebTransformAnimationCurveImpl();

173 #else	173 #else

174 return WebKit::WebTransformAnimationCurve::create();	174 return WebKit::WebTransformAnimationCurve::create();

175 #endif	175 #endif

176 }	176 }

177	177

178 } // namespace webkit	178 } // namespace webkit

OLD	NEW