Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index 399d83d5c98ce48f6aa40f2d35aad4d9d5f16342..45d7ed6095d75a0c8e8320eed7e6f8f99312e76d 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -9,9 +9,9 @@ |
'scoped_ptr_hash_map.h', |
'scoped_ptr_vector.h', |
'bitmap_canvas_layer_texture_updater.cc', |
- 'BitmapCanvasLayerTextureUpdater.h', |
+ 'bitmap_canvas_layer_texture_updater.h', |
'bitmap_skpicture_canvas_layer_texture_updater.cc', |
- 'BitmapSkPictureCanvasLayerTextureUpdater.h', |
+ 'bitmap_skpicture_canvas_layer_texture_updater.h', |
'caching_bitmap_canvas_layer_texture_updater.cc', |
'caching_bitmap_canvas_layer_texture_updater.h', |
'active_animation.cc', |
@@ -167,66 +167,63 @@ |
'yuv_video_draw_quad.cc', |
'CCYUVVideoDrawQuad.h', |
'canvas_layer_texture_updater.cc', |
- 'CanvasLayerTextureUpdater.h', |
+ 'canvas_layer_texture_updater.h', |
'content_layer.cc', |
- 'ContentLayerChromium.h', |
- 'ContentLayerChromiumClient.h', |
+ 'content_layer.h', |
+ 'content_layer_client.h', |
'delegated_renderer_layer.cc', |
- 'DelegatedRendererLayerChromium.h', |
+ 'delegated_renderer_layer.h', |
'frame_buffer_skpicture_canvas_layer_texture_updater.cc', |
- 'FrameBufferSkPictureCanvasLayerTextureUpdater.h', |
+ 'frame_buffer_skpicture_canvas_layer_texture_updater.h', |
'geometry_binding.cc', |
- 'GeometryBinding.h', |
+ 'geometry_binding.h', |
'heads_up_display_layer.cc', |
- 'HeadsUpDisplayLayerChromium.h', |
+ 'heads_up_display_layer.h', |
'io_surface_layer.cc', |
- 'IOSurfaceLayerChromium.h', |
+ 'io_surface_layer.h', |
'image_layer.cc', |
- 'ImageLayerChromium.h', |
+ 'image_layer.h', |
'layer.cc', |
- 'LayerChromium.h', |
- 'LayerPainterChromium.h', |
+ 'layer.h', |
+ 'layer_painter.h', |
'layer_texture_sub_image.cc', |
- 'LayerTextureSubImage.h', |
+ 'layer_texture_sub_image.h', |
'layer_texture_updater.cc', |
- 'LayerTextureUpdater.h', |
- 'PlatformColor.h', |
+ 'layer_texture_updater.h', |
+ 'platform_color.h', |
'program_binding.cc', |
- 'ProgramBinding.h', |
+ 'program_binding.h', |
'rate_limiter.cc', |
- 'RateLimiter.h', |
+ 'rate_limiter.h', |
'render_surface.cc', |
- 'RenderSurfaceChromium.h', |
+ 'render_surface.h', |
'scrollbar_layer.cc', |
- 'ScrollbarLayerChromium.h', |
+ 'scrollbar_layer.h', |
'shader.cc', |
- 'ShaderChromium.h', |
+ 'shader.h', |
'skpicture_canvas_layer_texture_updater.cc', |
- 'SkPictureCanvasLayerTextureUpdater.h', |
+ 'skpicture_canvas_layer_texture_updater.h', |
'solid_color_layer.cc', |
- 'SolidColorLayerChromium.h', |
+ 'solid_color_layer.h', |
'switches.cc', |
'switches.h', |
'texture_copier.cc', |
- 'TextureCopier.h', |
+ 'texture_copier.h', |
'texture_layer.cc', |
- 'TextureLayerChromium.h', |
- 'TextureLayerChromiumClient.h', |
- 'TextureUploader.h', |
+ 'texture_layer.h', |
+ 'texture_layer_client.h', |
+ 'texture_uploader.h', |
'throttled_texture_uploader.cc', |
- 'ThrottledTextureUploader.h', |
+ 'throttled_texture_uploader.h', |
'unthrottled_texture_uploader.cc', |
- 'UnthrottledTextureUploader.h', |
+ 'unthrottled_texture_uploader.h', |
'tiled_layer.cc', |
- 'TiledLayerChromium.h', |
+ 'tiled_layer.h', |
'tree_synchronizer.cc', |
- 'TreeSynchronizer.h', |
+ 'tree_synchronizer.h', |
'video_layer.cc', |
- 'VideoLayerChromium.h', |
+ 'video_layer.h', |
- 'bitmap_canvas_layer_texture_updater.h', |
- 'bitmap_skpicture_canvas_layer_texture_updater.h', |
- 'canvas_layer_texture_updater.h', |
'active_animation.h', |
'animation_curve.h', |
'animation_events.h', |
@@ -310,35 +307,6 @@ |
'timing_function.h', |
'video_layer_impl.h', |
'yuv_video_draw_quad.h', |
- 'content_layer_client.h', |
- 'content_layer.h', |
- 'delegated_renderer_layer.h', |
- 'frame_buffer_skpicture_canvas_layer_texture_updater.h', |
- 'geometry_binding.h', |
- 'heads_up_display_layer.h', |
- 'image_layer.h', |
- 'io_surface_layer.h', |
- 'layer.h', |
- 'layer_painter.h', |
- 'layer_texture_sub_image.h', |
- 'layer_texture_updater.h', |
- 'platform_color.h', |
- 'program_binding.h', |
- 'rate_limiter.h', |
- 'render_surface.h', |
- 'scrollbar_layer.h', |
- 'shader.h', |
- 'skpicture_canvas_layer_texture_updater.h', |
- 'solid_color_layer.h', |
- 'texture_copier.h', |
- 'texture_layer_client.h', |
- 'texture_layer.h', |
- 'texture_uploader.h', |
- 'throttled_texture_uploader.h', |
- 'tiled_layer.h', |
- 'tree_synchronizer.h', |
- 'unthrottled_texture_uploader.h', |
- 'video_layer.h', |
], |
}, |
'targets': [ |