diff options
Diffstat (limited to 'cc')
129 files changed, 380 insertions, 420 deletions
diff --git a/cc/active_animation.h b/cc/active_animation.h index 0839662..be195bd 100644 --- a/cc/active_animation.h +++ b/cc/active_animation.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCActiveAnimation_h -#define CCActiveAnimation_h +#ifndef CC_ACTIVE_ANIMATION_H_ +#define CC_ACTIVE_ANIMATION_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -159,4 +159,4 @@ private: } // namespace cc -#endif // CCActiveAnimation_h +#endif // CC_ACTIVE_ANIMATION_H_ diff --git a/cc/animation_curve.h b/cc/animation_curve.h index 5b80d8d..e2932e9 100644 --- a/cc/animation_curve.h +++ b/cc/animation_curve.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCAnimationCurve_h -#define CCAnimationCurve_h +#ifndef CC_ANIMATION_CURVE_H_ +#define CC_ANIMATION_CURVE_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -53,4 +53,4 @@ public: } // namespace cc -#endif // CCAnimation_h +#endif // CC_ANIMATION_CURVE_H_ diff --git a/cc/animation_events.h b/cc/animation_events.h index 5cfd36a..2658c98 100644 --- a/cc/animation_events.h +++ b/cc/animation_events.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCAnimationEvents_h -#define CCAnimationEvents_h +#ifndef CC_ANIMATION_EVENTS_H_ +#define CC_ANIMATION_EVENTS_H_ #include <vector> @@ -34,4 +34,4 @@ typedef std::vector<AnimationEvent> AnimationEventsVector; } // namespace cc -#endif // CCAnimationEvents_h +#endif // CC_ANIMATION_EVENTS_H_ diff --git a/cc/append_quads_data.h b/cc/append_quads_data.h index 567f3aa..46f5a33 100644 --- a/cc/append_quads_data.h +++ b/cc/append_quads_data.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCAppendQuadsData_h -#define CCAppendQuadsData_h +#ifndef CC_APPEND_QUADS_DATA_H_ +#define CC_APPEND_QUADS_DATA_H_ #include "cc/render_pass.h" @@ -33,4 +33,4 @@ struct AppendQuadsData { }; } -#endif // CCCCAppendQuadsData_h +#endif // CC_APPEND_QUADS_DATA_H_ diff --git a/cc/bitmap_content_layer_updater.h b/cc/bitmap_content_layer_updater.h index 7c833db..948ca81 100644 --- a/cc/bitmap_content_layer_updater.h +++ b/cc/bitmap_content_layer_updater.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef BitmapContentLayerUpdater_h -#define BitmapContentLayerUpdater_h +#ifndef CC_BITMAP_CONTENT_LAYER_UPDATER_H_ +#define CC_BITMAP_CONTENT_LAYER_UPDATER_H_ #include "cc/cc_export.h" #include "cc/content_layer_updater.h" @@ -52,4 +52,4 @@ protected: } // namespace cc -#endif // BitmapContentLayerUpdater_h +#endif // CC_BITMAP_CONTENT_LAYER_UPDATER_H_ diff --git a/cc/bitmap_skpicture_content_layer_updater.h b/cc/bitmap_skpicture_content_layer_updater.h index 7b2bf1fb..ed1c332 100644 --- a/cc/bitmap_skpicture_content_layer_updater.h +++ b/cc/bitmap_skpicture_content_layer_updater.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BitmapSkPictureContentLayerUpdater_h -#define BitmapSkPictureContentLayerUpdater_h +#ifndef CC_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_ +#define CC_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_ #include "cc/skpicture_content_layer_updater.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -39,4 +39,4 @@ private: } // namespace cc -#endif // BitmapSkPictureContentLayerUpdater_h +#endif // CC_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_ diff --git a/cc/caching_bitmap_content_layer_updater.h b/cc/caching_bitmap_content_layer_updater.h index f7be2ee..8eab5a6 100644 --- a/cc/caching_bitmap_content_layer_updater.h +++ b/cc/caching_bitmap_content_layer_updater.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CACHING_BITMAP_CANVAS_LAYER_UPDATER_H_ -#define CACHING_BITMAP_CANVAS_LAYER_UPDATER_H_ +#ifndef CC_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_ +#define CC_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_ #include "base/compiler_specific.h" #include "cc/bitmap_content_layer_updater.h" @@ -36,4 +36,4 @@ class CachingBitmapContentLayerUpdater } // namespace cc -#endif // CACHING_BITMAP_CANVAS_LAYER_UPDATER_H_ +#endif // CC_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_ diff --git a/cc/checkerboard_draw_quad.h b/cc/checkerboard_draw_quad.h index 8a2ada6..439842ea 100644 --- a/cc/checkerboard_draw_quad.h +++ b/cc/checkerboard_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCCheckerboardDrawQuad_h -#define CCCheckerboardDrawQuad_h +#ifndef CC_CHECKERBOARD_DRAW_QUAD_H_ +#define CC_CHECKERBOARD_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -31,4 +31,4 @@ private: } -#endif +#endif // CC_CHECKERBOARD_DRAW_QUAD_H_ diff --git a/cc/completion_event.h b/cc/completion_event.h index fb7f429..ff1bbed 100644 --- a/cc/completion_event.h +++ b/cc/completion_event.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCCompletionEvent_h -#define CCCompletionEvent_h +#ifndef CC_COMPLETION_EVENT_H_ +#define CC_COMPLETION_EVENT_H_ #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" @@ -64,4 +64,4 @@ private: } -#endif +#endif // CC_COMPLETION_EVENT_H_ diff --git a/cc/content_layer.h b/cc/content_layer.h index 0174ee5..5505d85f 100644 --- a/cc/content_layer.h +++ b/cc/content_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ContentLayerChromium_h -#define ContentLayerChromium_h +#ifndef CC_CONTENT_LAYER_H_ +#define CC_CONTENT_LAYER_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -58,4 +58,4 @@ private: }; } -#endif +#endif // CC_CONTENT_LAYER_H_ diff --git a/cc/content_layer_client.h b/cc/content_layer_client.h index f2bd52a..73eba8f 100644 --- a/cc/content_layer_client.h +++ b/cc/content_layer_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ContentLayerChromiumClient_h -#define ContentLayerChromiumClient_h +#ifndef CC_CONTENT_LAYER_CLIENT_H_ +#define CC_CONTENT_LAYER_CLIENT_H_ class SkCanvas; @@ -24,4 +24,4 @@ protected: } -#endif // ContentLayerChromiumClient_h +#endif // CC_CONTENT_LAYER_CLIENT_H_ diff --git a/cc/content_layer_updater.h b/cc/content_layer_updater.h index ae6365c..7f54be8 100644 --- a/cc/content_layer_updater.h +++ b/cc/content_layer_updater.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ContentLayerUpdater_h -#define ContentLayerUpdater_h +#ifndef CC_CONTENT_LAYER_UPDATER_H_ +#define CC_CONTENT_LAYER_UPDATER_H_ #include "cc/cc_export.h" #include "cc/layer_updater.h" @@ -32,4 +32,4 @@ private: } // namespace cc -#endif // ContentLayerUpdater_h +#endif // CC_CONTENT_LAYER_UPDATER_H_ diff --git a/cc/contents_scaling_layer.h b/cc/contents_scaling_layer.h index d167d7f..af79472 100644 --- a/cc/contents_scaling_layer.h +++ b/cc/contents_scaling_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_CONTENTS_SCALING_LAYER_H -#define CC_CONTENTS_SCALING_LAYER_H +#ifndef CC_CONTENTS_SCALING_LAYER_H_ +#define CC_CONTENTS_SCALING_LAYER_H_ #include "cc/cc_export.h" #include "cc/layer.h" @@ -29,4 +29,4 @@ class CC_EXPORT ContentsScalingLayer : public Layer { } // namespace cc -#endif // CC_CONTENTS_SCALING_LAYER_H +#endif // CC_CONTENTS_SCALING_LAYER_H__ diff --git a/cc/damage_tracker.h b/cc/damage_tracker.h index 5deb731..190c92a 100644 --- a/cc/damage_tracker.h +++ b/cc/damage_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDamageTracker_h -#define CCDamageTracker_h +#ifndef CC_DAMAGE_TRACKER_H_ +#define CC_DAMAGE_TRACKER_H_ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" @@ -68,4 +68,4 @@ private: } // namespace cc -#endif // CCDamageTracker_h +#endif // CC_DAMAGE_TRACKER_H_ diff --git a/cc/debug_border_draw_quad.h b/cc/debug_border_draw_quad.h index d07b3e0..165aa3e 100644 --- a/cc/debug_border_draw_quad.h +++ b/cc/debug_border_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDebugBorderDrawQuad_h -#define CCDebugBorderDrawQuad_h +#ifndef CC_DEBUG_BORDER_DRAW_QUAD_H_ +#define CC_DEBUG_BORDER_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -33,4 +33,4 @@ private: } -#endif +#endif // CC_DEBUG_BORDER_DRAW_QUAD_H_ diff --git a/cc/debug_rect_history.h b/cc/debug_rect_history.h index 7f7de53..ff2ea8d 100644 --- a/cc/debug_rect_history.h +++ b/cc/debug_rect_history.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDebugRectHistory_h -#define CCDebugRectHistory_h +#ifndef CC_DEBUG_RECT_HISTORY_H_ +#define CC_DEBUG_RECT_HISTORY_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -76,4 +76,4 @@ private: } // namespace cc -#endif +#endif // CC_DEBUG_RECT_HISTORY_H_ diff --git a/cc/delay_based_time_source.h b/cc/delay_based_time_source.h index 542af1b..da8e0e7 100644 --- a/cc/delay_based_time_source.h +++ b/cc/delay_based_time_source.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDelayBasedTimeSource_h -#define CCDelayBasedTimeSource_h +#ifndef CC_DELAY_BASED_TIME_SOURCE_H_ +#define CC_DELAY_BASED_TIME_SOURCE_H_ #include "base/memory/weak_ptr.h" #include "cc/cc_export.h" @@ -76,4 +76,4 @@ protected: } // namespace cc -#endif // CCDelayBasedTimeSource_h +#endif // CC_DELAY_BASED_TIME_SOURCE_H_ diff --git a/cc/delegated_renderer_layer.h b/cc/delegated_renderer_layer.h index f4e4f41..83188d9 100644 --- a/cc/delegated_renderer_layer.h +++ b/cc/delegated_renderer_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef DelegatedRendererLayerChromium_h -#define DelegatedRendererLayerChromium_h +#ifndef CC_DELEGATED_RENDERER_LAYER_H_ +#define CC_DELEGATED_RENDERER_LAYER_H_ #include "cc/cc_export.h" #include "cc/layer.h" @@ -24,4 +24,4 @@ private: }; } -#endif +#endif // CC_DELEGATED_RENDERER_LAYER_H_ diff --git a/cc/delegated_renderer_layer_impl.h b/cc/delegated_renderer_layer_impl.h index 550b84a..acbb856 100644 --- a/cc/delegated_renderer_layer_impl.h +++ b/cc/delegated_renderer_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDelegatedRendererLayerImpl_h -#define CCDelegatedRendererLayerImpl_h +#ifndef CC_DELEGATED_RENDERER_LAYER_IMPL_H_ +#define CC_DELEGATED_RENDERER_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -46,4 +46,4 @@ private: } -#endif // CCDelegatedRendererLayerImpl_h +#endif // CC_DELEGATED_RENDERER_LAYER_IMPL_H_ diff --git a/cc/direct_renderer.h b/cc/direct_renderer.h index b112baf..ffc41ca 100644 --- a/cc/direct_renderer.h +++ b/cc/direct_renderer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDirectRenderer_h -#define CCDirectRenderer_h +#ifndef CC_DIRECT_RENDERER_H_ +#define CC_DIRECT_RENDERER_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -103,4 +103,4 @@ private: } // namespace cc -#endif // CCDirectRenderer_h +#endif // CC_DIRECT_RENDERER_H_ diff --git a/cc/draw_quad.h b/cc/draw_quad.h index 5594ce8..76c2304 100644 --- a/cc/draw_quad.h +++ b/cc/draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCDrawQuad_h -#define CCDrawQuad_h +#ifndef CC_DRAW_QUAD_H_ +#define CC_DRAW_QUAD_H_ #include "cc/cc_export.h" #include "cc/shared_quad_state.h" @@ -90,4 +90,4 @@ protected: } -#endif +#endif // CC_DRAW_QUAD_H_ diff --git a/cc/font_atlas.h b/cc/font_atlas.h index 2080966..0840088 100644 --- a/cc/font_atlas.h +++ b/cc/font_atlas.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCFontAtlas_h -#define CCFontAtlas_h +#ifndef CC_FONT_ATLAS_H_ +#define CC_FONT_ATLAS_H_ #include <string> @@ -63,4 +63,4 @@ private: } // namespace cc -#endif +#endif // CC_FONT_ATLAS_H_ diff --git a/cc/frame_rate_controller.h b/cc/frame_rate_controller.h index 41ccfd8..16a3e37 100644 --- a/cc/frame_rate_controller.h +++ b/cc/frame_rate_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCFrameRateController_h -#define CCFrameRateController_h +#ifndef CC_FRAME_RATE_CONTROLLER_H_ +#define CC_FRAME_RATE_CONTROLLER_H_ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -80,4 +80,4 @@ protected: } // namespace cc -#endif // CCFrameRateController_h +#endif // CC_FRAME_RATE_CONTROLLER_H_ diff --git a/cc/frame_rate_counter.h b/cc/frame_rate_counter.h index bc1765b..12ae7d7 100644 --- a/cc/frame_rate_counter.h +++ b/cc/frame_rate_counter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCFrameRateCounter_h -#define CCFrameRateCounter_h +#ifndef CC_FRAME_RATE_COUNTER_H_ +#define CC_FRAME_RATE_COUNTER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -65,4 +65,4 @@ private: } // namespace cc -#endif +#endif // CC_FRAME_RATE_COUNTER_H_ diff --git a/cc/geometry.h b/cc/geometry.h index 5501907..1e5e25a 100644 --- a/cc/geometry.h +++ b/cc/geometry.h @@ -18,4 +18,4 @@ inline gfx::Size ClampSizeFromAbove(gfx::Size s, gfx::Size other) { } // namespace cc -#endif // CC_GEOMETRY_H_ +#endif // CC_GEOMETRY_H_ diff --git a/cc/geometry_binding.h b/cc/geometry_binding.h index 89b604f..717ec6b 100644 --- a/cc/geometry_binding.h +++ b/cc/geometry_binding.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GeometryBinding_h -#define GeometryBinding_h +#ifndef CC_GEOMETRY_BINDING_H_ +#define CC_GEOMETRY_BINDING_H_ namespace gfx { class RectF; @@ -43,4 +43,4 @@ private: } // namespace cc -#endif +#endif // CC_GEOMETRY_BINDING_H_ diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h index 2bd2aff..2462300 100644 --- a/cc/gl_renderer.h +++ b/cc/gl_renderer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRendererGL_h -#define CCRendererGL_h +#ifndef CC_GL_RENDERER_H_ +#define CC_GL_RENDERER_H_ #include "cc/cc_export.h" #include "cc/checkerboard_draw_quad.h" @@ -234,4 +234,4 @@ private: } -#endif +#endif // CC_GL_RENDERER_H_ diff --git a/cc/graphics_context.h b/cc/graphics_context.h index 0daabb0..7057f37 100644 --- a/cc/graphics_context.h +++ b/cc/graphics_context.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCGraphicsContext_h -#define CCGraphicsContext_h +#ifndef CC_GRAPHICS_CONTEXT_H_ +#define CC_GRAPHICS_CONTEXT_H_ #include <public/WebCompositorOutputSurface.h> #include <public/WebGraphicsContext3D.h> @@ -15,4 +15,4 @@ typedef WebKit::WebCompositorOutputSurface GraphicsContext; } // namespace cc -#endif // CCGraphicsContext_h +#endif // CC_GRAPHICS_CONTEXT_H_ diff --git a/cc/heads_up_display_layer.h b/cc/heads_up_display_layer.h index dc7b814..52de0f4 100644 --- a/cc/heads_up_display_layer.h +++ b/cc/heads_up_display_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef HeadsUpDisplayLayerChromium_h -#define HeadsUpDisplayLayerChromium_h +#ifndef CC_HEADS_UP_DISPLAY_LAYER_H_ +#define CC_HEADS_UP_DISPLAY_LAYER_H_ #include "base/memory/scoped_ptr.h" #include "cc/font_atlas.h" @@ -34,4 +34,4 @@ private: } // namespace cc -#endif +#endif // CC_HEADS_UP_DISPLAY_LAYER_H_ diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h index adcd789..bcca767 100644 --- a/cc/heads_up_display_layer_impl.h +++ b/cc/heads_up_display_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCHeadsUpDisplayLayerImpl_h -#define CCHeadsUpDisplayLayerImpl_h +#ifndef CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_ +#define CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -55,4 +55,4 @@ private: } // namespace cc -#endif // CCHeadsUpDisplayLayerImpl_h +#endif // CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_ diff --git a/cc/image_layer.h b/cc/image_layer.h index 9fdce93..f4f6cd7 100644 --- a/cc/image_layer.h +++ b/cc/image_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ImageLayerChromium_h -#define ImageLayerChromium_h +#ifndef CC_IMAGE_LAYER_H_ +#define CC_IMAGE_LAYER_H_ #include "cc/cc_export.h" #include "cc/content_layer.h" @@ -43,4 +43,4 @@ private: } // namespace cc -#endif +#endif // CC_IMAGE_LAYER_H_ diff --git a/cc/input_handler.h b/cc/input_handler.h index f5b2e23..5f6a706 100644 --- a/cc/input_handler.h +++ b/cc/input_handler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCInputHandler_h -#define CCInputHandler_h +#ifndef CC_INPUT_HANDLER_H_ +#define CC_INPUT_HANDLER_H_ #include "base/basictypes.h" #include "base/time.h" @@ -88,4 +88,4 @@ private: } -#endif +#endif // CC_INPUT_HANDLER_H_ diff --git a/cc/io_surface_draw_quad.h b/cc/io_surface_draw_quad.h index c84cc1e..7f83d99 100644 --- a/cc/io_surface_draw_quad.h +++ b/cc/io_surface_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCIOSurfaceDrawQuad_h -#define CCIOSurfaceDrawQuad_h +#ifndef CC_IO_SURFACE_DRAW_QUAD_H_ +#define CC_IO_SURFACE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -40,4 +40,4 @@ private: } -#endif +#endif // CC_IO_SURFACE_DRAW_QUAD_H_ diff --git a/cc/io_surface_layer.h b/cc/io_surface_layer.h index 7dfc15c..69a9f60 100644 --- a/cc/io_surface_layer.h +++ b/cc/io_surface_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IOSurfaceLayerChromium_h -#define IOSurfaceLayerChromium_h +#ifndef CC_IO_SURFACE_LAYER_H_ +#define CC_IO_SURFACE_LAYER_H_ #include "cc/cc_export.h" #include "cc/layer.h" @@ -31,4 +31,4 @@ private: }; } -#endif +#endif // CC_IO_SURFACE_LAYER_H_ diff --git a/cc/io_surface_layer_impl.h b/cc/io_surface_layer_impl.h index 01fe628..0571bea 100644 --- a/cc/io_surface_layer_impl.h +++ b/cc/io_surface_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCIOSurfaceLayerImpl_h -#define CCIOSurfaceLayerImpl_h +#ifndef CC_IO_SURFACE_LAYER_IMPL_H_ +#define CC_IO_SURFACE_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -41,4 +41,4 @@ private: } -#endif // CCIOSurfaceLayerImpl_h +#endif // CC_IO_SURFACE_LAYER_IMPL_H_ diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h index 0cb2eb2..20ee626 100644 --- a/cc/keyframed_animation_curve.h +++ b/cc/keyframed_animation_curve.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCKeyframedAnimationCurve_h -#define CCKeyframedAnimationCurve_h +#ifndef CC_KEYFRAMED_ANIMATION_CURVE_H_ +#define CC_KEYFRAMED_ANIMATION_CURVE_H_ #include "cc/animation_curve.h" #include "cc/cc_export.h" @@ -113,4 +113,4 @@ private: } // namespace cc -#endif // CCKeyframedAnimationCurve_h +#endif // CC_KEYFRAMED_ANIMATION_CURVE_H_ @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LayerChromium_h -#define LayerChromium_h +#ifndef CC_LAYER_H_ +#define CC_LAYER_H_ #include "IntPoint.h" #include "Region.h" @@ -408,4 +408,4 @@ void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped } // namespace cc -#endif +#endif // CC_LAYER_H_ diff --git a/cc/layer_animation_controller.h b/cc/layer_animation_controller.h index 285f00a..3bf878c 100644 --- a/cc/layer_animation_controller.h +++ b/cc/layer_animation_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerAnimationController_h -#define CCLayerAnimationController_h +#ifndef CC_LAYER_ANIMATION_CONTROLLER_H_ +#define CC_LAYER_ANIMATION_CONTROLLER_H_ #include "base/basictypes.h" #include "base/hash_tables.h" @@ -108,4 +108,4 @@ private: } // namespace cc -#endif // CCLayerAnimationController_h +#endif // CC_LAYER_ANIMATION_CONTROLLER_H_ diff --git a/cc/layer_impl.h b/cc/layer_impl.h index c9d6905..d51f3d0 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerImpl_h -#define CCLayerImpl_h +#ifndef CC_LAYER_IMPL_H_ +#define CC_LAYER_IMPL_H_ #include <string> @@ -418,4 +418,4 @@ void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*> } -#endif // CCLayerImpl_h +#endif // CC_LAYER_IMPL_H_ diff --git a/cc/layer_iterator.h b/cc/layer_iterator.h index 84814fc..1d68887 100644 --- a/cc/layer_iterator.h +++ b/cc/layer_iterator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerIterator_h -#define CCLayerIterator_h +#ifndef CC_LAYER_ITERATOR_H_ +#define CC_LAYER_ITERATOR_H_ #include "base/memory/ref_counted.h" #include "cc/cc_export.h" @@ -205,4 +205,4 @@ struct CC_EXPORT LayerIteratorActions { } // namespace cc -#endif +#endif // CC_LAYER_ITERATOR_H_ diff --git a/cc/layer_painter.h b/cc/layer_painter.h index 2d695a6..b9dce8d 100644 --- a/cc/layer_painter.h +++ b/cc/layer_painter.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef LayerPainterChromium_h -#define LayerPainterChromium_h +#ifndef CC_LAYER_PAINTER_H_ +#define CC_LAYER_PAINTER_H_ #include "cc/cc_export.h" @@ -24,4 +24,4 @@ public: }; } // namespace cc -#endif // LayerPainterChromium_h +#endif // CC_LAYER_PAINTER_H_ diff --git a/cc/layer_quad.h b/cc/layer_quad.h index e9ab5ec..29bbec8 100644 --- a/cc/layer_quad.h +++ b/cc/layer_quad.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef CCLayerQuad_h -#define CCLayerQuad_h +#ifndef CC_LAYER_QUAD_H_ +#define CC_LAYER_QUAD_H_ #include "cc/cc_export.h" #include "ui/gfx/point_f.h" @@ -103,4 +103,4 @@ private: } -#endif +#endif // CC_LAYER_QUAD_H_ diff --git a/cc/layer_sorter.h b/cc/layer_sorter.h index 56cd8ac..fbf4e5d 100644 --- a/cc/layer_sorter.h +++ b/cc/layer_sorter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerSorter_h -#define CCLayerSorter_h +#ifndef CC_LAYER_SORTER_H_ +#define CC_LAYER_SORTER_H_ #include "base/basictypes.h" #include "base/hash_tables.h" @@ -113,4 +113,4 @@ private: }; } -#endif +#endif // CC_LAYER_SORTER_H_ diff --git a/cc/layer_tiling_data.h b/cc/layer_tiling_data.h index 97fdbb0..36a029a 100644 --- a/cc/layer_tiling_data.h +++ b/cc/layer_tiling_data.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef CCLayerTilingData_h -#define CCLayerTilingData_h +#ifndef CC_LAYER_TILING_DATA_H_ +#define CC_LAYER_TILING_DATA_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -86,4 +86,4 @@ protected: } -#endif +#endif // CC_LAYER_TILING_DATA_H_ diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h index ada7bed..76cb9d6 100644 --- a/cc/layer_tree_host.h +++ b/cc/layer_tree_host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerTreeHost_h -#define CCLayerTreeHost_h +#ifndef CC_LAYER_TREE_HOST_H_ +#define CC_LAYER_TREE_HOST_H_ #include <limits> @@ -291,4 +291,4 @@ private: } // namespace cc -#endif +#endif // CC_LAYER_TREE_HOST_H_ diff --git a/cc/layer_tree_host_client.h b/cc/layer_tree_host_client.h index 981e9ec..3bec0328 100644 --- a/cc/layer_tree_host_client.h +++ b/cc/layer_tree_host_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerTreeHostClient_h -#define CCLayerTreeHostClient_h +#ifndef CC_LAYER_TREE_HOST_CLIENT_H_ +#define CC_LAYER_TREE_HOST_CLIENT_H_ #include "base/memory/scoped_ptr.h" @@ -40,4 +40,4 @@ protected: } -#endif // CCLayerTreeHostClient_h +#endif // CC_LAYER_TREE_HOST_CLIENT_H_ diff --git a/cc/layer_tree_host_common.h b/cc/layer_tree_host_common.h index d936019..78ec5e4 100644 --- a/cc/layer_tree_host_common.h +++ b/cc/layer_tree_host_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerTreeHostCommon_h -#define CCLayerTreeHostCommon_h +#ifndef CC_LAYER_TREE_HOST_COMMON_H_ +#define CC_LAYER_TREE_HOST_COMMON_H_ #include "base/memory/ref_counted.h" #include "cc/cc_export.h" @@ -93,4 +93,4 @@ LayerType* LayerTreeHostCommon::findLayerInSubtree(LayerType* rootLayer, int lay } // namespace cc -#endif +#endif // CC_LAYER_TREE_HOST_COMMON_H_ diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index ce1f5eb..3eb84a5 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerTreeHostImpl_h -#define CCLayerTreeHostImpl_h +#ifndef CC_LAYER_TREE_HOST_IMPL_H_ +#define CC_LAYER_TREE_HOST_IMPL_H_ #include "FloatPoint.h" #include "base/basictypes.h" @@ -360,4 +360,4 @@ private: } // namespace cc -#endif +#endif // CC_LAYER_TREE_HOST_IMPL_H_ diff --git a/cc/layer_updater.h b/cc/layer_updater.h index d490ac4..b2cab71 100644 --- a/cc/layer_updater.h +++ b/cc/layer_updater.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LayerUpdater_h -#define LayerUpdater_h +#ifndef CC_LAYER_UPDATER_H_ +#define CC_LAYER_UPDATER_H_ #include "base/memory/ref_counted.h" #include "cc/cc_export.h" @@ -59,4 +59,4 @@ private: } // namespace cc -#endif // LayerUpdater_h +#endif // CC_LAYER_UPDATER_H_ diff --git a/cc/managed_memory_policy.h b/cc/managed_memory_policy.h index c4e54d1..8376937 100644 --- a/cc/managed_memory_policy.h +++ b/cc/managed_memory_policy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef managed_memory_policy_h -#define managed_memory_policy_h +#ifndef CC_MANAGED_MEMORY_POLICY_H_ +#define CC_MANAGED_MEMORY_POLICY_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -27,4 +27,4 @@ struct CC_EXPORT ManagedMemoryPolicy { } // namespace cc -#endif +#endif // CC_MANAGED_MEMORY_POLICY_H_ diff --git a/cc/math_util.h b/cc/math_util.h index f2cba22..7d22c6c 100644 --- a/cc/math_util.h +++ b/cc/math_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCMathUtil_h -#define CCMathUtil_h +#ifndef CC_MATH_UTIL_H_ +#define CC_MATH_UTIL_H_ #include "base/logging.h" #include "cc/cc_export.h" @@ -112,4 +112,4 @@ public: } // namespace cc -#endif // #define CCMathUtil_h +#endif // CC_MATH_UTIL_H_ diff --git a/cc/occlusion_tracker.h b/cc/occlusion_tracker.h index 0d72470..10c86f8 100644 --- a/cc/occlusion_tracker.h +++ b/cc/occlusion_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCOcclusionTracker_h -#define CCOcclusionTracker_h +#ifndef CC_OCCLUSION_TRACKER_H_ +#define CC_OCCLUSION_TRACKER_H_ #include "Region.h" #include "base/basictypes.h" @@ -109,4 +109,4 @@ extern template class OcclusionTrackerBase<LayerImpl, RenderSurfaceImpl>; } // namespace cc -#endif // CCOcclusionTracker_h +#endif // CC_OCCLUSION_TRACKER_H_ diff --git a/cc/overdraw_metrics.h b/cc/overdraw_metrics.h index fcc6bce..46916bf 100644 --- a/cc/overdraw_metrics.h +++ b/cc/overdraw_metrics.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCOverdrawMetrics_h -#define CCOverdrawMetrics_h +#ifndef CC_OVERDRAW_METRICS_H_ +#define CC_OVERDRAW_METRICS_H_ #include "base/memory/scoped_ptr.h" @@ -97,4 +97,4 @@ private: } // namespace cc -#endif +#endif // CC_OVERDRAW_METRICS_H_ diff --git a/cc/page_scale_animation.h b/cc/page_scale_animation.h index 2ce512f..5f4bbac 100644 --- a/cc/page_scale_animation.h +++ b/cc/page_scale_animation.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCPageScaleAnimation_h -#define CCPageScaleAnimation_h +#ifndef CC_PAGE_SCALE_ANIMATION_H_ +#define CC_PAGE_SCALE_ANIMATION_H_ #include "base/memory/scoped_ptr.h" #include "IntSize.h" @@ -72,4 +72,4 @@ private: } // namespace cc -#endif +#endif // CC_PAGE_SCALE_ANIMATION_H_ diff --git a/cc/platform_color.h b/cc/platform_color.h index 54a305c..0a75740 100644 --- a/cc/platform_color.h +++ b/cc/platform_color.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PlatformColor_h -#define PlatformColor_h +#ifndef CC_PLATFORM_COLOR_H_ +#define CC_PLATFORM_COLOR_H_ #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" @@ -57,4 +57,4 @@ public: } // namespace cc -#endif +#endif // CC_PLATFORM_COLOR_H_ diff --git a/cc/prioritized_texture.h b/cc/prioritized_texture.h index 2763fc4..499c8cb 100644 --- a/cc/prioritized_texture.h +++ b/cc/prioritized_texture.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCPrioritizedTexture_h -#define CCPrioritizedTexture_h +#ifndef CC_PRIORITIZED_TEXTURE_H_ +#define CC_PRIORITIZED_TEXTURE_H_ #include "base/basictypes.h" #include "base/logging.h" @@ -153,4 +153,4 @@ private: } // namespace cc -#endif +#endif // CC_PRIORITIZED_TEXTURE_H_ diff --git a/cc/prioritized_texture_manager.h b/cc/prioritized_texture_manager.h index 68dd1e1..a4639cd 100644 --- a/cc/prioritized_texture_manager.h +++ b/cc/prioritized_texture_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCPrioritizedTextureManager_h -#define CCPrioritizedTextureManager_h +#ifndef CC_PRIORITIZED_TEXTURE_MANAGER_H_ +#define CC_PRIORITIZED_TEXTURE_MANAGER_H_ #include <list> #include <vector> @@ -197,4 +197,4 @@ private: } // namespace cc -#endif +#endif // CC_PRIORITIZED_TEXTURE_MANAGER_H_ diff --git a/cc/priority_calculator.h b/cc/priority_calculator.h index 7cb4b93..ab7e856 100644 --- a/cc/priority_calculator.h +++ b/cc/priority_calculator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCPriorityCalculator_h -#define CCPriorityCalculator_h +#ifndef CC_PRIORITY_CALCULATOR_H_ +#define CC_PRIORITY_CALCULATOR_H_ #include "cc/cc_export.h" @@ -36,4 +36,4 @@ public: } -#endif +#endif // CC_PRIORITY_CALCULATOR_H_ diff --git a/cc/program_binding.h b/cc/program_binding.h index 3ddc0b4..5bcf7b9 100644 --- a/cc/program_binding.h +++ b/cc/program_binding.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ProgramBinding_h -#define ProgramBinding_h +#ifndef CC_PROGRAM_BINDING_H_ +#define CC_PROGRAM_BINDING_H_ #include <string> @@ -79,4 +79,4 @@ private: } // namespace cc -#endif +#endif // CC_PROGRAM_BINDING_H_ @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCProxy_h -#define CCProxy_h +#ifndef CC_PROXY_H_ +#define CC_PROXY_H_ #include "base/basictypes.h" #include "base/logging.h" @@ -140,4 +140,4 @@ private: } -#endif +#endif // CC_PROXY_H_ diff --git a/cc/quad_culler.h b/cc/quad_culler.h index 33cfc2f..861a250 100644 --- a/cc/quad_culler.h +++ b/cc/quad_culler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCQuadCuller_h -#define CCQuadCuller_h +#ifndef CC_QUAD_CULLER_H_ +#define CC_QUAD_CULLER_H_ #include "cc/cc_export.h" #include "cc/quad_sink.h" @@ -35,4 +35,4 @@ private: }; } -#endif // CCQuadCuller_h +#endif // CC_QUAD_CULLER_H_ diff --git a/cc/quad_sink.h b/cc/quad_sink.h index e8bf580..c9bbcac 100644 --- a/cc/quad_sink.h +++ b/cc/quad_sink.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCQuadSink_h -#define CCQuadSink_h +#ifndef CC_QUAD_SINK_H_ +#define CC_QUAD_SINK_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -28,4 +28,4 @@ public: }; } -#endif // CCQuadCuller_h +#endif // CC_QUAD_SINK_H_ diff --git a/cc/rate_limiter.h b/cc/rate_limiter.h index 935e64b..df7850d 100644 --- a/cc/rate_limiter.h +++ b/cc/rate_limiter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef RateLimiter_h -#define RateLimiter_h +#ifndef CC_RATE_LIMITER_H_ +#define CC_RATE_LIMITER_H_ #include "base/memory/ref_counted.h" @@ -49,4 +49,4 @@ private: }; } -#endif +#endif // CC_RATE_LIMITER_H_ diff --git a/cc/render_pass.h b/cc/render_pass.h index 6b77f0e..97ab8ee 100644 --- a/cc/render_pass.h +++ b/cc/render_pass.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderPass_h -#define CCRenderPass_h +#ifndef CC_RENDER_PASS_H_ +#define CC_RENDER_PASS_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -144,4 +144,4 @@ typedef std::vector<RenderPass*> RenderPassList; typedef ScopedPtrHashMap<RenderPass::Id, RenderPass> RenderPassIdHashMap; } // namespace cc -#endif +#endif // CC_RENDER_PASS_H_ diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h index ce927e0..f58a7ec9 100644 --- a/cc/render_pass_draw_quad.h +++ b/cc/render_pass_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderPassDrawQuad_h -#define CCRenderPassDrawQuad_h +#ifndef CC_RENDER_PASS_DRAW_QUAD_H_ +#define CC_RENDER_PASS_DRAW_QUAD_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -46,4 +46,4 @@ private: } -#endif +#endif // CC_RENDER_PASS_DRAW_QUAD_H_ diff --git a/cc/render_pass_sink.h b/cc/render_pass_sink.h index 10a34e7..ae00f62 100644 --- a/cc/render_pass_sink.h +++ b/cc/render_pass_sink.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderPassSink_h -#define CCRenderPassSink_h +#ifndef CC_RENDER_PASS_SINK_H_ +#define CC_RENDER_PASS_SINK_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -18,4 +18,4 @@ public: }; } -#endif // CCRenderPassSink_h +#endif // CC_RENDER_PASS_SINK_H_ diff --git a/cc/render_surface.h b/cc/render_surface.h index 6370063..cc84ea6 100644 --- a/cc/render_surface.h +++ b/cc/render_surface.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef RenderSurfaceChromium_h -#define RenderSurfaceChromium_h +#ifndef CC_RENDER_SURFACE_H_ +#define CC_RENDER_SURFACE_H_ #include "base/basictypes.h" #include "base/memory/ref_counted.h" @@ -101,4 +101,4 @@ private: }; } -#endif +#endif // CC_RENDER_SURFACE_H_ diff --git a/cc/render_surface_filters.h b/cc/render_surface_filters.h index 601ebe6..0186613 100644 --- a/cc/render_surface_filters.h +++ b/cc/render_surface_filters.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef CCRenderSurfaceFilters_h -#define CCRenderSurfaceFilters_h +#ifndef CC_RENDER_SURFACE_FILTERS_H_ +#define CC_RENDER_SURFACE_FILTERS_H_ #include "cc/cc_export.h" @@ -32,4 +32,4 @@ private: }; } -#endif +#endif // CC_RENDER_SURFACE_FILTERS_H_ diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h index 654d6b8..ec851ff 100644 --- a/cc/render_surface_impl.h +++ b/cc/render_surface_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderSurface_h -#define CCRenderSurface_h +#ifndef CC_RENDER_SURFACE_IMPL_H_ +#define CC_RENDER_SURFACE_IMPL_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -126,4 +126,4 @@ private: }; } -#endif +#endif // CC_RENDER_SURFACE_IMPL_H_ diff --git a/cc/renderer.h b/cc/renderer.h index 88c5a0b..f5d0fc6 100644 --- a/cc/renderer.h +++ b/cc/renderer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderer_h -#define CCRenderer_h +#ifndef CC_RENDERER_H_ +#define CC_RENDERER_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -83,4 +83,4 @@ protected: } -#endif // CCRenderer_h +#endif // CC_RENDERER_H_ diff --git a/cc/rendering_stats.h b/cc/rendering_stats.h index 9663498..ab4d9d0 100644 --- a/cc/rendering_stats.h +++ b/cc/rendering_stats.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderingStats_h -#define CCRenderingStats_h +#ifndef CC_RENDERING_STATS_H_ +#define CC_RENDERING_STATS_H_ namespace cc { @@ -35,4 +35,4 @@ struct RenderingStats { } -#endif +#endif // CC_RENDERING_STATS_H_ diff --git a/cc/resource_provider.h b/cc/resource_provider.h index 6fb33d4..c0ccc5c 100644 --- a/cc/resource_provider.h +++ b/cc/resource_provider.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCResourceProvider_h -#define CCResourceProvider_h +#ifndef CC_RESOURCE_PROVIDER_H_ +#define CC_RESOURCE_PROVIDER_H_ #include "base/basictypes.h" #include "base/hash_tables.h" @@ -270,4 +270,4 @@ private: } -#endif +#endif // CC_RESOURCE_PROVIDER_H_ diff --git a/cc/resource_update_controller.h b/cc/resource_update_controller.h index 18c8a0c..df56dbc 100644 --- a/cc/resource_update_controller.h +++ b/cc/resource_update_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCResourceUpdateController_h -#define CCResourceUpdateController_h +#ifndef CC_RESOURCE_UPDATE_CONTROLLER_H_ +#define CC_RESOURCE_UPDATE_CONTROLLER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -79,4 +79,4 @@ private: } // namespace cc -#endif // CCResourceUpdateController_h +#endif // CC_RESOURCE_UPDATE_CONTROLLER_H_ diff --git a/cc/resource_update_queue.h b/cc/resource_update_queue.h index 4dbb154..15509b0 100644 --- a/cc/resource_update_queue.h +++ b/cc/resource_update_queue.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCResourceUpdateQueue_h -#define CCResourceUpdateQueue_h +#ifndef CC_RESOURCE_UPDATE_QUEUE_H_ +#define CC_RESOURCE_UPDATE_QUEUE_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -45,4 +45,4 @@ private: } -#endif // CCResourceUpdateQueue_h +#endif // CC_RESOURCE_UPDATE_QUEUE_H_ diff --git a/cc/scheduler.h b/cc/scheduler.h index 621d519..5617a01 100644 --- a/cc/scheduler.h +++ b/cc/scheduler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScheduler_h -#define CCScheduler_h +#ifndef CC_SCHEDULER_H_ +#define CC_SCHEDULER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -106,4 +106,4 @@ private: } // namespace cc -#endif // CCScheduler_h +#endif // CC_SCHEDULER_H_ diff --git a/cc/scheduler_state_machine.h b/cc/scheduler_state_machine.h index ef338d2..a394776 100644 --- a/cc/scheduler_state_machine.h +++ b/cc/scheduler_state_machine.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSchedulerStateMachine_h -#define CCSchedulerStateMachine_h +#ifndef CC_SCHEDULER_STATE_MACHINE_H_ +#define CC_SCHEDULER_STATE_MACHINE_H_ #include <string> @@ -159,4 +159,4 @@ protected: } -#endif // CCSchedulerStateMachine_h +#endif // CC_SCHEDULER_STATE_MACHINE_H_ diff --git a/cc/scoped_texture.h b/cc/scoped_texture.h index 8df1f9a..4fe1394 100644 --- a/cc/scoped_texture.h +++ b/cc/scoped_texture.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScopedTexture_h -#define CCScopedTexture_h +#ifndef CC_SCOPED_TEXTURE_H_ +#define CC_SCOPED_TEXTURE_H_ #include "base/basictypes.h" #include "base/logging.h" @@ -46,4 +46,4 @@ private: } -#endif +#endif // CC_SCOPED_TEXTURE_H_ diff --git a/cc/scoped_thread_proxy.h b/cc/scoped_thread_proxy.h index 56d53c7..373c388 100644 --- a/cc/scoped_thread_proxy.h +++ b/cc/scoped_thread_proxy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScopedThreadProxy_h -#define CCScopedThreadProxy_h +#ifndef CC_SCOPED_THREAD_PROXY_H_ +#define CC_SCOPED_THREAD_PROXY_H_ #include "base/memory/ref_counted.h" #include "base/callback.h" @@ -51,4 +51,4 @@ private: } // namespace cc -#endif +#endif // CC_SCOPED_THREAD_PROXY_H_ diff --git a/cc/scrollbar_animation_controller.h b/cc/scrollbar_animation_controller.h index 6b64f9b..c26b464 100644 --- a/cc/scrollbar_animation_controller.h +++ b/cc/scrollbar_animation_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScrollbarAnimationController_h -#define CCScrollbarAnimationController_h +#ifndef CC_SCROLLBAR_ANIMATION_CONTROLLER_H_ +#define CC_SCROLLBAR_ANIMATION_CONTROLLER_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -65,4 +65,4 @@ private: } // namespace cc -#endif // CCScrollbarAnimationController_h +#endif // CC_SCROLLBAR_ANIMATION_CONTROLLER_H_ diff --git a/cc/scrollbar_animation_controller_linear_fade.h b/cc/scrollbar_animation_controller_linear_fade.h index 24cba76..804c1de 100644 --- a/cc/scrollbar_animation_controller_linear_fade.h +++ b/cc/scrollbar_animation_controller_linear_fade.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScrollbarAnimationControllerLinearFade_h -#define CCScrollbarAnimationControllerLinearFade_h +#ifndef CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ +#define CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ #include "cc/cc_export.h" #include "cc/scrollbar_animation_controller.h" @@ -37,4 +37,4 @@ private: } // namespace cc -#endif // CCScrollbarAnimationControllerLinearFade_h +#endif // CC_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ diff --git a/cc/scrollbar_geometry_fixed_thumb.h b/cc/scrollbar_geometry_fixed_thumb.h index 5ddacc1..1deed9d 100644 --- a/cc/scrollbar_geometry_fixed_thumb.h +++ b/cc/scrollbar_geometry_fixed_thumb.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScrollbarGeometryFixedThumb_h -#define CCScrollbarGeometryFixedThumb_h +#ifndef CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_ +#define CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_ #include "IntSize.h" #include "cc/cc_export.h" @@ -37,4 +37,4 @@ private: } -#endif +#endif // CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_ diff --git a/cc/scrollbar_geometry_stub.h b/cc/scrollbar_geometry_stub.h index 163ae51..597883a 100644 --- a/cc/scrollbar_geometry_stub.h +++ b/cc/scrollbar_geometry_stub.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScrollbarGeometryStub_h -#define CCScrollbarGeometryStub_h +#ifndef CC_SCROLLBAR_GEOMETRY_STUB_H_ +#define CC_SCROLLBAR_GEOMETRY_STUB_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -51,4 +51,4 @@ private: } -#endif +#endif // CC_SCROLLBAR_GEOMETRY_STUB_H_ diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h index ab0da73..dcadfc2 100644 --- a/cc/scrollbar_layer.h +++ b/cc/scrollbar_layer.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef ScrollbarLayerChromium_h -#define ScrollbarLayerChromium_h +#ifndef CC_SCROLLBAR_LAYER_H_ +#define CC_SCROLLBAR_LAYER_H_ #include "cc/caching_bitmap_content_layer_updater.h" #include "cc/cc_export.h" @@ -63,4 +63,4 @@ private: }; } -#endif +#endif // CC_SCROLLBAR_LAYER_H_ diff --git a/cc/scrollbar_layer_impl.h b/cc/scrollbar_layer_impl.h index ab197dc..f742972 100644 --- a/cc/scrollbar_layer_impl.h +++ b/cc/scrollbar_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCScrollbarLayerImpl_h -#define CCScrollbarLayerImpl_h +#ifndef CC_SCROLLBAR_LAYER_IMPL_H_ +#define CC_SCROLLBAR_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -108,4 +108,4 @@ private: }; } -#endif +#endif // CC_SCROLLBAR_LAYER_IMPL_H_ diff --git a/cc/settings.h b/cc/settings.h index 74de20b..1b8de7f 100644 --- a/cc/settings.h +++ b/cc/settings.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSettings_h -#define CCSettings_h +#ifndef CC_SETTINGS_H_ +#define CC_SETTINGS_H_ #include "cc/cc_export.h" @@ -32,4 +32,4 @@ public: } // namespace cc -#endif // Settings_h +#endif // CC_SETTINGS_H_ diff --git a/cc/shader.h b/cc/shader.h index 9bf11d5..a691712 100644 --- a/cc/shader.h +++ b/cc/shader.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ShaderChromium_h -#define ShaderChromium_h +#ifndef CC_SHADER_H_ +#define CC_SHADER_H_ #include "third_party/skia/include/core/SkColorPriv.h" #include <string> @@ -346,4 +346,4 @@ private: } // namespace cc -#endif +#endif // CC_SHADER_H_ diff --git a/cc/shared_quad_state.h b/cc/shared_quad_state.h index 4abc8c9..3d364c3 100644 --- a/cc/shared_quad_state.h +++ b/cc/shared_quad_state.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSharedQuadState_h -#define CCSharedQuadState_h +#ifndef CC_SHARED_QUAD_STATE_H_ +#define CC_SHARED_QUAD_STATE_H_ #include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h" @@ -31,4 +31,4 @@ struct CC_EXPORT SharedQuadState { } -#endif +#endif // CC_SHARED_QUAD_STATE_H_ diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h index fa3ce013..cc6ada3 100644 --- a/cc/single_thread_proxy.h +++ b/cc/single_thread_proxy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSingleThreadProxy_h -#define CCSingleThreadProxy_h +#ifndef CC_SINGLE_THREAD_PROXY_H_ +#define CC_SINGLE_THREAD_PROXY_H_ #include <limits> @@ -150,4 +150,4 @@ private: } // namespace cc -#endif +#endif // CC_SINGLE_THREAD_PROXY_H_ diff --git a/cc/skpicture_content_layer_updater.h b/cc/skpicture_content_layer_updater.h index 6f02c63..6a05972 100644 --- a/cc/skpicture_content_layer_updater.h +++ b/cc/skpicture_content_layer_updater.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef SkPictureContentLayerUpdater_h -#define SkPictureContentLayerUpdater_h +#ifndef CC_SKPICTURE_CONTENT_LAYER_UPDATER_H_ +#define CC_SKPICTURE_CONTENT_LAYER_UPDATER_H_ #include "cc/content_layer_updater.h" #include "third_party/skia/include/core/SkPicture.h" @@ -58,4 +58,4 @@ private: }; } // namespace cc -#endif // SkPictureContentLayerUpdater_h +#endif // CC_SKPICTURE_CONTENT_LAYER_UPDATER_H_ diff --git a/cc/software_renderer.h b/cc/software_renderer.h index 9cd2e97..f422662 100644 --- a/cc/software_renderer.h +++ b/cc/software_renderer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRendererSoftware_h -#define CCRendererSoftware_h +#ifndef CC_SOFTWARE_RENDERER_H_ +#define CC_SOFTWARE_RENDERER_H_ #include "base/basictypes.h" #include "cc/cc_export.h" @@ -80,4 +80,4 @@ private: } -#endif +#endif // CC_SOFTWARE_RENDERER_H_ diff --git a/cc/solid_color_draw_quad.h b/cc/solid_color_draw_quad.h index 490c9ed..587f94f 100644 --- a/cc/solid_color_draw_quad.h +++ b/cc/solid_color_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSolidColorDrawQuad_h -#define CCSolidColorDrawQuad_h +#ifndef CC_SOLID_COLOR_DRAW_QUAD_H_ +#define CC_SOLID_COLOR_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -31,4 +31,4 @@ private: } -#endif +#endif // CC_SOLID_COLOR_DRAW_QUAD_H_ diff --git a/cc/solid_color_layer.h b/cc/solid_color_layer.h index 45a1997..81dfd1f 100644 --- a/cc/solid_color_layer.h +++ b/cc/solid_color_layer.h @@ -3,8 +3,8 @@ // found in the LICENSE file. -#ifndef SolidColorLayerChromium_h -#define SolidColorLayerChromium_h +#ifndef CC_SOLID_COLOR_LAYER_H_ +#define CC_SOLID_COLOR_LAYER_H_ #include "cc/cc_export.h" #include "cc/layer.h" @@ -27,4 +27,4 @@ private: }; } -#endif +#endif // CC_SOLID_COLOR_LAYER_H_ diff --git a/cc/solid_color_layer_impl.h b/cc/solid_color_layer_impl.h index 4988097..c762c84 100644 --- a/cc/solid_color_layer_impl.h +++ b/cc/solid_color_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSolidColorLayerImpl_h -#define CCSolidColorLayerImpl_h +#ifndef CC_SOLID_COLOR_LAYER_IMPL_H_ +#define CC_SOLID_COLOR_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -32,4 +32,4 @@ private: } -#endif // CCSolidColorLayerImpl_h +#endif // CC_SOLID_COLOR_LAYER_IMPL_H_ diff --git a/cc/stream_video_draw_quad.h b/cc/stream_video_draw_quad.h index a9cb4e3..0dddf22 100644 --- a/cc/stream_video_draw_quad.h +++ b/cc/stream_video_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCStreamVideoDrawQuad_h -#define CCStreamVideoDrawQuad_h +#ifndef CC_STREAM_VIDEO_DRAW_QUAD_H_ +#define CC_STREAM_VIDEO_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -33,4 +33,4 @@ private: } -#endif +#endif // CC_STREAM_VIDEO_DRAW_QUAD_H_ diff --git a/cc/test/CCLayerTreeTestCommon.h b/cc/test/CCLayerTreeTestCommon.h deleted file mode 100644 index 1e9a473..0000000 --- a/cc/test/CCLayerTreeTestCommon.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CCLayerTreeTestCommon_h -#define CCLayerTreeTestCommon_h - -#include <public/WebTransformationMatrix.h> - -namespace WebKitTests { - -// These are macros instead of functions so that we get useful line numbers where a test failed. -#define EXPECT_FLOAT_RECT_EQ(expected, actual) \ - EXPECT_FLOAT_EQ((expected).location().x(), (actual).location().x()); \ - EXPECT_FLOAT_EQ((expected).location().y(), (actual).location().y()); \ - EXPECT_FLOAT_EQ((expected).size().width(), (actual).size().width()); \ - EXPECT_FLOAT_EQ((expected).size().height(), (actual).size().height()) - -#define EXPECT_INT_RECT_EQ(expected, actual) \ - EXPECT_EQ((expected).location().x(), (actual).location().x()); \ - EXPECT_EQ((expected).location().y(), (actual).location().y()); \ - EXPECT_EQ((expected).size().width(), (actual).size().width()); \ - EXPECT_EQ((expected).size().height(), (actual).size().height()) - -// This is a function rather than a macro because when this is included as a macro -// in bulk, it causes a significant slow-down in compilation time. This problem -// exists with both gcc and clang, and bugs have been filed at -// http://llvm.org/bugs/show_bug.cgi?id=13651 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54337 -void ExpectTransformationMatrixEq(WebKit::WebTransformationMatrix expected, - WebKit::WebTransformationMatrix actual); - -#define EXPECT_TRANSFORMATION_MATRIX_EQ(expected, actual) \ - { \ - SCOPED_TRACE(""); \ - WebKitTests::ExpectTransformationMatrixEq(expected, actual); \ - } - -} // namespace - -#endif // CCLayerTreeTestCommon_h diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h index 7b512d7..bdce62c 100644 --- a/cc/test/animation_test_common.h +++ b/cc/test/animation_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCAnimationTestCommon_h -#define CCAnimationTestCommon_h +#ifndef CC_TEST_ANIMATION_TEST_COMMON_H_ +#define CC_TEST_ANIMATION_TEST_COMMON_H_ #include "cc/active_animation.h" #include "cc/animation_curve.h" @@ -88,4 +88,4 @@ void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, in } // namespace WebKitTests -#endif // CCAnimationTesctCommon_h +#endif // CC_TEST_ANIMATION_TEST_COMMON_H_ diff --git a/cc/test/compositor_fake_web_graphics_context_3d.h b/cc/test/compositor_fake_web_graphics_context_3d.h index 839f5d4..7a9c496 100644 --- a/cc/test/compositor_fake_web_graphics_context_3d.h +++ b/cc/test/compositor_fake_web_graphics_context_3d.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CompositorFakeWebGraphicsContext3D_h -#define CompositorFakeWebGraphicsContext3D_h +#ifndef CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ +#define CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ #include "base/memory/scoped_ptr.h" #include "cc/test/fake_web_graphics_context_3d.h" @@ -33,4 +33,4 @@ protected: } -#endif +#endif // CC_TEST_COMPOSITOR_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ diff --git a/cc/test/fake_graphics_context.h b/cc/test/fake_graphics_context.h index 7fdb38a..aecfcc4 100644 --- a/cc/test/fake_graphics_context.h +++ b/cc/test/fake_graphics_context.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeCCGraphicsContext_h -#define FakeCCGraphicsContext_h +#ifndef CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ +#define CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ #include "cc/graphics_context.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" @@ -19,4 +19,4 @@ static inline scoped_ptr<cc::GraphicsContext> createFakeGraphicsContext() } // namespace WebKit -#endif // FakeCCGraphicsContext_h +#endif // CC_TEST_FAKE_GRAPHICS_CONTEXT_H_ diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index 2cdf93c..8140495 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -1,8 +1,8 @@ // Copyright 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeCCLayerTreeHostClient_h -#define FakeCCLayerTreeHostClient_h +#ifndef CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ +#define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ #include "config.h" @@ -35,4 +35,4 @@ public: }; } -#endif // FakeCCLayerTreeHostClient_h +#endif // CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ diff --git a/cc/test/fake_web_compositor_output_surface.h b/cc/test/fake_web_compositor_output_surface.h index d4b1ec5..3cd5b80 100644 --- a/cc/test/fake_web_compositor_output_surface.h +++ b/cc/test/fake_web_compositor_output_surface.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeWebCompositorOutputSurface_h -#define FakeWebCompositorOutputSurface_h +#ifndef CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_ +#define CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_ #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -73,4 +73,4 @@ private: } // namespace WebKit -#endif // FakeWebCompositorOutputSurface_h +#endif // CC_TEST_FAKE_WEB_COMPOSITOR_OUTPUT_SURFACE_H_ diff --git a/cc/test/fake_web_compositor_software_output_device.h b/cc/test/fake_web_compositor_software_output_device.h index b71adee..6b17a5d 100644 --- a/cc/test/fake_web_compositor_software_output_device.h +++ b/cc/test/fake_web_compositor_software_output_device.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeWebCompositorSoftwareOutputDevice_h -#define FakeWebCompositorSoftwareOutputDevice_h +#ifndef CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_ +#define CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_ #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -42,4 +42,4 @@ private: } // namespace WebKit -#endif // FakeWebCompositorSoftwareOutputDevice_h +#endif // CC_TEST_FAKE_WEB_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_H_ diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h index 7d4b62c..bb8e893 100644 --- a/cc/test/fake_web_graphics_context_3d.h +++ b/cc/test/fake_web_graphics_context_3d.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeWebGraphicsContext3D_h -#define FakeWebGraphicsContext3D_h +#ifndef CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ +#define CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ #include "third_party/khronos/GLES2/gl2.h" #include <public/WebGraphicsContext3D.h> @@ -257,4 +257,4 @@ protected: } // namespace WebKit -#endif // FakeWebGraphicsContext3D_h +#endif // CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_ diff --git a/cc/test/fake_web_scrollbar_theme_geometry.h b/cc/test/fake_web_scrollbar_theme_geometry.h index faab980..cbff58e 100644 --- a/cc/test/fake_web_scrollbar_theme_geometry.h +++ b/cc/test/fake_web_scrollbar_theme_geometry.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FakeWebScrollbarThemeGeometry_h -#define FakeWebScrollbarThemeGeometry_h +#ifndef CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_ +#define CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_ #include <public/WebScrollbarThemeGeometry.h> @@ -44,4 +44,4 @@ public: } // namespace WebKit -#endif // FakeWebScrollbarThemeGeometry_h +#endif // CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_ diff --git a/cc/test/geometry_test_utils.h b/cc/test/geometry_test_utils.h index 9eaf52a..7877a64 100644 --- a/cc/test/geometry_test_utils.h +++ b/cc/test/geometry_test_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCGeometryTestUtils_h -#define CCGeometryTestUtils_h +#ifndef CC_TEST_GEOMETRY_TEST_UTILS_H_ +#define CC_TEST_GEOMETRY_TEST_UTILS_H_ namespace WebKit { class WebTransformationMatrix; @@ -55,4 +55,4 @@ void ExpectTransformationMatrixEq(const WebKit::WebTransformationMatrix& expecte } // namespace WebKitTests -#endif // CCGeometryTestUtils_h +#endif // CC_TEST_GEOMETRY_TEST_UTILS_H_ diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h index 4b32d82..7b6309f 100644 --- a/cc/test/layer_test_common.h +++ b/cc/test/layer_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCLayerTestCommon_h -#define CCLayerTestCommon_h +#ifndef CC_TEST_LAYER_TEST_COMMON_H_ +#define CC_TEST_LAYER_TEST_COMMON_H_ namespace cc { class QuadList; @@ -20,4 +20,4 @@ extern const char* quadString; void verifyQuadsExactlyCoverRect(const cc::QuadList&, const gfx::Rect&); } // namespace LayerTestCommon -#endif // CCLayerTestCommon_h +#endif // CC_TEST_LAYER_TEST_COMMON_H_ diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h index b0f277b..e33480f 100644 --- a/cc/test/layer_tree_test_common.h +++ b/cc/test/layer_tree_test_common.h @@ -207,4 +207,4 @@ private: runTest(true); \ } -#endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ +#endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_ diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h index 7292387..2f15dcc 100644 --- a/cc/test/mock_quad_culler.h +++ b/cc/test/mock_quad_culler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MockCCQuadCuller_h -#define MockCCQuadCuller_h +#ifndef CC_TEST_MOCK_QUAD_CULLER_H_ +#define CC_TEST_MOCK_QUAD_CULLER_H_ #include "base/memory/scoped_ptr.h" #include "cc/draw_quad.h" @@ -35,4 +35,4 @@ private: } // namespace cc -#endif // MockCCQuadCuller_h +#endif // CC_TEST_MOCK_QUAD_CULLER_H_ diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h index c515155..7619ad8 100644 --- a/cc/test/occlusion_tracker_test_common.h +++ b/cc/test/occlusion_tracker_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCOcclusionTrackerTestCommon_h -#define CCOcclusionTrackerTestCommon_h +#ifndef CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_ +#define CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_ #include "Region.h" #include "cc/occlusion_tracker.h" @@ -33,4 +33,4 @@ typedef TestOcclusionTrackerBase<cc::LayerImpl, cc::RenderSurfaceImpl> TestOcclu } -#endif // CCOcclusionTrackerTestCommon_h +#endif // CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_ diff --git a/cc/test/render_pass_test_common.h b/cc/test/render_pass_test_common.h index d9c137c..a77747e5 100644 --- a/cc/test/render_pass_test_common.h +++ b/cc/test/render_pass_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCRenderPassTestCommon_h -#define CCRenderPassTestCommon_h +#ifndef CC_TEST_RENDER_PASS_TEST_COMMON_H_ +#define CC_TEST_RENDER_PASS_TEST_COMMON_H_ #include "cc/render_pass.h" @@ -28,4 +28,4 @@ protected: } // namespace WebKitTests -#endif // CCRenderPassTestCommon_h +#endif // CC_TEST_RENDER_PASS_TEST_COMMON_H_ diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index e43e4b8..af1bd32 100644 --- a/cc/test/scheduler_test_common.h +++ b/cc/test/scheduler_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCSchedulerTestCommon_h -#define CCSchedulerTestCommon_h +#ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_ +#define CC_TEST_SCHEDULER_TEST_COMMON_H_ #include "base/memory/scoped_ptr.h" #include "cc/delay_based_time_source.h" @@ -122,4 +122,4 @@ public: } -#endif // CCSchedulerTestCommon_h +#endif // CC_TEST_SCHEDULER_TEST_COMMON_H_ diff --git a/cc/test/test_common.h b/cc/test/test_common.h index 9c6c0ce..eea843f 100644 --- a/cc/test/test_common.h +++ b/cc/test/test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTestCommon_h -#define CCTestCommon_h +#ifndef CC_TEST_TEST_COMMON_H_ +#define CC_TEST_TEST_COMMON_H_ #include "cc/settings.h" @@ -19,4 +19,4 @@ public: } // namespace WebKitTests -#endif // CCTestCommon_h +#endif // CC_TEST_TEST_COMMON_H_ diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index 2b95222..2b0f13b 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTiledLayerTestCommon_h -#define CCTiledLayerTestCommon_h +#ifndef CC_TEST_TILED_LAYER_TEST_COMMON_H_ +#define CC_TEST_TILED_LAYER_TEST_COMMON_H_ #include "Region.h" #include "cc/layer_updater.h" @@ -126,4 +126,4 @@ protected: }; } -#endif // CCTiledLayerTestCommon_h +#endif // CC_TEST_TILED_LAYER_TEST_COMMON_H_ diff --git a/cc/texture.h b/cc/texture.h index b0b8e31..cd9df1d 100644 --- a/cc/texture.h +++ b/cc/texture.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTexture_h -#define CCTexture_h +#ifndef CC_TEXTURE_H_ +#define CC_TEXTURE_H_ #include "cc/cc_export.h" #include "cc/resource_provider.h" @@ -40,4 +40,4 @@ private: } -#endif +#endif // CC_TEXTURE_H_ diff --git a/cc/texture_copier.h b/cc/texture_copier.h index 535208c..458a363 100644 --- a/cc/texture_copier.h +++ b/cc/texture_copier.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TextureCopier_h -#define TextureCopier_h +#ifndef CC_TEXTURE_COPIER_H_ +#define CC_TEXTURE_COPIER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -63,4 +63,4 @@ private: } -#endif +#endif // CC_TEXTURE_COPIER_H_ diff --git a/cc/texture_draw_quad.h b/cc/texture_draw_quad.h index 44e74d2..0d64138 100644 --- a/cc/texture_draw_quad.h +++ b/cc/texture_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTextureDrawQuad_h -#define CCTextureDrawQuad_h +#ifndef CC_TEXTURE_DRAW_QUAD_H_ +#define CC_TEXTURE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -39,4 +39,4 @@ private: } -#endif +#endif // CC_TEXTURE_DRAW_QUAD_H_ diff --git a/cc/texture_layer.h b/cc/texture_layer.h index b5dad08..cfa5ddb 100644 --- a/cc/texture_layer.h +++ b/cc/texture_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TextureLayerChromium_h -#define TextureLayerChromium_h +#ifndef CC_TEXTURE_LAYER_H_ +#define CC_TEXTURE_LAYER_H_ #include "cc/cc_export.h" #include "cc/layer.h" @@ -72,4 +72,4 @@ private: }; } -#endif +#endif // CC_TEXTURE_LAYER_H_ diff --git a/cc/texture_layer_client.h b/cc/texture_layer_client.h index 9ebc8d5..ec3447f 100644 --- a/cc/texture_layer_client.h +++ b/cc/texture_layer_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TextureLayerChromiumClient_h -#define TextureLayerChromiumClient_h +#ifndef CC_TEXTURE_LAYER_CLIENT_H_ +#define CC_TEXTURE_LAYER_CLIENT_H_ namespace WebKit { class WebGraphicsContext3D; @@ -28,4 +28,4 @@ protected: } -#endif // TextureLayerChromiumClient_h +#endif // CC_TEXTURE_LAYER_CLIENT_H_ diff --git a/cc/texture_layer_impl.h b/cc/texture_layer_impl.h index 4283810..c2e4fff 100644 --- a/cc/texture_layer_impl.h +++ b/cc/texture_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTextureLayerImpl_h -#define CCTextureLayerImpl_h +#ifndef CC_TEXTURE_LAYER_IMPL_H_ +#define CC_TEXTURE_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -46,4 +46,4 @@ private: } -#endif // CCTextureLayerImpl_h +#endif // CC_TEXTURE_LAYER_IMPL_H_ diff --git a/cc/thread.h b/cc/thread.h index c05d75a..c9f01a9 100644 --- a/cc/thread.h +++ b/cc/thread.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCThread_h -#define CCThread_h +#ifndef CC_THREAD_H_ +#define CC_THREAD_H_ #include "base/callback.h" #include "base/basictypes.h" @@ -28,4 +28,4 @@ public: } -#endif +#endif // CC_THREAD_H_ diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h index 5ccedc1..3638bc1 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCThreadProxy_h -#define CCThreadProxy_h +#ifndef CC_THREAD_PROXY_H_ +#define CC_THREAD_PROXY_H_ #include "base/memory/scoped_ptr.h" #include "base/time.h" @@ -181,4 +181,4 @@ private: } // namespace cc -#endif +#endif // CC_THREAD_PROXY_H_ diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h index 2380c04..c5a05ca 100644 --- a/cc/tile_draw_quad.h +++ b/cc/tile_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTileDrawQuad_h -#define CCTileDrawQuad_h +#ifndef CC_TILE_DRAW_QUAD_H_ +#define CC_TILE_DRAW_QUAD_H_ #include "base/memory/scoped_ptr.h" #include "cc/cc_export.h" @@ -52,4 +52,4 @@ private: } -#endif +#endif // CC_TILE_DRAW_QUAD_H_ diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h index bc8fef5..2fc5fca 100644 --- a/cc/tiled_layer.h +++ b/cc/tiled_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TiledLayerChromium_h -#define TiledLayerChromium_h +#ifndef CC_TILED_LAYER_H_ +#define CC_TILED_LAYER_H_ #include "cc/cc_export.h" #include "cc/contents_scaling_layer.h" @@ -101,4 +101,4 @@ private: }; } -#endif +#endif // CC_TILED_LAYER_H_ diff --git a/cc/tiled_layer_impl.h b/cc/tiled_layer_impl.h index 2b78039..e4870e6 100644 --- a/cc/tiled_layer_impl.h +++ b/cc/tiled_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTiledLayerImpl_h -#define CCTiledLayerImpl_h +#ifndef CC_TILED_LAYER_IMPL_H_ +#define CC_TILED_LAYER_IMPL_H_ #include "cc/cc_export.h" #include "cc/layer_impl.h" @@ -56,4 +56,4 @@ private: } -#endif // CCTiledLayerImpl_h +#endif // CC_TILED_LAYER_IMPL_H_ diff --git a/cc/time_source.h b/cc/time_source.h index e80a465..54149af 100644 --- a/cc/time_source.h +++ b/cc/time_source.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTimeSource_h -#define CCTimeSource_h +#ifndef CC_TIME_SOURCE_H_ +#define CC_TIME_SOURCE_H_ #include "base/memory/ref_counted.h" #include "base/time.h" @@ -43,4 +43,4 @@ private: }; } -#endif // CCTimeSource_h +#endif // CC_TIME_SOURCE_H_ diff --git a/cc/timing_function.h b/cc/timing_function.h index 967dd13..df9e7ef 100644 --- a/cc/timing_function.h +++ b/cc/timing_function.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCTimingFunction_h -#define CCTimingFunction_h +#ifndef CC_TIMING_FUNCTION_H_ +#define CC_TIMING_FUNCTION_H_ #include "UnitBezier.h" #include "cc/animation_curve.h" @@ -60,4 +60,4 @@ public: } // namespace cc -#endif // CCTimingFunction_h +#endif // CC_TIMING_FUNCTION_H_ diff --git a/cc/tree_synchronizer.h b/cc/tree_synchronizer.h index 61d55ae..8974882 100644 --- a/cc/tree_synchronizer.h +++ b/cc/tree_synchronizer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TreeSynchronizer_h -#define TreeSynchronizer_h +#ifndef CC_TREE_SYNCHRONIZER_H_ +#define CC_TREE_SYNCHRONIZER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -39,4 +39,4 @@ private: } // namespace cc -#endif // TreeSynchronizer_h +#endif // CC_TREE_SYNCHRONIZER_H_ diff --git a/cc/video_layer.h b/cc/video_layer.h index 9440219..0e86839 100644 --- a/cc/video_layer.h +++ b/cc/video_layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VideoLayerChromium_h -#define VideoLayerChromium_h +#ifndef CC_VIDEO_LAYER_H_ +#define CC_VIDEO_LAYER_H_ #include "base/callback.h" #include "cc/cc_export.h" @@ -43,4 +43,4 @@ private: } // namespace cc -#endif +#endif // CC_VIDEO_LAYER_H_ diff --git a/cc/video_layer_impl.h b/cc/video_layer_impl.h index ba300e5..03bf736 100644 --- a/cc/video_layer_impl.h +++ b/cc/video_layer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCVideoLayerImpl_h -#define CCVideoLayerImpl_h +#ifndef CC_VIDEO_LAYER_IMPL_H_ +#define CC_VIDEO_LAYER_IMPL_H_ #include "base/callback.h" #include "base/synchronization/lock.h" @@ -99,4 +99,4 @@ private: } // namespace cc -#endif // CCVideoLayerImpl_h +#endif // CC_VIDEO_LAYER_IMPL_H_ diff --git a/cc/yuv_video_draw_quad.h b/cc/yuv_video_draw_quad.h index 3b26c31..6894c95 100644 --- a/cc/yuv_video_draw_quad.h +++ b/cc/yuv_video_draw_quad.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CCYUVVideoDrawQuad_h -#define CCYUVVideoDrawQuad_h +#ifndef CC_YUV_VIDEO_DRAW_QUAD_H_ +#define CC_YUV_VIDEO_DRAW_QUAD_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -32,4 +32,4 @@ private: } -#endif +#endif // CC_YUV_VIDEO_DRAW_QUAD_H_ |