Remove USE(ACCELERATED_COMPOSITING) references from cc

This isn't needed.

BUG=

Review URL: https://codereview.chromium.org/10957055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161885 0039d316-1c4b-4281-b951-d872f2087c98

76 files changed, 1 insertions, 264 deletions

diff --git a/cc/bitmap_canvas_layer_texture_updater.cc b/cc/bitmap_canvas_layer_texture_updater.cc
index a83c77b..6afc8a3 100644
--- a/cc/bitmap_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_canvas_layer_texture_updater.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "BitmapCanvasLayerTextureUpdater.h"
 
 #include "CCTextureUpdateQueue.h"
@@ -87,4 +85,3 @@ void BitmapCanvasLayerTextureUpdater::setOpaque(bool opaque)
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/bitmap_canvas_layer_texture_updater.h b/cc/bitmap_canvas_layer_texture_updater.h
index 9214b84..97564d6 100644
--- a/cc/bitmap_canvas_layer_texture_updater.h
+++ b/cc/bitmap_canvas_layer_texture_updater.h
@@ -6,8 +6,6 @@
 #ifndef BitmapCanvasLayerTextureUpdater_h
 #define BitmapCanvasLayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CanvasLayerTextureUpdater.h"
 
 class SkCanvas;
@@ -53,5 +51,4 @@ protected:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // BitmapCanvasLayerTextureUpdater_h
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
index a3c06c3..d6a2862 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "BitmapSkPictureCanvasLayerTextureUpdater.h"
 
 #include "CCRenderingStats.h"
@@ -80,4 +78,3 @@ void BitmapSkPictureCanvasLayerTextureUpdater::paintContentsRect(SkCanvas* canva
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.h b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
index 844673a..a4d62d1 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.h
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
@@ -6,7 +6,6 @@
 #ifndef BitmapSkPictureCanvasLayerTextureUpdater_h
 #define BitmapSkPictureCanvasLayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "SkBitmap.h"
 #include "SkPictureCanvasLayerTextureUpdater.h"
 
@@ -40,5 +39,4 @@ private:
     explicit BitmapSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 };
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // BitmapSkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc
index eae5d16a..29d4a2b 100644
--- a/cc/canvas_layer_texture_updater.cc
+++ b/cc/canvas_layer_texture_updater.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CanvasLayerTextureUpdater.h"
 
 #include "CCRenderingStats.h"
@@ -67,4 +65,3 @@ void CanvasLayerTextureUpdater::paintContents(SkCanvas* canvas, const IntRect& c
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/canvas_layer_texture_updater.h b/cc/canvas_layer_texture_updater.h
index c8bb9b0..056d716 100644
--- a/cc/canvas_layer_texture_updater.h
+++ b/cc/canvas_layer_texture_updater.h
@@ -6,8 +6,6 @@
 #ifndef CanvasLayerTextureUpdater_h
 #define CanvasLayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerTextureUpdater.h"
 
 class SkCanvas;
@@ -35,5 +33,4 @@ private:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // CanvasLayerTextureUpdater_h
diff --git a/cc/cc.gyp b/cc/cc.gyp
index be5b960..495739c 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -364,7 +364,6 @@
             '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
           ],
           'defines': [
-            'WTF_USE_ACCELERATED_COMPOSITING=1',
             # http://crbug.com/154052
             'WEBKIT_GLUE_IMPLEMENTATION=1',
           ],
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 215f34b..2834a0a 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -125,7 +125,6 @@
           ],
           'defines': [
             'USE_LIBCC_FOR_COMPOSITOR',
-            'WTF_USE_ACCELERATED_COMPOSITING=1',
           ],
           'include_dirs': [
             'stubs',
@@ -146,9 +145,6 @@
         {
           'target_name': 'cc_test_support',
           'type': 'static_library',
-          'defines': [
-            'WTF_USE_ACCELERATED_COMPOSITING=1',
-          ],
           'include_dirs': [
             'stubs',
             'test',
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index ee8277b..03e268b 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ContentLayerChromium.h"
 
 #include "base/time.h"
@@ -110,4 +108,3 @@ void ContentLayerChromium::setContentsOpaque(bool opaque)
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/content_layer.h b/cc/content_layer.h
index b8ac462..1a1134b 100644
--- a/cc/content_layer.h
+++ b/cc/content_layer.h
@@ -6,8 +6,6 @@
 #ifndef ContentLayerChromium_h
 #define ContentLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "LayerPainterChromium.h"
 #include "TiledLayerChromium.h"
@@ -62,6 +60,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
index bd1c31f..bde0419 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCDamageTracker.h"
 
 #include "CCLayerImpl.h"
@@ -346,4 +344,3 @@ void CCDamageTracker::extendDamageForRenderSurface(CCLayerImpl* layer, FloatRect
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc
index d6f6133..17fda21 100644
--- a/cc/debug_rect_history.cc
+++ b/cc/debug_rect_history.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "CCDebugRectHistory.h"
 
 #include "CCDamageTracker.h"
@@ -122,4 +121,3 @@ void CCDebugRectHistory::saveOccludingRects(const Vector<IntRect>& occludingRect
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/debug_rect_history.h b/cc/debug_rect_history.h
index d9ca449..f193c64 100644
--- a/cc/debug_rect_history.h
+++ b/cc/debug_rect_history.h
@@ -5,8 +5,6 @@
 #ifndef CCDebugRectHistory_h
 #define CCDebugRectHistory_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "FloatRect.h"
@@ -79,6 +77,4 @@ private:
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index 8be8b63..4681374 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "CCFontAtlas.h"
 
 #include "base/string_split.h"
@@ -69,5 +68,3 @@ void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const gfx::Point& destPositio
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/font_atlas.h b/cc/font_atlas.h
index 2881ee9..d86ff8e 100644
--- a/cc/font_atlas.h
+++ b/cc/font_atlas.h
@@ -5,8 +5,6 @@
 #ifndef CCFontAtlas_h
 #define CCFontAtlas_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <string>
 
 #include "base/basictypes.h"
@@ -65,6 +63,4 @@ private:
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
index 26a538d..7c38103 100644
--- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
 
 #include "LayerPainterChromium.h"
@@ -54,4 +52,3 @@ LayerTextureUpdater::SampledTexelFormat FrameBufferSkPictureCanvasLayerTextureUp
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
index 953bdd0..3a3376d 100644
--- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
+++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
@@ -6,8 +6,6 @@
 #ifndef FrameBufferSkPictureCanvasLayerTextureUpdater_h
 #define FrameBufferSkPictureCanvasLayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "SkPictureCanvasLayerTextureUpdater.h"
 
 namespace cc {
@@ -40,5 +38,4 @@ private:
     explicit FrameBufferSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 };
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // FrameBufferSkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index e145c87..a02486b 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "CCFrameRateCounter.h"
 
 #include <cmath>
@@ -134,4 +133,3 @@ base::TimeTicks CCFrameRateCounter::timeStampOfRecentFrame(int n)
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/frame_rate_counter.h b/cc/frame_rate_counter.h
index d3247a3..3196c28 100644
--- a/cc/frame_rate_counter.h
+++ b/cc/frame_rate_counter.h
@@ -5,8 +5,6 @@
 #ifndef CCFrameRateCounter_h
 #define CCFrameRateCounter_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
@@ -65,6 +63,4 @@ private:
 
 }  // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
index bac1059..8656a48 100644
--- a/cc/geometry_binding.cc
+++ b/cc/geometry_binding.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GeometryBinding.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
@@ -57,5 +55,3 @@ void GeometryBinding::prepareForDraw()
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/geometry_binding.h b/cc/geometry_binding.h
index f0b6e72..0c36a15 100644
--- a/cc/geometry_binding.h
+++ b/cc/geometry_binding.h
@@ -7,8 +7,6 @@
 
 #include "FloatRect.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 namespace WebKit {
 class WebGraphicsContext3D;
 }
@@ -43,6 +41,4 @@ private:
 
 } // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index f28cc50..db0c694 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -5,7 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "CCRendererGL.h"
 
 #include "CCDamageTracker.h"
@@ -1526,5 +1525,3 @@ bool CCRendererGL::isContextLost()
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index a5f2c4f..22bc341 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -6,8 +6,6 @@
 #ifndef CCRendererGL_h
 #define CCRendererGL_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
@@ -235,6 +233,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 4b48bad..286ee8b 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ImageLayerChromium.h"
 
 #include "base/compiler_specific.h"
@@ -164,4 +162,3 @@ bool ImageLayerChromium::needsContentsScale() const
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/image_layer.h b/cc/image_layer.h
index 12ac397..79e6da7 100644
--- a/cc/image_layer.h
+++ b/cc/image_layer.h
@@ -6,8 +6,6 @@
 #ifndef ImageLayerChromium_h
 #define ImageLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ContentLayerChromium.h"
 #include "SkBitmap.h"
 
@@ -43,6 +41,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/io_surface_layer.cc b/cc/io_surface_layer.cc
index fe6d39a..db1f1a7 100644
--- a/cc/io_surface_layer.cc
+++ b/cc/io_surface_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "IOSurfaceLayerChromium.h"
 
 #include "CCIOSurfaceLayerImpl.h"
@@ -53,4 +51,3 @@ void IOSurfaceLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/io_surface_layer.h b/cc/io_surface_layer.h
index f9c4b5f..7eb44fe 100644
--- a/cc/io_surface_layer.h
+++ b/cc/io_surface_layer.h
@@ -6,8 +6,6 @@
 #ifndef IOSurfaceLayerChromium_h
 #define IOSurfaceLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerChromium.h"
 
 namespace cc {
@@ -33,6 +31,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index 689a003..9d9ee72 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCIOSurfaceLayerImpl.h"
 
 #include "base/stringprintf.h"
@@ -114,5 +112,3 @@ const char* CCIOSurfaceLayerImpl::layerTypeAsString() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer.cc b/cc/layer.cc
index dc3bd67..7c4adf9 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "LayerChromium.h"
 
 #include "CCActiveAnimation.h"
@@ -796,4 +795,3 @@ void sortLayers(std::vector<scoped_refptr<LayerChromium> >::iterator, std::vecto
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer.h b/cc/layer.h
index a87caa0..7d1e484 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -6,8 +6,6 @@
 #ifndef LayerChromium_h
 #define LayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/memory/ref_counted.h"
 #include "CCLayerAnimationController.h"
 #include "CCOcclusionTracker.h"
@@ -385,6 +383,4 @@ private:
 void sortLayers(std::vector<scoped_refptr<LayerChromium> >::iterator, std::vector<scoped_refptr<LayerChromium> >::iterator, void*);
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 16c9356..6d513a2 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerImpl.h"
 
 #include "base/stringprintf.h"
@@ -680,6 +678,3 @@ void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer
 }
 
 }
-
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer_iterator.cc b/cc/layer_iterator.cc
index 71fde80..f9f1968 100644
--- a/cc/layer_iterator.cc
+++ b/cc/layer_iterator.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerIterator.h"
 
 #include "CCLayerImpl.h"
@@ -149,5 +147,3 @@ template void CCLayerIteratorActions::FrontToBack::begin(CCLayerIterator<CCLayer
 template void CCLayerIteratorActions::FrontToBack::goToHighestInSubtree(CCLayerIterator<CCLayerImpl, CCLayerImplList, CCRenderSurface, FrontToBack>&);
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer_painter.h b/cc/layer_painter.h
index d552382..14424d1 100644
--- a/cc/layer_painter.h
+++ b/cc/layer_painter.h
@@ -6,8 +6,6 @@
 #ifndef LayerPainterChromium_h
 #define LayerPainterChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 class SkCanvas;
 
 namespace cc {
@@ -22,5 +20,4 @@ public:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerPainterChromium_h
diff --git a/cc/layer_quad.cc b/cc/layer_quad.cc
index 9642622..08c16bb 100644
--- a/cc/layer_quad.cc
+++ b/cc/layer_quad.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerQuad.h"
 
 namespace cc {
@@ -70,5 +68,3 @@ void CCLayerQuad::toFloatArray(float flattened[12]) const
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer_quad.h b/cc/layer_quad.h
index 8be296f..d468495 100644
--- a/cc/layer_quad.h
+++ b/cc/layer_quad.h
@@ -6,8 +6,6 @@
 #ifndef CCLayerQuad_h
 #define CCLayerQuad_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "FloatPoint3D.h"
 #include "FloatQuad.h"
 
@@ -101,6 +99,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/layer_texture_sub_image.cc b/cc/layer_texture_sub_image.cc
index 60f5311..15a876a 100644
--- a/cc/layer_texture_sub_image.cc
+++ b/cc/layer_texture_sub_image.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerTextureSubImage.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
@@ -113,5 +111,3 @@ void LayerTextureSubImage::uploadWithMapTexSubImage(const uint8_t* image, const
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer_texture_sub_image.h b/cc/layer_texture_sub_image.h
index 2c6cc14..7cfe367 100644
--- a/cc/layer_texture_sub_image.h
+++ b/cc/layer_texture_sub_image.h
@@ -6,8 +6,6 @@
 #ifndef LayerTextureSubImage_h
 #define LayerTextureSubImage_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsTypes3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
@@ -42,5 +40,4 @@ private:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerTextureSubImage_h
diff --git a/cc/layer_texture_updater.h b/cc/layer_texture_updater.h
index 3b13dca..7ded543 100644
--- a/cc/layer_texture_updater.h
+++ b/cc/layer_texture_updater.h
@@ -6,8 +6,6 @@
 #ifndef LayerTextureUpdater_h
 #define LayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCPrioritizedTexture.h"
 #include "GraphicsTypes3D.h"
 #include <wtf/RefCounted.h>
@@ -66,5 +64,4 @@ public:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerTextureUpdater_h
diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc
index 12c7aef..331589c 100644
--- a/cc/layer_tiling_data.cc
+++ b/cc/layer_tiling_data.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerTilingData.h"
 
 using namespace std;
@@ -154,5 +152,3 @@ IntSize CCLayerTilingData::bounds() const
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/layer_tiling_data.h b/cc/layer_tiling_data.h
index c73f057..19921d0 100644
--- a/cc/layer_tiling_data.h
+++ b/cc/layer_tiling_data.h
@@ -6,8 +6,6 @@
 #ifndef CCLayerTilingData_h
 #define CCLayerTilingData_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "IntRect.h"
 #include "Region.h"
@@ -96,6 +94,4 @@ protected:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/occlusion_tracker.cc b/cc/occlusion_tracker.cc
index bedb80c..debc511 100644
--- a/cc/occlusion_tracker.cc
+++ b/cc/occlusion_tracker.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCOcclusionTracker.h"
 
 #include "CCLayerImpl.h"
@@ -479,4 +477,3 @@ template IntRect CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::layerClip
 
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index 4eba7d3..8c43dec 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCOverdrawMetrics.h"
 
 #include "CCLayerTreeHost.h"
@@ -186,5 +184,3 @@ void CCOverdrawMetrics::recordMetricsInternal(MetricsType metricsType, const Lay
 }
 
 } // namespace cc
-
-#endif
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index 27d5226..4d88aa3 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ProgramBinding.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
@@ -143,5 +141,3 @@ void ProgramBindingBase::cleanupShaders(WebGraphicsContext3D* context)
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/program_binding.h b/cc/program_binding.h
index 9f0d067..28f628c 100644
--- a/cc/program_binding.h
+++ b/cc/program_binding.h
@@ -5,8 +5,6 @@
 #ifndef ProgramBinding_h
 #define ProgramBinding_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <string>
 
 namespace WebKit {
@@ -79,6 +77,4 @@ private:
 
 } // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index 8955a98..bb854ba 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCQuadCuller.h"
 
 #include "CCAppendQuadsData.h"
@@ -91,4 +89,3 @@ bool CCQuadCuller::append(scoped_ptr<CCDrawQuad> drawQuad, CCAppendQuadsData& ap
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index a521525..f4e8a55 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "RateLimiter.h"
 
 #include "CCProxy.h"
@@ -84,4 +83,3 @@ void RateLimiter::rateLimitContext()
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/rate_limiter.h b/cc/rate_limiter.h
index 7b48d74..1630864 100644
--- a/cc/rate_limiter.h
+++ b/cc/rate_limiter.h
@@ -5,8 +5,6 @@
 #ifndef RateLimiter_h
 #define RateLimiter_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/memory/ref_counted.h"
 
 namespace WebKit {
@@ -48,6 +46,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/render_surface.cc b/cc/render_surface.cc
index 320a3d8..f855d1a 100644
--- a/cc/render_surface.cc
+++ b/cc/render_surface.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "RenderSurfaceChromium.h"
 
 #include "CCMathUtil.h"
@@ -39,4 +37,3 @@ FloatRect RenderSurfaceChromium::drawableContentRect() const
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/render_surface.h b/cc/render_surface.h
index 67ed626..cd3ea6f 100644
--- a/cc/render_surface.h
+++ b/cc/render_surface.h
@@ -6,8 +6,6 @@
 #ifndef RenderSurfaceChromium_h
 #define RenderSurfaceChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "FloatRect.h"
@@ -102,6 +100,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc
index 40344c6..afe55d0 100644
--- a/cc/render_surface_filters.cc
+++ b/cc/render_surface_filters.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCRenderSurfaceFilters.h"
 
 #include "FloatSize.h"
@@ -443,4 +441,3 @@ SkBitmap CCRenderSurfaceFilters::apply(const WebKit::WebFilterOperations& filter
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/render_surface_filters.h b/cc/render_surface_filters.h
index cd199b5..b8cf60e 100644
--- a/cc/render_surface_filters.h
+++ b/cc/render_surface_filters.h
@@ -6,8 +6,6 @@
 #ifndef CCRenderSurfaceFilters_h
 #define CCRenderSurfaceFilters_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 class GrContext;
 class SkBitmap;
 
@@ -29,6 +27,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index f10c83b..e5f0324 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCRenderSurface.h"
 
 #include "base/stringprintf.h"
@@ -250,4 +248,3 @@ void CCRenderSurface::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appen
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h
index afdf062..06528cc 100644
--- a/cc/render_surface_impl.h
+++ b/cc/render_surface_impl.h
@@ -5,8 +5,6 @@
 #ifndef CCRenderSurface_h
 #define CCRenderSurface_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "CCRenderPass.h"
@@ -127,6 +125,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index 33e347e..bbf980f 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ScrollbarLayerChromium.h"
 
 #include "base/basictypes.h"
@@ -284,4 +282,3 @@ void ScrollbarLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusi
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
index 5c7cc5c..7f0f13c 100644
--- a/cc/scrollbar_layer.h
+++ b/cc/scrollbar_layer.h
@@ -6,8 +6,6 @@
 #ifndef ScrollbarLayerChromium_h
 #define ScrollbarLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerChromium.h"
 #include "caching_bitmap_canvas_layer_texture_updater.h"
 #include <public/WebScrollbar.h>
@@ -65,6 +63,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index 8a832e7..82fc33c 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCScrollbarLayerImpl.h"
 
 #include "CCQuadSink.h"
@@ -202,5 +200,3 @@ const char* CCScrollbarLayerImpl::layerTypeAsString() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/scrollbar_layer_impl.h b/cc/scrollbar_layer_impl.h
index e7cf584..2a30b3a 100644
--- a/cc/scrollbar_layer_impl.h
+++ b/cc/scrollbar_layer_impl.h
@@ -5,8 +5,6 @@
 #ifndef CCScrollbarLayerImpl_h
 #define CCScrollbarLayerImpl_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerImpl.h"
 #include "CCScrollbarGeometryFixedThumb.h"
 #include <public/WebRect.h>
@@ -107,6 +105,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/shader.cc b/cc/shader.cc
index cf485c1..d3c5d3f 100644
--- a/cc/shader.cc
+++ b/cc/shader.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "ShaderChromium.h"
 
 #include <public/WebGraphicsContext3D.h>
@@ -884,5 +882,3 @@ std::string FragmentShaderCheckerboard::getShaderString() const
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/shader.h b/cc/shader.h
index 2518382..8408da2 100644
--- a/cc/shader.h
+++ b/cc/shader.h
@@ -5,8 +5,6 @@
 #ifndef ShaderChromium_h
 #define ShaderChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "SkColorPriv.h"
 #include <string>
 
@@ -348,6 +346,4 @@ private:
 
 } // namespace cc
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
index cf0899a..f1489ce 100644
--- a/cc/skpicture_canvas_layer_texture_updater.cc
+++ b/cc/skpicture_canvas_layer_texture_updater.cc
@@ -5,8 +5,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "SkPictureCanvasLayerTextureUpdater.h"
 
 #include "CCTextureUpdateQueue.h"
@@ -54,4 +52,3 @@ void SkPictureCanvasLayerTextureUpdater::setOpaque(bool opaque)
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/skpicture_canvas_layer_texture_updater.h b/cc/skpicture_canvas_layer_texture_updater.h
index aa4e706..611ce21 100644
--- a/cc/skpicture_canvas_layer_texture_updater.h
+++ b/cc/skpicture_canvas_layer_texture_updater.h
@@ -6,8 +6,6 @@
 #ifndef SkPictureCanvasLayerTextureUpdater_h
 #define SkPictureCanvasLayerTextureUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CanvasLayerTextureUpdater.h"
 #include "SkPicture.h"
 
@@ -45,5 +43,4 @@ private:
 };
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
 #endif // SkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/solid_color_layer.cc b/cc/solid_color_layer.cc
index d5c0b42..de1ed2d 100644
--- a/cc/solid_color_layer.cc
+++ b/cc/solid_color_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "SolidColorLayerChromium.h"
 
 #include "CCSolidColorLayerImpl.h"
@@ -32,5 +30,3 @@ SolidColorLayerChromium::~SolidColorLayerChromium()
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/solid_color_layer.h b/cc/solid_color_layer.h
index 9123484..99ca19d 100644
--- a/cc/solid_color_layer.h
+++ b/cc/solid_color_layer.h
@@ -6,8 +6,6 @@
 #ifndef SolidColorLayerChromium_h
 #define SolidColorLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerChromium.h"
 
 namespace cc {
@@ -28,6 +26,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/solid_color_layer_impl.cc b/cc/solid_color_layer_impl.cc
index abf8d48..1335b09 100644
--- a/cc/solid_color_layer_impl.cc
+++ b/cc/solid_color_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCSolidColorLayerImpl.h"
 
 #include "CCQuadSink.h"
@@ -50,4 +48,3 @@ const char* CCSolidColorLayerImpl::layerTypeAsString() const
 }
 
 } // namespace cc
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index b0db144..f60abf6 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -13,7 +13,6 @@
 
 namespace cc {
 
-#if USE(ACCELERATED_COMPOSITING)
 AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
     : m_context(context)
     , m_usingBindUniforms(usingBindUniforms)
@@ -97,5 +96,3 @@ void AcceleratedTextureCopier::flush()
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/texture_copier.h b/cc/texture_copier.h
index ba8d7bf..548c6f1 100644
--- a/cc/texture_copier.h
+++ b/cc/texture_copier.h
@@ -35,8 +35,6 @@ public:
     virtual ~TextureCopier() { }
 };
 
-#if USE(ACCELERATED_COMPOSITING)
-
 class AcceleratedTextureCopier : public TextureCopier {
 public:
     static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
@@ -63,8 +61,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN(AcceleratedTextureCopier);
 };
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 }
 
 #endif
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc
index e1b4851..00b81f8 100644
--- a/cc/texture_layer.cc
+++ b/cc/texture_layer.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "TextureLayerChromium.h"
 
 #include "CCLayerTreeHost.h"
@@ -132,4 +130,3 @@ void TextureLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/texture_layer.h b/cc/texture_layer.h
index 124f845..1f04c65 100644
--- a/cc/texture_layer.h
+++ b/cc/texture_layer.h
@@ -5,8 +5,6 @@
 #ifndef TextureLayerChromium_h
 #define TextureLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerChromium.h"
 
 namespace WebKit {
@@ -72,6 +70,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index 441265f..4c81709 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCTextureLayerImpl.h"
 
 #include "base/stringprintf.h"
@@ -80,5 +78,3 @@ const char* CCTextureLayerImpl::layerTypeAsString() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/texture_update_queue.cc b/cc/texture_update_queue.cc
index a15dbaf..976963c 100644
--- a/cc/texture_update_queue.cc
+++ b/cc/texture_update_queue.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCTextureUpdateQueue.h"
 
 #include "CCPrioritizedTexture.h"
@@ -73,5 +71,3 @@ bool CCTextureUpdateQueue::hasMoreUpdates() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 4fa7ed4..cfec536 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -4,11 +4,9 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "base/basictypes.h"
 #include "TiledLayerChromium.h"
 
+#include "base/basictypes.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCOverdrawMetrics.h"
@@ -812,4 +810,3 @@ IntRect TiledLayerChromium::idlePaintRect()
 }
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index 3c27382..adf8903 100644
--- a/cc/tiled_layer.h
+++ b/cc/tiled_layer.h
@@ -5,8 +5,6 @@
 #ifndef TiledLayerChromium_h
 #define TiledLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCLayerTilingData.h"
 #include "LayerChromium.h"
 #include "LayerTextureUpdater.h"
@@ -100,6 +98,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index faa8ef8..96dc09a 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCTiledLayerImpl.h"
 
 #include "base/basictypes.h"
@@ -249,5 +247,3 @@ const char* CCTiledLayerImpl::layerTypeAsString() const
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/video_layer.cc b/cc/video_layer.cc
index e210473..8f0ec9b 100644
--- a/cc/video_layer.cc
+++ b/cc/video_layer.cc
@@ -4,7 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "VideoLayerChromium.h"
 
 #include "CCVideoLayerImpl.h"
@@ -33,5 +32,3 @@ scoped_ptr<CCLayerImpl> VideoLayerChromium::createCCLayerImpl()
 }
 
 } // namespace cc
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/video_layer.h b/cc/video_layer.h
index 92b5e13..6e29213 100644
--- a/cc/video_layer.h
+++ b/cc/video_layer.h
@@ -6,8 +6,6 @@
 #ifndef VideoLayerChromium_h
 #define VideoLayerChromium_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerChromium.h"
 
 namespace WebKit {
@@ -34,6 +32,4 @@ private:
 };
 
 }
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index d1fb412..53e7a74 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CCVideoLayerImpl.h"
 
 #include "CCIOSurfaceDrawQuad.h"
@@ -387,5 +385,3 @@ const char* CCVideoLayerImpl::layerTypeAsString() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)