Change cc files from namespace WebCore to cc

These files no longer are part of WebCore, so it doesn't make any sense to keep that namespace. Due to being unable to forward declare typedefs in C++, the stubs files (like FloatSize) now define cc::FloatSize as being derived from WebCore::FloatSize. With enough constructors, this lets them be used interchangably in the short term until those geometry classes become real and not dependent on WebCore files. This allows (nearly) all the forward declarations and uses of these types in cc stay as-is with minimal churn. BUG=none Review URL: https://codereview.chromium.org/10914268 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156905 0039d316-1c4b-4281-b951-d872f2087c98
author: enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-09-14 22:21:30 +0000
committer: enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-09-14 22:21:30 +0000
commit: 9c88e5615608f133483adb6c5c1ba5e170290d6b (patch)
tree: a0aaebff1b1cdf8e306532e38986e2e546357756
parent: 9a9805d494f06037618cbd966a08c4602a04b53f (diff)
download: chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.zip
chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.tar.gz
chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.tar.bz2
301 files changed, 982 insertions, 599 deletions
diff --git a/cc/BitmapCanvasLayerTextureUpdater.cpp b/cc/BitmapCanvasLayerTextureUpdater.cpp
index 240543f..35fb5a0 100644
--- a/cc/BitmapCanvasLayerTextureUpdater.cpp
+++ b/cc/BitmapCanvasLayerTextureUpdater.cpp
@@ -13,7 +13,7 @@
 #include "PlatformColor.h"
 #include "skia/ext/platform_canvas.h"
 
-namespace WebCore {
+namespace cc {
 
 BitmapCanvasLayerTextureUpdater::Texture::Texture(BitmapCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
     : LayerTextureUpdater::Texture(texture)
@@ -85,5 +85,5 @@ void BitmapCanvasLayerTextureUpdater::setOpaque(bool opaque)
     m_opaque = opaque;
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/BitmapCanvasLayerTextureUpdater.h b/cc/BitmapCanvasLayerTextureUpdater.h
index 233c83b..f975310 100644
--- a/cc/BitmapCanvasLayerTextureUpdater.h
+++ b/cc/BitmapCanvasLayerTextureUpdater.h
@@ -12,7 +12,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class LayerPainterChromium;
 
@@ -52,6 +52,6 @@ private:
     bool m_opaque;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // BitmapCanvasLayerTextureUpdater_h
diff --git a/cc/BitmapSkPictureCanvasLayerTextureUpdater.cpp b/cc/BitmapSkPictureCanvasLayerTextureUpdater.cpp
index 1d0c913..adb3b0f 100644
--- a/cc/BitmapSkPictureCanvasLayerTextureUpdater.cpp
+++ b/cc/BitmapSkPictureCanvasLayerTextureUpdater.cpp
@@ -16,7 +16,7 @@
 #include "SkDevice.h"
 #include <wtf/CurrentTime.h>
 
-namespace WebCore {
+namespace cc {
 
 BitmapSkPictureCanvasLayerTextureUpdater::Texture::Texture(BitmapSkPictureCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
     : CanvasLayerTextureUpdater::Texture(texture)
@@ -80,5 +80,5 @@ void BitmapSkPictureCanvasLayerTextureUpdater::paintContentsRect(SkCanvas* canva
     stats.totalRasterizeTimeInSeconds += monotonicallyIncreasingTime() - rasterizeBeginTime;
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/BitmapSkPictureCanvasLayerTextureUpdater.h b/cc/BitmapSkPictureCanvasLayerTextureUpdater.h
index 4718d85..d5eeab1 100644
--- a/cc/BitmapSkPictureCanvasLayerTextureUpdater.h
+++ b/cc/BitmapSkPictureCanvasLayerTextureUpdater.h
@@ -10,7 +10,7 @@
 #include "SkBitmap.h"
 #include "SkPictureCanvasLayerTextureUpdater.h"
 
-namespace WebCore {
+namespace cc {
 
 // This class records the contentRect into an SkPicture, then software rasterizes
 // the SkPicture into bitmaps for each tile. This implements CCSettings::perTilePainting.
@@ -40,6 +40,6 @@ public:
 private:
     explicit BitmapSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 };
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // BitmapSkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/CCActiveAnimation.cpp b/cc/CCActiveAnimation.cpp
index 1bf4033..f09209e 100644
--- a/cc/CCActiveAnimation.cpp
+++ b/cc/CCActiveAnimation.cpp
@@ -30,7 +30,7 @@ static const char* const s_runStateNames[] = {
     "Aborted"
 };
 
-COMPILE_ASSERT(static_cast<int>(WebCore::CCActiveAnimation::RunStateEnumSize) == WTF_ARRAY_LENGTH(s_runStateNames), RunState_names_match_enum);
+COMPILE_ASSERT(static_cast<int>(cc::CCActiveAnimation::RunStateEnumSize) == WTF_ARRAY_LENGTH(s_runStateNames), RunState_names_match_enum);
 
 // This should match the TargetProperty enum.
 static const char* const s_targetPropertyNames[] = {
@@ -38,11 +38,11 @@ static const char* const s_targetPropertyNames[] = {
     "Opacity"
 };
 
-COMPILE_ASSERT(static_cast<int>(WebCore::CCActiveAnimation::TargetPropertyEnumSize) == WTF_ARRAY_LENGTH(s_targetPropertyNames), TargetProperty_names_match_enum);
+COMPILE_ASSERT(static_cast<int>(cc::CCActiveAnimation::TargetPropertyEnumSize) == WTF_ARRAY_LENGTH(s_targetPropertyNames), TargetProperty_names_match_enum);
 
 } // namespace
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCActiveAnimation> CCActiveAnimation::create(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
 {
@@ -207,4 +207,4 @@ void CCActiveAnimation::pushPropertiesTo(CCActiveAnimation* other) const
     }
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h
index 66c2d6d..a7d4310 100644
--- a/cc/CCActiveAnimation.h
+++ b/cc/CCActiveAnimation.h
@@ -9,7 +9,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCAnimationCurve;
 
@@ -156,6 +156,6 @@ private:
     bool m_isControllingInstance;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCActiveAnimation_h
diff --git a/cc/CCActiveAnimationTest.cpp b/cc/CCActiveAnimationTest.cpp
index 86d4004..ec589b4 100644
--- a/cc/CCActiveAnimationTest.cpp
+++ b/cc/CCActiveAnimationTest.cpp
@@ -12,7 +12,7 @@
 #include <wtf/Vector.h>
 
 using namespace WebKitTests;
-using namespace WebCore;
+using namespace cc;
 
 namespace {
 
diff --git a/cc/CCAnimationCurve.cpp b/cc/CCAnimationCurve.cpp
index b9e80b2..ae5ccdf 100644
--- a/cc/CCAnimationCurve.cpp
+++ b/cc/CCAnimationCurve.cpp
@@ -6,7 +6,7 @@
 
 #include "CCAnimationCurve.h"
 
-namespace WebCore {
+namespace cc {
 
 const CCFloatAnimationCurve* CCAnimationCurve::toFloatAnimationCurve() const
 {
@@ -20,4 +20,4 @@ const CCTransformAnimationCurve* CCAnimationCurve::toTransformAnimationCurve() c
     return static_cast<const CCTransformAnimationCurve*>(this);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h
index 4fb6141..46808f6 100644
--- a/cc/CCAnimationCurve.h
+++ b/cc/CCAnimationCurve.h
@@ -8,7 +8,7 @@
 #include <public/WebTransformationMatrix.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCFloatAnimationCurve;
 class CCTransformAnimationCurve;
@@ -51,6 +51,6 @@ public:
     virtual Type type() const OVERRIDE { return Transform; }
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCAnimation_h
diff --git a/cc/CCAnimationEvents.h b/cc/CCAnimationEvents.h
index b1f5d2a..0771f42 100644
--- a/cc/CCAnimationEvents.h
+++ b/cc/CCAnimationEvents.h
@@ -10,7 +10,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 struct CCAnimationEvent {
     enum Type { Started, Finished };
@@ -33,6 +33,6 @@ struct CCAnimationEvent {
 
 typedef Vector<CCAnimationEvent> CCAnimationEventsVector;
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCAnimationEvents_h
diff --git a/cc/CCAppendQuadsData.h b/cc/CCAppendQuadsData.h
index 73ef4f800..2a19967 100644
--- a/cc/CCAppendQuadsData.h
+++ b/cc/CCAppendQuadsData.h
@@ -5,7 +5,7 @@
 #ifndef CCAppendQuadsData_h
 #define CCAppendQuadsData_h
 
-namespace WebCore {
+namespace cc {
 
 struct CCAppendQuadsData {
     CCAppendQuadsData()
diff --git a/cc/CCCheckerboardDrawQuad.cpp b/cc/CCCheckerboardDrawQuad.cpp
index 0f8b499..4e15e48 100644
--- a/cc/CCCheckerboardDrawQuad.cpp
+++ b/cc/CCCheckerboardDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCCheckerboardDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCCheckerboardDrawQuad> CCCheckerboardDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect)
 {
diff --git a/cc/CCCheckerboardDrawQuad.h b/cc/CCCheckerboardDrawQuad.h
index c1bfe61..f8bc01f 100644
--- a/cc/CCCheckerboardDrawQuad.h
+++ b/cc/CCCheckerboardDrawQuad.h
@@ -8,7 +8,7 @@
 #include "CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCCompletionEvent.h b/cc/CCCompletionEvent.h
index 3514496f..462e4ba 100644
--- a/cc/CCCompletionEvent.h
+++ b/cc/CCCompletionEvent.h
@@ -7,7 +7,7 @@
 
 #include "base/synchronization/waitable_event.h"
 
-namespace WebCore {
+namespace cc {
 
 // Used for making blocking calls from one thread to another. Use only when
 // absolutely certain that doing-so will not lead to a deadlock.
diff --git a/cc/CCDamageTracker.cpp b/cc/CCDamageTracker.cpp
index 90d6e29..d2a94a8 100644
--- a/cc/CCDamageTracker.cpp
+++ b/cc/CCDamageTracker.cpp
@@ -16,7 +16,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCDamageTracker> CCDamageTracker::create()
 {
@@ -340,6 +340,6 @@ void CCDamageTracker::extendDamageForRenderSurface(CCLayerImpl* layer, FloatRect
         expandDamageRectInsideRectWithFilters(targetDamageRect, surfaceRectInTargetSpace, layer->backgroundFilters());
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCDamageTracker.h b/cc/CCDamageTracker.h
index eb2a644..9b3672a 100644
--- a/cc/CCDamageTracker.h
+++ b/cc/CCDamageTracker.h
@@ -14,7 +14,7 @@ namespace WebKit {
 class WebFilterOperations;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 class CCRenderSurface;
@@ -57,6 +57,6 @@ private:
     bool m_forceFullDamageNextUpdate;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCDamageTracker_h
diff --git a/cc/CCDamageTrackerTest.cpp b/cc/CCDamageTrackerTest.cpp
index fe44683..6ae520e 100644
--- a/cc/CCDamageTrackerTest.cpp
+++ b/cc/CCDamageTrackerTest.cpp
@@ -16,7 +16,7 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using namespace WTF;
 using namespace WebKitTests;
diff --git a/cc/CCDebugBorderDrawQuad.cpp b/cc/CCDebugBorderDrawQuad.cpp
index d819824..95c106d 100644
--- a/cc/CCDebugBorderDrawQuad.cpp
+++ b/cc/CCDebugBorderDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCDebugBorderDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCDebugBorderDrawQuad> CCDebugBorderDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color, int width)
 {
diff --git a/cc/CCDebugBorderDrawQuad.h b/cc/CCDebugBorderDrawQuad.h
index 77f8877..3b3a1e2 100644
--- a/cc/CCDebugBorderDrawQuad.h
+++ b/cc/CCDebugBorderDrawQuad.h
@@ -9,7 +9,7 @@
 #include "SkColor.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCDebugRectHistory.cpp b/cc/CCDebugRectHistory.cpp
index 6cd7c99..17c9aaa 100644
--- a/cc/CCDebugRectHistory.cpp
+++ b/cc/CCDebugRectHistory.cpp
@@ -12,7 +12,7 @@
 #include "CCLayerTreeHost.h"
 #include "CCMathUtil.h"
 
-namespace WebCore {
+namespace cc {
 
 CCDebugRectHistory::CCDebugRectHistory()
 {
@@ -111,6 +111,6 @@ void CCDebugRectHistory::saveOccludingRects(const Vector<IntRect>& occludingRect
         m_debugRects.append(CCDebugRect(OccludingRectType, occludingRects[i]));
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCDebugRectHistory.h b/cc/CCDebugRectHistory.h
index af542ad..3ae8fe9 100644
--- a/cc/CCDebugRectHistory.h
+++ b/cc/CCDebugRectHistory.h
@@ -13,7 +13,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 struct CCLayerTreeSettings;
@@ -21,7 +21,7 @@ struct CCLayerTreeSettings;
 // There are currently six types of debug rects:
 //
 // - Paint rects (update rects): regions of a layer that needed to be re-uploaded to the
-//   texture resource; in most cases implying that WebCore had to repaint them, too.
+//   texture resource; in most cases implying that they had to be repainted, too.
 //
 // - Property-changed rects: enclosing bounds of layers that cause changes to the screen
 //   even if the layer did not change internally. (For example, if the layer's opacity or
@@ -76,7 +76,7 @@ private:
     Vector<CCDebugRect> m_debugRects;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/CCDelayBasedTimeSource.cpp b/cc/CCDelayBasedTimeSource.cpp
index 0815f25..8a623dd 100644
--- a/cc/CCDelayBasedTimeSource.cpp
+++ b/cc/CCDelayBasedTimeSource.cpp
@@ -11,7 +11,7 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 
diff --git a/cc/CCDelayBasedTimeSource.h b/cc/CCDelayBasedTimeSource.h
index 9565983..d9c9c28 100644
--- a/cc/CCDelayBasedTimeSource.h
+++ b/cc/CCDelayBasedTimeSource.h
@@ -9,7 +9,7 @@
 #include "CCTimer.h"
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 
diff --git a/cc/CCDelayBasedTimeSourceTest.cpp b/cc/CCDelayBasedTimeSourceTest.cpp
index 5e9f49b..a709583 100644
--- a/cc/CCDelayBasedTimeSourceTest.cpp
+++ b/cc/CCDelayBasedTimeSourceTest.cpp
@@ -11,8 +11,8 @@
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
+using namespace cc;
 using namespace WTF;
-using namespace WebCore;
 using namespace WebKitTests;
 
 namespace {
diff --git a/cc/CCDirectRenderer.cpp b/cc/CCDirectRenderer.cpp
index e958f25..3b1bf32 100644
--- a/cc/CCDirectRenderer.cpp
+++ b/cc/CCDirectRenderer.cpp
@@ -47,7 +47,7 @@ static WebTransformationMatrix windowMatrix(int x, int y, int width, int height)
     return canvas;
 }
 
-namespace WebCore {
+namespace cc {
 //
 // static
 FloatRect CCDirectRenderer::quadVertexRect()
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
index acf44d4..3286ef5 100644
--- a/cc/CCDirectRenderer.h
+++ b/cc/CCDirectRenderer.h
@@ -9,7 +9,7 @@
 #include "CCResourceProvider.h"
 #include "CCScopedTexture.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCResourceProvider;
 
diff --git a/cc/CCDrawQuad.cpp b/cc/CCDrawQuad.cpp
index 4006698..b3c3889 100644
--- a/cc/CCDrawQuad.cpp
+++ b/cc/CCDrawQuad.cpp
@@ -16,7 +16,7 @@
 #include "CCYUVVideoDrawQuad.h"
 #include "IntRect.h"
 
-namespace WebCore {
+namespace cc {
 
 CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const IntRect& quadRect)
     : m_sharedQuadState(sharedQuadState)
diff --git a/cc/CCDrawQuad.h b/cc/CCDrawQuad.h
index a11f5ad..6808f37 100644
--- a/cc/CCDrawQuad.h
+++ b/cc/CCDrawQuad.h
@@ -7,7 +7,7 @@
 
 #include "CCSharedQuadState.h"
 
-namespace WebCore {
+namespace cc {
 
 // WARNING! All CCXYZDrawQuad classes must remain PODs (plain old data).
 // They are intended to be "serializable" by copying their raw bytes, so they
diff --git a/cc/CCFontAtlas.cpp b/cc/CCFontAtlas.cpp
index eadc860..a1b8597 100644
--- a/cc/CCFontAtlas.cpp
+++ b/cc/CCFontAtlas.cpp
@@ -12,7 +12,7 @@
 #include "SkCanvas.h"
 #include <vector>
 
-namespace WebCore {
+namespace cc {
 
 using namespace std;
 
@@ -67,6 +67,6 @@ void CCFontAtlas::drawDebugAtlas(SkCanvas* canvas, const IntPoint& destPosition)
     canvas->drawBitmapRect(m_atlas, &source, SkRect::MakeXYWH(destPosition.x(), destPosition.y(), m_atlas.width(), m_atlas.height()));
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCFontAtlas.h b/cc/CCFontAtlas.h
index bc7fac0..3253809 100644
--- a/cc/CCFontAtlas.h
+++ b/cc/CCFontAtlas.h
@@ -15,7 +15,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class Color;
 class FontDescription;
@@ -58,7 +58,7 @@ private:
     int m_fontHeight;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/CCFrameRateController.cpp b/cc/CCFrameRateController.cpp
index 15ff94c..25d4d7e 100644
--- a/cc/CCFrameRateController.cpp
+++ b/cc/CCFrameRateController.cpp
@@ -19,7 +19,7 @@ const int defaultMaxFramesPending = 2;
 
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCFrameRateControllerTimeSourceAdapter : public CCTimeSourceClient {
 public:
diff --git a/cc/CCFrameRateController.h b/cc/CCFrameRateController.h
index a609c38..6d1c4a8 100644
--- a/cc/CCFrameRateController.h
+++ b/cc/CCFrameRateController.h
@@ -11,7 +11,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 class CCTimeSource;
diff --git a/cc/CCFrameRateControllerTest.cpp b/cc/CCFrameRateControllerTest.cpp
index 721db12..34291a2 100644
--- a/cc/CCFrameRateControllerTest.cpp
+++ b/cc/CCFrameRateControllerTest.cpp
@@ -9,13 +9,13 @@
 #include "CCSchedulerTestCommon.h"
 #include <gtest/gtest.h>
 
-using namespace WTF;
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
+using namespace WTF;
 
 namespace {
 
-class FakeCCFrameRateControllerClient : public WebCore::CCFrameRateControllerClient {
+class FakeCCFrameRateControllerClient : public cc::CCFrameRateControllerClient {
 public:
     FakeCCFrameRateControllerClient() { reset(); }
 
diff --git a/cc/CCFrameRateCounter.cpp b/cc/CCFrameRateCounter.cpp
index bd5b140..521b5016 100644
--- a/cc/CCFrameRateCounter.cpp
+++ b/cc/CCFrameRateCounter.cpp
@@ -11,7 +11,7 @@
 #include <public/Platform.h>
 #include <wtf/CurrentTime.h>
 
-namespace WebCore {
+namespace cc {
 
 const double CCFrameRateCounter::kFrameTooFast = 1.0 / 70.0; // measured in seconds
 const double CCFrameRateCounter::kFrameTooSlow = 1.0 / 12.0;
@@ -125,6 +125,6 @@ double CCFrameRateCounter::timeStampOfRecentFrame(int n)
     return m_timeStampHistory[desiredIndex];
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCFrameRateCounter.h b/cc/CCFrameRateCounter.h
index 67763bc..1038deb 100644
--- a/cc/CCFrameRateCounter.h
+++ b/cc/CCFrameRateCounter.h
@@ -10,7 +10,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 // This class maintains a history of timestamps, and provides functionality to
 // intelligently compute average frames per second (and standard deviation).
@@ -64,7 +64,7 @@ private:
     int m_droppedFrameCount;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/CCGraphicsContext.h b/cc/CCGraphicsContext.h
index 592291c..6272e75 100644
--- a/cc/CCGraphicsContext.h
+++ b/cc/CCGraphicsContext.h
@@ -11,7 +11,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 // FIXME: rename fully to CCOutputSurface.
 typedef WebKit::WebCompositorOutputSurface CCGraphicsContext;
diff --git a/cc/CCHeadsUpDisplayLayerImpl.cpp b/cc/CCHeadsUpDisplayLayerImpl.cpp
index ec2c126..924219d 100644
--- a/cc/CCHeadsUpDisplayLayerImpl.cpp
+++ b/cc/CCHeadsUpDisplayLayerImpl.cpp
@@ -20,7 +20,7 @@
 #include "SkPaint.h"
 #include "skia/ext/platform_canvas.h"
 
-namespace WebCore {
+namespace cc {
 
 static inline SkPaint createPaint()
 {
diff --git a/cc/CCHeadsUpDisplayLayerImpl.h b/cc/CCHeadsUpDisplayLayerImpl.h
index 7e16052..de8f95b 100644
--- a/cc/CCHeadsUpDisplayLayerImpl.h
+++ b/cc/CCHeadsUpDisplayLayerImpl.h
@@ -11,7 +11,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class CCDebugRectHistory;
 class CCFontAtlas;
diff --git a/cc/CCHeadsUpDisplayTest.cpp b/cc/CCHeadsUpDisplayTest.cpp
index 6c8500a..ce847ab 100644
--- a/cc/CCHeadsUpDisplayTest.cpp
+++ b/cc/CCHeadsUpDisplayTest.cpp
@@ -9,7 +9,7 @@
 #include "HeadsUpDisplayLayerChromium.h"
 #include "LayerChromium.h"
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 
 namespace {
diff --git a/cc/CCIOSurfaceDrawQuad.cpp b/cc/CCIOSurfaceDrawQuad.cpp
index 3ba6318..187dc72 100644
--- a/cc/CCIOSurfaceDrawQuad.cpp
+++ b/cc/CCIOSurfaceDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCIOSurfaceDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCIOSurfaceDrawQuad> CCIOSurfaceDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
 {
diff --git a/cc/CCIOSurfaceDrawQuad.h b/cc/CCIOSurfaceDrawQuad.h
index 44b5e23..5a725e2 100644
--- a/cc/CCIOSurfaceDrawQuad.h
+++ b/cc/CCIOSurfaceDrawQuad.h
@@ -9,7 +9,7 @@
 #include "IntSize.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCIOSurfaceLayerImpl.cpp b/cc/CCIOSurfaceLayerImpl.cpp
index ac875b3..cae6809 100644
--- a/cc/CCIOSurfaceLayerImpl.cpp
+++ b/cc/CCIOSurfaceLayerImpl.cpp
@@ -17,7 +17,7 @@
 #include "Extensions3D.h"
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 CCIOSurfaceLayerImpl::CCIOSurfaceLayerImpl(int id)
     : CCLayerImpl(id)
diff --git a/cc/CCIOSurfaceLayerImpl.h b/cc/CCIOSurfaceLayerImpl.h
index 6f93205..453afc0 100644
--- a/cc/CCIOSurfaceLayerImpl.h
+++ b/cc/CCIOSurfaceLayerImpl.h
@@ -8,7 +8,7 @@
 #include "CCLayerImpl.h"
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCIOSurfaceLayerImpl : public CCLayerImpl {
 public:
diff --git a/cc/CCInputHandler.h b/cc/CCInputHandler.h
index 9ffe5c7..83c5896 100644
--- a/cc/CCInputHandler.h
+++ b/cc/CCInputHandler.h
@@ -8,7 +8,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class IntPoint;
 class IntSize;
diff --git a/cc/CCKeyframedAnimationCurve.cpp b/cc/CCKeyframedAnimationCurve.cpp
index d056b64..4735eb9 100644
--- a/cc/CCKeyframedAnimationCurve.cpp
+++ b/cc/CCKeyframedAnimationCurve.cpp
@@ -10,7 +10,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 
@@ -218,4 +218,4 @@ WebTransformationMatrix CCKeyframedTransformAnimationCurve::getValue(double t) c
     return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCKeyframedAnimationCurve.h b/cc/CCKeyframedAnimationCurve.h
index 01d0c9b..6f1f92d 100644
--- a/cc/CCKeyframedAnimationCurve.h
+++ b/cc/CCKeyframedAnimationCurve.h
@@ -12,7 +12,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCKeyframe {
 public:
@@ -106,6 +106,6 @@ private:
     Vector<OwnPtr<CCTransformKeyframe> > m_keyframes;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCKeyframedAnimationCurve_h
diff --git a/cc/CCKeyframedAnimationCurveTest.cpp b/cc/CCKeyframedAnimationCurveTest.cpp
index 8f8a746..de45c3e 100644
--- a/cc/CCKeyframedAnimationCurveTest.cpp
+++ b/cc/CCKeyframedAnimationCurveTest.cpp
@@ -13,7 +13,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/CCLayerAnimationController.cpp b/cc/CCLayerAnimationController.cpp
index bb60758..f992c6e 100644
--- a/cc/CCLayerAnimationController.cpp
+++ b/cc/CCLayerAnimationController.cpp
@@ -14,7 +14,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 CCLayerAnimationController::CCLayerAnimationController(CCLayerAnimationControllerClient* client)
     : m_forceSync(false)
@@ -404,4 +404,4 @@ void CCLayerAnimationController::tickAnimations(double monotonicTime)
     }
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCLayerAnimationController.h b/cc/CCLayerAnimationController.h
index 1176991..ed5fda4 100644
--- a/cc/CCLayerAnimationController.h
+++ b/cc/CCLayerAnimationController.h
@@ -17,7 +17,7 @@ namespace WebKit {
 class WebTransformationMatrix;
 }
 
-namespace WebCore {
+namespace cc {
 
 class Animation;
 class IntSize;
@@ -107,6 +107,6 @@ private:
     Vector<OwnPtr<CCActiveAnimation> > m_activeAnimations;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCLayerAnimationController_h
diff --git a/cc/CCLayerAnimationControllerTest.cpp b/cc/CCLayerAnimationControllerTest.cpp
index 9f03744..804b841 100644
--- a/cc/CCLayerAnimationControllerTest.cpp
+++ b/cc/CCLayerAnimationControllerTest.cpp
@@ -14,7 +14,7 @@
 #include <public/WebTransformationMatrix.h>
 #include <wtf/Vector.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 
diff --git a/cc/CCLayerImpl.cpp b/cc/CCLayerImpl.cpp
index cd28461..9068d31 100644
--- a/cc/CCLayerImpl.cpp
+++ b/cc/CCLayerImpl.cpp
@@ -19,7 +19,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 CCLayerImpl::CCLayerImpl(int id)
     : m_parent(0)
diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h
index c75e79b..3509ffd 100644
--- a/cc/CCLayerImpl.h
+++ b/cc/CCLayerImpl.h
@@ -21,7 +21,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerSorter;
 class CCLayerTreeHostImpl;
diff --git a/cc/CCLayerImplTest.cpp b/cc/CCLayerImplTest.cpp
index cc4dfbb..425775e 100644
--- a/cc/CCLayerImplTest.cpp
+++ b/cc/CCLayerImplTest.cpp
@@ -12,8 +12,8 @@
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
+using namespace cc;
 using namespace WebKit;
-using namespace WebCore;
 
 namespace {
 
diff --git a/cc/CCLayerIterator.cpp b/cc/CCLayerIterator.cpp
index d7de9a5..6549910 100644
--- a/cc/CCLayerIterator.cpp
+++ b/cc/CCLayerIterator.cpp
@@ -13,7 +13,7 @@
 #include "LayerChromium.h"
 #include "RenderSurfaceChromium.h"
 
-namespace WebCore {
+namespace cc {
 
 template <typename LayerType, typename LayerList, typename RenderSurfaceType, typename ActionType>
 void CCLayerIteratorActions::BackToFront::begin(CCLayerIterator<LayerType, LayerList, RenderSurfaceType, ActionType>& it)
@@ -145,6 +145,6 @@ template void CCLayerIteratorActions::FrontToBack::end(CCLayerIterator<CCLayerIm
 template void CCLayerIteratorActions::FrontToBack::begin(CCLayerIterator<CCLayerImpl, Vector<CCLayerImpl*>, CCRenderSurface, FrontToBack>&);
 template void CCLayerIteratorActions::FrontToBack::goToHighestInSubtree(CCLayerIterator<CCLayerImpl, Vector<CCLayerImpl*>, CCRenderSurface, FrontToBack>&);
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCLayerIterator.h b/cc/CCLayerIterator.h
index 907182d..96bb161 100644
--- a/cc/CCLayerIterator.h
+++ b/cc/CCLayerIterator.h
@@ -11,7 +11,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 // These classes provide means to iterate over the RenderSurface-Layer tree.
 
@@ -205,6 +205,6 @@ struct CCLayerIteratorActions {
     };
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCLayerIteratorTest.cpp b/cc/CCLayerIteratorTest.cpp
index bc5b2f3..47e43be 100644
--- a/cc/CCLayerIteratorTest.cpp
+++ b/cc/CCLayerIteratorTest.cpp
@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
 using ::testing::_;
@@ -38,8 +38,8 @@ private:
         , m_drawsContent(true)
     {
         setBounds(IntSize(100, 100));
-        setPosition(IntPoint::zero());
-        setAnchorPoint(IntPoint::zero());
+        setPosition(IntPoint());
+        setAnchorPoint(IntPoint());
     }
 
     bool m_drawsContent;
diff --git a/cc/CCLayerQuad.cpp b/cc/CCLayerQuad.cpp
index c6dfcc4..b51e425 100644
--- a/cc/CCLayerQuad.cpp
+++ b/cc/CCLayerQuad.cpp
@@ -9,7 +9,7 @@
 
 #include "CCLayerQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 CCLayerQuad::Edge::Edge(const FloatPoint& p, const FloatPoint& q)
 {
@@ -61,6 +61,6 @@ void CCLayerQuad::toFloatArray(float flattened[12]) const
     flattened[11] = m_bottom.z();
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCLayerQuad.h b/cc/CCLayerQuad.h
index 98688fb..03f161f 100644
--- a/cc/CCLayerQuad.h
+++ b/cc/CCLayerQuad.h
@@ -13,7 +13,7 @@
 
 static const float kAntiAliasingInflateDistance = 0.5f;
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerQuad {
 public:
diff --git a/cc/CCLayerQuadTest.cpp b/cc/CCLayerQuadTest.cpp
index eb4a1f0..d40bb14 100644
--- a/cc/CCLayerQuadTest.cpp
+++ b/cc/CCLayerQuadTest.cpp
@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace {
 
diff --git a/cc/CCLayerSorter.cpp b/cc/CCLayerSorter.cpp
index e8a14eb..1b643f5 100644
--- a/cc/CCLayerSorter.cpp
+++ b/cc/CCLayerSorter.cpp
@@ -26,7 +26,7 @@ static WTFLogChannel LogCCLayerSorter = { 0x00000000, "", WTFLogChannelOff };
 #endif
 #endif
 
-namespace WebCore {
+namespace cc {
 
 inline static float perpProduct(const FloatSize& u, const FloatSize& v)
 {
diff --git a/cc/CCLayerSorter.h b/cc/CCLayerSorter.h
index 0fb64a6..bb513b9 100644
--- a/cc/CCLayerSorter.h
+++ b/cc/CCLayerSorter.h
@@ -17,7 +17,7 @@ namespace WebKit {
 class WebTransformationMatrix;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerSorter {
     WTF_MAKE_NONCOPYABLE(CCLayerSorter);
diff --git a/cc/CCLayerSorterTest.cpp b/cc/CCLayerSorterTest.cpp
index 672f652..0bbc92c 100644
--- a/cc/CCLayerSorterTest.cpp
+++ b/cc/CCLayerSorterTest.cpp
@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/CCLayerTilingData.cpp b/cc/CCLayerTilingData.cpp
index 04ccda5..5edde41 100644
--- a/cc/CCLayerTilingData.cpp
+++ b/cc/CCLayerTilingData.cpp
@@ -11,7 +11,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border)
 {
@@ -34,7 +34,7 @@ void CCLayerTilingData::setTileSize(const IntSize& size)
     m_tilingData.setMaxTextureSize(size);
 }
 
-const IntSize& CCLayerTilingData::tileSize() const
+IntSize CCLayerTilingData::tileSize() const
 {
     return m_tilingData.maxTextureSize();
 }
@@ -144,6 +144,6 @@ IntSize CCLayerTilingData::bounds() const
     return m_tilingData.totalSize();
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCLayerTilingData.h b/cc/CCLayerTilingData.h
index 391639a..6942050 100644
--- a/cc/CCLayerTilingData.h
+++ b/cc/CCLayerTilingData.h
@@ -15,7 +15,7 @@
 #include <wtf/HashTraits.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerTilingData {
 public:
@@ -31,7 +31,7 @@ public:
 
     // Change the tile size. This may invalidate all the existing tiles.
     void setTileSize(const IntSize&);
-    const IntSize& tileSize() const;
+    IntSize tileSize() const;
     // Change the border texel setting. This may invalidate all existing tiles.
     void setBorderTexelOption(BorderTexelOption);
     bool hasBorderTexels() const { return m_tilingData.borderTexels(); }
diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
index 08e1141..18786f5 100644
--- a/cc/CCLayerTreeHost.cpp
+++ b/cc/CCLayerTreeHost.cpp
@@ -32,7 +32,7 @@ namespace {
 static int numLayerTreeInstances;
 }
 
-namespace WebCore {
+namespace cc {
 
 bool CCLayerTreeHost::s_needsFilterContext = false;
 
@@ -785,4 +785,4 @@ void CCLayerTreeHost::setAnimationEventsRecursive(const CCAnimationEventsVector&
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCLayerTreeHost.h b/cc/CCLayerTreeHost.h
index 6d4c198..09ff6a1 100644
--- a/cc/CCLayerTreeHost.h
+++ b/cc/CCLayerTreeHost.h
@@ -22,7 +22,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCFontAtlas;
 class CCLayerChromium;
diff --git a/cc/CCLayerTreeHostClient.h b/cc/CCLayerTreeHostClient.h
index 3d09ba6..52c5bc0 100644
--- a/cc/CCLayerTreeHostClient.h
+++ b/cc/CCLayerTreeHostClient.h
@@ -11,7 +11,7 @@ namespace WebKit {
 class WebCompositorOutputSurface;
 }
 
-namespace WebCore {
+namespace cc {
 class CCInputHandler;
 class IntSize;
 
diff --git a/cc/CCLayerTreeHostCommon.cpp b/cc/CCLayerTreeHostCommon.cpp
index 4afae01..d60d43c 100644
--- a/cc/CCLayerTreeHostCommon.cpp
+++ b/cc/CCLayerTreeHostCommon.cpp
@@ -20,7 +20,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 IntRect CCLayerTreeHostCommon::calculateVisibleRect(const IntRect& targetSurfaceRect, const IntRect& layerBoundRect, const WebTransformationMatrix& transform)
 {
@@ -782,7 +782,7 @@ void CCLayerTreeHostCommon::calculateDrawTransforms(LayerChromium* rootLayer, co
 
     setupRootLayerAndSurfaceForRecursion<LayerChromium, Vector<RefPtr<LayerChromium> > >(rootLayer, renderSurfaceLayerList, deviceViewportSize);
 
-    WebCore::calculateDrawTransformsInternal<LayerChromium, Vector<RefPtr<LayerChromium> >, RenderSurfaceChromium, void>(rootLayer, rootLayer, deviceScaleTransform, identityMatrix, identityMatrix,
+    cc::calculateDrawTransformsInternal<LayerChromium, Vector<RefPtr<LayerChromium> >, RenderSurfaceChromium, void>(rootLayer, rootLayer, deviceScaleTransform, identityMatrix, identityMatrix,
                                                                                                                          rootLayer->renderSurface()->contentRect(), true, 0, renderSurfaceLayerList,
                                                                                                                          rootLayer->renderSurface()->layerList(), 0, maxTextureSize, deviceScaleFactor, totalDrawableContentRect);
 }
@@ -796,7 +796,7 @@ void CCLayerTreeHostCommon::calculateDrawTransforms(CCLayerImpl* rootLayer, cons
 
     setupRootLayerAndSurfaceForRecursion<CCLayerImpl, Vector<CCLayerImpl*> >(rootLayer, renderSurfaceLayerList, deviceViewportSize);
 
-    WebCore::calculateDrawTransformsInternal<CCLayerImpl, Vector<CCLayerImpl*>, CCRenderSurface, CCLayerSorter>(rootLayer, rootLayer, deviceScaleTransform, identityMatrix, identityMatrix,
+    cc::calculateDrawTransformsInternal<CCLayerImpl, Vector<CCLayerImpl*>, CCRenderSurface, CCLayerSorter>(rootLayer, rootLayer, deviceScaleTransform, identityMatrix, identityMatrix,
                                                                                                                 rootLayer->renderSurface()->contentRect(), true, 0, renderSurfaceLayerList,
                                                                                                                 rootLayer->renderSurface()->layerList(), layerSorter, maxTextureSize, deviceScaleFactor, totalDrawableContentRect);
 }
@@ -882,4 +882,4 @@ CCLayerImpl* CCLayerTreeHostCommon::findLayerThatIsHitByPoint(const IntPoint& vi
     return foundLayer;
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCLayerTreeHostCommon.h b/cc/CCLayerTreeHostCommon.h
index b0c56b0..d8710e9 100644
--- a/cc/CCLayerTreeHostCommon.h
+++ b/cc/CCLayerTreeHostCommon.h
@@ -11,7 +11,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 class CCLayerSorter;
@@ -80,6 +80,6 @@ LayerType* CCLayerTreeHostCommon::findLayerInSubtree(LayerType* rootLayer, int l
     return 0;
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCLayerTreeHostCommonTest.cpp b/cc/CCLayerTreeHostCommonTest.cpp
index 02df09f..b0699d5 100644
--- a/cc/CCLayerTreeHostCommonTest.cpp
+++ b/cc/CCLayerTreeHostCommonTest.cpp
@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
index 4c725dd..8abbd1a 100644
--- a/cc/CCLayerTreeHostImpl.cpp
+++ b/cc/CCLayerTreeHostImpl.cpp
@@ -34,7 +34,7 @@ using WebKit::WebTransformationMatrix;
 
 namespace {
 
-void didVisibilityChange(WebCore::CCLayerTreeHostImpl* id, bool visible)
+void didVisibilityChange(cc::CCLayerTreeHostImpl* id, bool visible)
 {
     if (visible) {
         TRACE_EVENT_ASYNC_BEGIN1("webkit", "CCLayerTreeHostImpl::setVisible", id, "CCLayerTreeHostImpl", id);
@@ -46,7 +46,7 @@ void didVisibilityChange(WebCore::CCLayerTreeHostImpl* id, bool visible)
 
 } // namespace
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerTreeHostImplTimeSourceAdapter : public CCTimeSourceClient {
     WTF_MAKE_NONCOPYABLE(CCLayerTreeHostImplTimeSourceAdapter);
@@ -1269,4 +1269,4 @@ void CCLayerTreeHostImpl::animateScrollbarsRecursive(CCLayerImpl* layer, double
         animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCLayerTreeHostImpl.h b/cc/CCLayerTreeHostImpl.h
index 5f39a36..ece6c43 100644
--- a/cc/CCLayerTreeHostImpl.h
+++ b/cc/CCLayerTreeHostImpl.h
@@ -16,7 +16,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCCompletionEvent;
 class CCDebugRectHistory;
diff --git a/cc/CCLayerTreeHostImplTest.cpp b/cc/CCLayerTreeHostImplTest.cpp
index e410b220..e7a4ea3 100644
--- a/cc/CCLayerTreeHostImplTest.cpp
+++ b/cc/CCLayerTreeHostImplTest.cpp
@@ -34,8 +34,8 @@
 #include <public/WebVideoFrame.h>
 #include <public/WebVideoFrameProvider.h>
 
+using namespace cc;
 using namespace CCLayerTestCommon;
-using namespace WebCore;
 using namespace WebKit;
 using namespace WebKitTests;
 
@@ -2107,7 +2107,7 @@ public:
     // Unlimited texture size.
     virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value)
     {
-        if (pname == WebCore::GraphicsContext3D::MAX_TEXTURE_SIZE)
+        if (pname == cc::GraphicsContext3D::MAX_TEXTURE_SIZE)
             *value = 8192;
     }
 };
@@ -2422,7 +2422,7 @@ class StrictWebGraphicsContext3DWithIOSurface : public StrictWebGraphicsContext3
 public:
     virtual WebString getString(WGC3Denum name) OVERRIDE
     {
-        if (name == WebCore::GraphicsContext3D::EXTENSIONS)
+        if (name == cc::GraphicsContext3D::EXTENSIONS)
             return WebString("GL_CHROMIUM_iosurface GL_ARB_texture_rectangle");
 
         return WebString();
@@ -2433,7 +2433,7 @@ class FakeWebGraphicsContext3DWithIOSurface : public FakeWebGraphicsContext3D {
 public:
     virtual WebString getString(WGC3Denum name) OVERRIDE
     {
-        if (name == WebCore::GraphicsContext3D::EXTENSIONS)
+        if (name == cc::GraphicsContext3D::EXTENSIONS)
             return WebString("GL_CHROMIUM_iosurface GL_ARB_texture_rectangle");
 
         return WebString();
@@ -2623,7 +2623,7 @@ public:
 
     virtual WebString getString(WGC3Denum name) OVERRIDE
     {
-        if (name == WebCore::GraphicsContext3D::EXTENSIONS)
+        if (name == cc::GraphicsContext3D::EXTENSIONS)
             return WebString("GL_CHROMIUM_iosurface GL_ARB_texture_rectangle");
 
         return WebString();
diff --git a/cc/CCLayerTreeHostTest.cpp b/cc/CCLayerTreeHostTest.cpp
index ad6c3f1..555eec7 100644
--- a/cc/CCLayerTreeHostTest.cpp
+++ b/cc/CCLayerTreeHostTest.cpp
@@ -25,7 +25,7 @@
 #include <public/WebSize.h>
 #include <wtf/OwnArrayPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
@@ -2442,7 +2442,7 @@ private:
         if (m_texture.get())
             return;
         m_texture = EvictionTrackingTexture::create(CCPrioritizedTexture::create(layerTreeHost()->contentsTextureManager()));
-        m_texture->texture()->setDimensions(WebCore::IntSize(10, 10), WebCore::GraphicsContext3D::RGBA);
+        m_texture->texture()->setDimensions(IntSize(10, 10), cc::GraphicsContext3D::RGBA);
     }
 
     OwnPtr<EvictionTrackingTexture> m_texture;
diff --git a/cc/CCMathUtil.cpp b/cc/CCMathUtil.cpp
index c8969a0..d90eb09 100644
--- a/cc/CCMathUtil.cpp
+++ b/cc/CCMathUtil.cpp
@@ -13,7 +13,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 static HomogeneousCoordinate projectHomogeneousPoint(const WebTransformationMatrix& transform, const FloatPoint& p)
 {
@@ -376,4 +376,4 @@ FloatSize CCMathUtil::projectVector(const FloatSize& source, const FloatSize& de
     return FloatSize(projectedLength * destination.width(), projectedLength * destination.height());
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCMathUtil.h b/cc/CCMathUtil.h
index 834acf5..ed3848e 100644
--- a/cc/CCMathUtil.h
+++ b/cc/CCMathUtil.h
@@ -12,7 +12,7 @@ namespace WebKit {
 class WebTransformationMatrix;
 }
 
-namespace WebCore {
+namespace cc {
 
 class IntRect;
 class FloatRect;
@@ -60,8 +60,6 @@ struct HomogeneousCoordinate {
     double w;
 };
 
-// This class contains math helper functionality that does not belong in WebCore.
-// It is possible that this functionality should be migrated to WebCore eventually.
 class CCMathUtil {
 public:
 
@@ -104,6 +102,6 @@ public:
     static FloatSize projectVector(const FloatSize& source, const FloatSize& destination);
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // #define CCMathUtil_h
diff --git a/cc/CCMathUtilTest.cpp b/cc/CCMathUtilTest.cpp
index 663731f..530d7da 100644
--- a/cc/CCMathUtilTest.cpp
+++ b/cc/CCMathUtilTest.cpp
@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/CCOcclusionTracker.cpp b/cc/CCOcclusionTracker.cpp
index 2bd1181..bedb80c 100644
--- a/cc/CCOcclusionTracker.cpp
+++ b/cc/CCOcclusionTracker.cpp
@@ -17,7 +17,7 @@
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 template<typename LayerType, typename RenderSurfaceType>
 CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::CCOcclusionTrackerBase(IntRect rootTargetRect, bool recordMetricsForFrame)
@@ -127,7 +127,7 @@ static inline Region transformSurfaceOpaqueRegion(const RenderSurfaceType* surfa
 
     Region transformedRegion;
 
-    Vector<IntRect> rects = region.rects();
+    Vector<WebCore::IntRect> rects = region.rects();
     for (size_t i = 0; i < rects.size(); ++i) {
         // We've already checked for clipping in the mapQuad call above, these calls should not clip anything further.
         IntRect transformedRect = enclosedIntRect(CCMathUtil::mapClippedRect(transform, FloatRect(rects[i])));
@@ -144,11 +144,11 @@ static inline void reduceOcclusion(const IntRect& affectedArea, const IntRect& e
         return;
 
     Region affectedOcclusion = intersect(occlusion, affectedArea);
-    Vector<IntRect> affectedOcclusionRects = affectedOcclusion.rects();
+    Vector<WebCore::IntRect> affectedOcclusionRects = affectedOcclusion.rects();
 
     occlusion.subtract(affectedArea);
     for (size_t j = 0; j < affectedOcclusionRects.size(); ++j) {
-        IntRect& occlusionRect = affectedOcclusionRects[j];
+        WebCore::IntRect& occlusionRect = affectedOcclusionRects[j];
 
         // Shrink the rect by expanding the non-opaque pixels outside the rect.
 
@@ -255,7 +255,7 @@ static inline void addOcclusionBehindLayer(Region& region, const LayerType* laye
     if (clipped || !visibleTransformedQuad.isRectilinear())
         return;
 
-    Vector<IntRect> contentRects = opaqueContents.rects();
+    Vector<WebCore::IntRect> contentRects = opaqueContents.rects();
     for (size_t i = 0; i < contentRects.size(); ++i) {
         // We've already checked for clipping in the mapQuad call above, these calls should not clip anything further.
         IntRect transformedRect = enclosedIntRect(CCMathUtil::mapClippedRect(transform, FloatRect(contentRects[i])));
@@ -478,5 +478,5 @@ template IntRect CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::unocclude
 template IntRect CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::layerClipRectInTarget(const CCLayerImpl*) const;
 
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCOcclusionTracker.h b/cc/CCOcclusionTracker.h
index c923056..084e3e4 100644
--- a/cc/CCOcclusionTracker.h
+++ b/cc/CCOcclusionTracker.h
@@ -9,7 +9,7 @@
 #include "FloatQuad.h"
 #include "Region.h"
 
-namespace WebCore {
+namespace cc {
 class CCOverdrawMetrics;
 class CCLayerImpl;
 class CCRenderSurface;
diff --git a/cc/CCOcclusionTrackerTest.cpp b/cc/CCOcclusionTrackerTest.cpp
index 9923275..ec4f0c4 100644
--- a/cc/CCOcclusionTrackerTest.cpp
+++ b/cc/CCOcclusionTrackerTest.cpp
@@ -23,7 +23,7 @@
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
diff --git a/cc/CCOverdrawMetrics.cpp b/cc/CCOverdrawMetrics.cpp
index 51fbae6..4eba7d3 100644
--- a/cc/CCOverdrawMetrics.cpp
+++ b/cc/CCOverdrawMetrics.cpp
@@ -19,7 +19,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 CCOverdrawMetrics::CCOverdrawMetrics(bool recordMetricsForFrame)
     : m_recordMetricsForFrame(recordMetricsForFrame)
@@ -185,6 +185,6 @@ void CCOverdrawMetrics::recordMetricsInternal(MetricsType metricsType, const Lay
     }
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCOverdrawMetrics.h b/cc/CCOverdrawMetrics.h
index 3c1a386..b907a64 100644
--- a/cc/CCOverdrawMetrics.h
+++ b/cc/CCOverdrawMetrics.h
@@ -11,7 +11,7 @@ namespace WebKit {
 class WebTransformationMatrix;
 }
 
-namespace WebCore {
+namespace cc {
 class IntRect;
 class CCLayerTreeHost;
 class CCLayerTreeHostImpl;
@@ -92,6 +92,6 @@ private:
     float m_pixelsCulledForDrawing;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCPageScaleAnimation.cpp b/cc/CCPageScaleAnimation.cpp
index ab031924..12dda09 100644
--- a/cc/CCPageScaleAnimation.cpp
+++ b/cc/CCPageScaleAnimation.cpp
@@ -11,7 +11,7 @@
 
 #include <math.h>
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCPageScaleAnimation> CCPageScaleAnimation::create(const IntSize& scrollStart, float pageScaleStart, const IntSize& windowSize, const IntSize& contentSize, double startTime)
 {
@@ -156,4 +156,4 @@ float CCPageScaleAnimation::pageScaleAtRatio(float ratio) const
     return m_pageScaleStart * diff;
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCPageScaleAnimation.h b/cc/CCPageScaleAnimation.h
index 3e1c900..f597026 100644
--- a/cc/CCPageScaleAnimation.h
+++ b/cc/CCPageScaleAnimation.h
@@ -8,7 +8,7 @@
 #include "IntSize.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 // A small helper class that does the math for zoom animations, primarily for
 // double-tap zoom. Initialize it with starting and ending scroll/page scale
@@ -69,6 +69,6 @@ private:
     double m_duration;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCPrioritizedTexture.cpp b/cc/CCPrioritizedTexture.cpp
index 8a1e7a1..50db1cb 100644
--- a/cc/CCPrioritizedTexture.cpp
+++ b/cc/CCPrioritizedTexture.cpp
@@ -12,7 +12,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace cc {
 
 CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
     : m_size(size)
@@ -119,4 +119,4 @@ void CCPrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes)
     m_bytes = bytes;
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCPrioritizedTexture.h b/cc/CCPrioritizedTexture.h
index ec90a49..b37f8bd 100644
--- a/cc/CCPrioritizedTexture.h
+++ b/cc/CCPrioritizedTexture.h
@@ -12,7 +12,7 @@
 #include "IntRect.h"
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCPrioritizedTextureManager;
 
@@ -116,6 +116,6 @@ private:
     CCPrioritizedTextureManager* m_manager;
 };
 
-} // WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCPrioritizedTextureManager.cpp b/cc/CCPrioritizedTextureManager.cpp
index 00d0689..b6bb38d 100644
--- a/cc/CCPrioritizedTextureManager.cpp
+++ b/cc/CCPrioritizedTextureManager.cpp
@@ -14,7 +14,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace cc {
 
 CCPrioritizedTextureManager::CCPrioritizedTextureManager(size_t maxMemoryLimitBytes, int, int pool)
     : m_maxMemoryLimitBytes(maxMemoryLimitBytes)
@@ -362,4 +362,4 @@ void CCPrioritizedTextureManager::assertInvariants()
 #endif
 
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCPrioritizedTextureManager.h b/cc/CCPrioritizedTextureManager.h
index 3c3d66f..15bdc18 100644
--- a/cc/CCPrioritizedTextureManager.h
+++ b/cc/CCPrioritizedTextureManager.h
@@ -15,7 +15,7 @@
 #include <wtf/ListHashSet.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCPrioritizedTexture;
 class CCPriorityCalculator;
@@ -115,6 +115,6 @@ private:
     BackingVector m_tempBackingVector;
 };
 
-} // WebCore
+} // cc
 
 #endif
diff --git a/cc/CCPrioritizedTextureTest.cpp b/cc/CCPrioritizedTextureTest.cpp
index 2f39561..e032d8a 100644
--- a/cc/CCPrioritizedTextureTest.cpp
+++ b/cc/CCPrioritizedTextureTest.cpp
@@ -14,7 +14,7 @@
 #include "WebCompositorInitializer.h"
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 using namespace WTF;
 
diff --git a/cc/CCPriorityCalculator.cpp b/cc/CCPriorityCalculator.cpp
index 7e769f7..0ef3915 100644
--- a/cc/CCPriorityCalculator.cpp
+++ b/cc/CCPriorityCalculator.cpp
@@ -8,7 +8,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace cc {
 
 // static
 int CCPriorityCalculator::uiPriority(bool drawsToRootSurface)
@@ -69,4 +69,4 @@ int CCPriorityCalculator::priorityFromVisibility(bool visible, bool drawsToRootS
     return visible ? visiblePriority(drawsToRootSurface) : lowestPriority();
 }
 
-} // WebCore
+} // cc
diff --git a/cc/CCPriorityCalculator.h b/cc/CCPriorityCalculator.h
index 91ad766..f9007cb 100644
--- a/cc/CCPriorityCalculator.h
+++ b/cc/CCPriorityCalculator.h
@@ -9,7 +9,7 @@
 #include "IntRect.h"
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCPriorityCalculator {
 public:
diff --git a/cc/CCProxy.cpp b/cc/CCProxy.cpp
index f1fdf6b..bc5ae69 100644
--- a/cc/CCProxy.cpp
+++ b/cc/CCProxy.cpp
@@ -10,7 +10,7 @@
 
 using namespace WTF;
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 #ifndef NDEBUG
diff --git a/cc/CCProxy.h b/cc/CCProxy.h
index 486c132..b418441 100644
--- a/cc/CCProxy.h
+++ b/cc/CCProxy.h
@@ -11,7 +11,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 struct CCRenderingStats;
diff --git a/cc/CCQuadCuller.cpp b/cc/CCQuadCuller.cpp
index d8f1133..a4c31fc 100644
--- a/cc/CCQuadCuller.cpp
+++ b/cc/CCQuadCuller.cpp
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace cc {
 
 static const int debugTileBorderWidth = 1;
 static const int debugTileBorderAlpha = 120;
@@ -92,5 +92,5 @@ bool CCQuadCuller::append(PassOwnPtr<CCDrawQuad> passDrawQuad, CCAppendQuadsData
     return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCQuadCuller.h b/cc/CCQuadCuller.h
index 3474b10..4485f50 100644
--- a/cc/CCQuadCuller.h
+++ b/cc/CCQuadCuller.h
@@ -8,7 +8,7 @@
 #include "CCQuadSink.h"
 #include "CCRenderPass.h"
 
-namespace WebCore {
+namespace cc {
 class CCLayerImpl;
 class CCRenderSurface;
 template<typename LayerType, typename SurfaceType>
diff --git a/cc/CCQuadCullerTest.cpp b/cc/CCQuadCullerTest.cpp
index db225a2..cb67219 100644
--- a/cc/CCQuadCullerTest.cpp
+++ b/cc/CCQuadCullerTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/CCQuadSink.h b/cc/CCQuadSink.h
index 805fa1a..9771a99 100644
--- a/cc/CCQuadSink.h
+++ b/cc/CCQuadSink.h
@@ -7,7 +7,7 @@
 
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCDrawQuad;
 
diff --git a/cc/CCRenderPass.cpp b/cc/CCRenderPass.cpp
index 2f79cab..0d98a3a 100644
--- a/cc/CCRenderPass.cpp
+++ b/cc/CCRenderPass.cpp
@@ -15,7 +15,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
 {
@@ -90,10 +90,10 @@ void CCRenderPass::appendQuadsToFillScreen(CCLayerImpl* rootLayer, SkColor scree
     CCSharedQuadState* sharedQuadState = quadCuller.useSharedQuadState(CCSharedQuadState::create(rootLayer->drawTransform(), rootTargetRect, rootTargetRect, opacity, opaque));
     ASSERT(rootLayer->screenSpaceTransform().isInvertible());
     WebTransformationMatrix transformToLayerSpace = rootLayer->screenSpaceTransform().inverse();
-    Vector<IntRect> fillRects = fillRegion.rects();
+    Vector<WebCore::IntRect> fillRects = fillRegion.rects();
     for (size_t i = 0; i < fillRects.size(); ++i) {
         // The root layer transform is composed of translations and scales only, no perspective, so mapping is sufficient.
-        IntRect layerRect = CCMathUtil::mapClippedRect(transformToLayerSpace, fillRects[i]);
+        IntRect layerRect = CCMathUtil::mapClippedRect(transformToLayerSpace, cc::IntRect(fillRects[i]));
         // Skip the quad culler and just append the quads directly to avoid occlusion checks.
         m_quadList.append(CCSolidColorDrawQuad::create(sharedQuadState, layerRect, screenBackgroundColor));
     }
diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h
index 066e4e2..b2ca8aa 100644
--- a/cc/CCRenderPass.h
+++ b/cc/CCRenderPass.h
@@ -8,6 +8,7 @@
 #include "CCDrawQuad.h"
 #include "CCOcclusionTracker.h"
 #include "CCSharedQuadState.h"
+#include "FloatRect.h"
 #include "SkColor.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
@@ -15,7 +16,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 class CCRenderSurface;
@@ -103,29 +104,29 @@ protected:
     WebKit::WebFilterOperations m_backgroundFilters;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 namespace WTF {
-template<> struct HashTraits<WebCore::CCRenderPass::Id> : GenericHashTraits<WebCore::CCRenderPass::Id> {
+template<> struct HashTraits<cc::CCRenderPass::Id> : GenericHashTraits<cc::CCRenderPass::Id> {
     static const bool emptyValueIsZero = false;
     static const bool needsDestruction = false;
-    static WebCore::CCRenderPass::Id emptyValue() { return WebCore::CCRenderPass::Id(0, 0); }
-    static void constructDeletedValue(WebCore::CCRenderPass::Id& slot) { slot = WebCore::CCRenderPass::Id(-1, -1); }
-    static bool isDeletedValue(WebCore::CCRenderPass::Id value) { return value.layerId == -1 && value.index == -1; }
+    static cc::CCRenderPass::Id emptyValue() { return cc::CCRenderPass::Id(0, 0); }
+    static void constructDeletedValue(cc::CCRenderPass::Id& slot) { slot = cc::CCRenderPass::Id(-1, -1); }
+    static bool isDeletedValue(cc::CCRenderPass::Id value) { return value.layerId == -1 && value.index == -1; }
 };
-template<> struct IntHash<WebCore::CCRenderPass::Id> {
-    static unsigned hash(const WebCore::CCRenderPass::Id& key) { return PairHash<int, int>::hash(std::make_pair(key.layerId, key.index)); }
-    static bool equal(const WebCore::CCRenderPass::Id& a, const WebCore::CCRenderPass::Id& b) { return a == b; }
+template<> struct IntHash<cc::CCRenderPass::Id> {
+    static unsigned hash(const cc::CCRenderPass::Id& key) { return PairHash<int, int>::hash(std::make_pair(key.layerId, key.index)); }
+    static bool equal(const cc::CCRenderPass::Id& a, const cc::CCRenderPass::Id& b) { return a == b; }
     static const bool safeToCompareToEmptyOrDeleted = true;
 };
-template<> struct DefaultHash<WebCore::CCRenderPass::Id> {
-    typedef IntHash<WebCore::CCRenderPass::Id> Hash;
+template<> struct DefaultHash<cc::CCRenderPass::Id> {
+    typedef IntHash<cc::CCRenderPass::Id> Hash;
 };
 } // namespace WTF
 
-namespace WebCore {
+namespace cc {
 typedef Vector<CCRenderPass*> CCRenderPassList;
 typedef HashMap<CCRenderPass::Id, OwnPtr<CCRenderPass> > CCRenderPassIdHashMap;
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCRenderPassDrawQuad.cpp b/cc/CCRenderPassDrawQuad.cpp
index eee5195..966640b 100644
--- a/cc/CCRenderPassDrawQuad.cpp
+++ b/cc/CCRenderPassDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCRenderPassDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCRenderPassDrawQuad> CCRenderPassDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, const CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY)
 {
diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
index cca3386..0bffc351 100644
--- a/cc/CCRenderPassDrawQuad.h
+++ b/cc/CCRenderPassDrawQuad.h
@@ -11,7 +11,7 @@
 #include "IntRect.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCRenderPassDrawQuad : public CCDrawQuad {
     WTF_MAKE_NONCOPYABLE(CCRenderPassDrawQuad);
diff --git a/cc/CCRenderPassSink.h b/cc/CCRenderPassSink.h
index 9cc0835..83df154 100644
--- a/cc/CCRenderPassSink.h
+++ b/cc/CCRenderPassSink.h
@@ -7,7 +7,7 @@
 
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCRenderPass;
 
diff --git a/cc/CCRenderSurface.cpp b/cc/CCRenderSurface.cpp
index f109970..dfbeeab 100644
--- a/cc/CCRenderSurface.cpp
+++ b/cc/CCRenderSurface.cpp
@@ -22,7 +22,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 static const int debugSurfaceBorderWidth = 2;
 static const int debugSurfaceBorderAlpha = 100;
diff --git a/cc/CCRenderSurface.h b/cc/CCRenderSurface.h
index 26d0f90..55dc483 100644
--- a/cc/CCRenderSurface.h
+++ b/cc/CCRenderSurface.h
@@ -15,7 +15,7 @@
 #include <public/WebTransformationMatrix.h>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCDamageTracker;
 class CCQuadSink;
diff --git a/cc/CCRenderSurfaceFilters.cpp b/cc/CCRenderSurfaceFilters.cpp
index 2a5f819..40344c6 100644
--- a/cc/CCRenderSurfaceFilters.cpp
+++ b/cc/CCRenderSurfaceFilters.cpp
@@ -20,6 +20,8 @@
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/MathExtras.h>
 
+using namespace cc;
+
 namespace {
 
 void getBrightnessMatrix(float amount, SkScalar matrix[20])
@@ -236,7 +238,7 @@ bool getColorMatrix(const WebKit::WebFilterOperation& op, SkScalar matrix[20])
 
 class FilterBufferState {
 public:
-    FilterBufferState(GrContext* grContext, const WebCore::FloatSize& size, unsigned textureId)
+    FilterBufferState(GrContext* grContext, const FloatSize& size, unsigned textureId)
         : m_grContext(grContext)
         , m_currentTexture(0)
     {
@@ -310,7 +312,7 @@ private:
 
 }
 
-namespace WebCore {
+namespace cc {
 
 WebKit::WebFilterOperations CCRenderSurfaceFilters::optimize(const WebKit::WebFilterOperations& filters)
 {
diff --git a/cc/CCRenderSurfaceFilters.h b/cc/CCRenderSurfaceFilters.h
index 92cd716..cd199b5 100644
--- a/cc/CCRenderSurfaceFilters.h
+++ b/cc/CCRenderSurfaceFilters.h
@@ -16,7 +16,7 @@ class WebFilterOperations;
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 class FloatSize;
 
 class CCRenderSurfaceFilters {
diff --git a/cc/CCRenderSurfaceFiltersTest.cpp b/cc/CCRenderSurfaceFiltersTest.cpp
index 8ec4332..fa76803 100644
--- a/cc/CCRenderSurfaceFiltersTest.cpp
+++ b/cc/CCRenderSurfaceFiltersTest.cpp
@@ -12,7 +12,7 @@
 #include <public/WebFilterOperations.h>
 #include <wtf/RefPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 
 namespace {
diff --git a/cc/CCRenderSurfaceTest.cpp b/cc/CCRenderSurfaceTest.cpp
index 7fc26ba..bfc7f42 100644
--- a/cc/CCRenderSurfaceTest.cpp
+++ b/cc/CCRenderSurfaceTest.cpp
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/CCRenderer.h b/cc/CCRenderer.h
index 2156b53..0dd6c43 100644
--- a/cc/CCRenderer.h
+++ b/cc/CCRenderer.h
@@ -12,7 +12,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCScopedTexture;
 class TextureCopier;
diff --git a/cc/CCRendererGL.cpp b/cc/CCRendererGL.cpp
index 974683d..bb1ba3b 100644
--- a/cc/CCRendererGL.cpp
+++ b/cc/CCRendererGL.cpp
@@ -48,7 +48,7 @@ using WebKit::WebGraphicsMemoryAllocation;
 using WebKit::WebSharedGraphicsContext3D;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 
@@ -1524,6 +1524,6 @@ bool CCRendererGL::isContextLost()
     return (m_context->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR);
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCRendererGL.h b/cc/CCRendererGL.h
index 202d412..27dbc06 100644
--- a/cc/CCRendererGL.h
+++ b/cc/CCRendererGL.h
@@ -27,7 +27,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCScopedTexture;
 class GeometryBinding;
diff --git a/cc/CCRenderingStats.h b/cc/CCRenderingStats.h
index 5926f6c..7d45a3a 100644
--- a/cc/CCRenderingStats.h
+++ b/cc/CCRenderingStats.h
@@ -5,7 +5,7 @@
 #ifndef CCRenderingStats_h
 #define CCRenderingStats_h
 
-namespace WebCore {
+namespace cc {
 
 struct CCRenderingStats {
     // FIXME: Rename these to animationFrameCount and screenFrameCount, crbug.com/138641.
diff --git a/cc/CCResourceProvider.cpp b/cc/CCResourceProvider.cpp
index 780539f..3cfc5f9 100644
--- a/cc/CCResourceProvider.cpp
+++ b/cc/CCResourceProvider.cpp
@@ -22,7 +22,7 @@
 
 using WebKit::WebGraphicsContext3D;
 
-namespace WebCore {
+namespace cc {
 
 static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
 {
diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h
index 8368683..bb01e85 100644
--- a/cc/CCResourceProvider.h
+++ b/cc/CCResourceProvider.h
@@ -23,7 +23,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class IntRect;
 class LayerTextureSubImage;
diff --git a/cc/CCResourceProviderTest.cpp b/cc/CCResourceProviderTest.cpp
index 3d30b0f..69a4de2 100644
--- a/cc/CCResourceProviderTest.cpp
+++ b/cc/CCResourceProviderTest.cpp
@@ -17,7 +17,7 @@
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 
 namespace {
diff --git a/cc/CCScheduler.cpp b/cc/CCScheduler.cpp
index 367c1f1..d101d06 100644
--- a/cc/CCScheduler.cpp
+++ b/cc/CCScheduler.cpp
@@ -8,7 +8,7 @@
 
 #include "TraceEvent.h"
 
-namespace WebCore {
+namespace cc {
 
 CCScheduler::CCScheduler(CCSchedulerClient* client, PassOwnPtr<CCFrameRateController> frameRateController)
     : m_client(client)
diff --git a/cc/CCScheduler.h b/cc/CCScheduler.h
index 5cabee9..4dc9b52 100644
--- a/cc/CCScheduler.h
+++ b/cc/CCScheduler.h
@@ -11,7 +11,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 
diff --git a/cc/CCSchedulerStateMachine.cpp b/cc/CCSchedulerStateMachine.cpp
index 2d88450..bd3d854 100644
--- a/cc/CCSchedulerStateMachine.cpp
+++ b/cc/CCSchedulerStateMachine.cpp
@@ -8,7 +8,7 @@
 #include "base/stringprintf.h"
 
 
-namespace WebCore {
+namespace cc {
 
 CCSchedulerStateMachine::CCSchedulerStateMachine()
     : m_commitState(COMMIT_STATE_IDLE)
diff --git a/cc/CCSchedulerStateMachine.h b/cc/CCSchedulerStateMachine.h
index 330b480..18ba9b4 100644
--- a/cc/CCSchedulerStateMachine.h
+++ b/cc/CCSchedulerStateMachine.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
+namespace cc {
 
 // The CCSchedulerStateMachine decides how to coordinate main thread activites
 // like painting/running javascript with rendering and input activities on the
diff --git a/cc/CCSchedulerStateMachineTest.cpp b/cc/CCSchedulerStateMachineTest.cpp
index d379869..86238bc 100644
--- a/cc/CCSchedulerStateMachineTest.cpp
+++ b/cc/CCSchedulerStateMachineTest.cpp
@@ -8,8 +8,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace cc;
 using namespace WTF;
-using namespace WebCore;
 
 namespace {
 
diff --git a/cc/CCSchedulerTest.cpp b/cc/CCSchedulerTest.cpp
index f567e76..dc9c9a9 100644
--- a/cc/CCSchedulerTest.cpp
+++ b/cc/CCSchedulerTest.cpp
@@ -11,9 +11,9 @@
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 
-using namespace WTF;
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
+using namespace WTF;
 
 namespace {
 
diff --git a/cc/CCScopedTexture.cpp b/cc/CCScopedTexture.cpp
index 524dfd4..d43ebe3 100644
--- a/cc/CCScopedTexture.cpp
+++ b/cc/CCScopedTexture.cpp
@@ -6,7 +6,7 @@
 
 #include "CCScopedTexture.h"
 
-namespace WebCore {
+namespace cc {
 
 CCScopedTexture::CCScopedTexture(CCResourceProvider* resourceProvider)
     : m_resourceProvider(resourceProvider)
diff --git a/cc/CCScopedTexture.h b/cc/CCScopedTexture.h
index 866c050c..59dca53 100644
--- a/cc/CCScopedTexture.h
+++ b/cc/CCScopedTexture.h
@@ -11,7 +11,7 @@
 #include "base/threading/platform_thread.h"
 #endif
 
-namespace WebCore {
+namespace cc {
 
 class CCScopedTexture : protected CCTexture {
     WTF_MAKE_NONCOPYABLE(CCScopedTexture);
diff --git a/cc/CCScopedTextureTest.cpp b/cc/CCScopedTextureTest.cpp
index b39efca..88194b8 100644
--- a/cc/CCScopedTextureTest.cpp
+++ b/cc/CCScopedTextureTest.cpp
@@ -13,7 +13,7 @@
 #include "GraphicsContext3D.h"
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
diff --git a/cc/CCScopedThreadProxy.h b/cc/CCScopedThreadProxy.h
index 32c5b8e..645a2f6 100644
--- a/cc/CCScopedThreadProxy.h
+++ b/cc/CCScopedThreadProxy.h
@@ -9,7 +9,7 @@
 #include "base/threading/platform_thread.h"
 #include <wtf/ThreadSafeRefCounted.h>
 
-namespace WebCore {
+namespace cc {
 
 // This class is a proxy used to post tasks to an target thread from any other thread. The proxy may be shut down at
 // any point from the target thread after which no more tasks posted to the proxy will run. In other words, all
diff --git a/cc/CCScrollbarAnimationController.cpp b/cc/CCScrollbarAnimationController.cpp
index fa5ef0d..2146c25 100644
--- a/cc/CCScrollbarAnimationController.cpp
+++ b/cc/CCScrollbarAnimationController.cpp
@@ -13,7 +13,7 @@
 #include "CCScrollbarAnimationControllerLinearFade.h"
 #endif
 
-namespace WebCore {
+namespace cc {
 
 #if OS(ANDROID)
 PassOwnPtr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
@@ -89,4 +89,4 @@ void CCScrollbarAnimationController::updateScrollOffsetAtTime(CCLayerImpl* scrol
     }
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCScrollbarAnimationController.h b/cc/CCScrollbarAnimationController.h
index 256b463..627ea6b 100644
--- a/cc/CCScrollbarAnimationController.h
+++ b/cc/CCScrollbarAnimationController.h
@@ -9,7 +9,7 @@
 #include "IntSize.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 class CCScrollbarLayerImpl;
@@ -59,6 +59,6 @@ private:
     IntSize m_maximum;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCScrollbarAnimationController_h
diff --git a/cc/CCScrollbarAnimationControllerLinearFade.cpp b/cc/CCScrollbarAnimationControllerLinearFade.cpp
index 0207fb1..95ad198 100644
--- a/cc/CCScrollbarAnimationControllerLinearFade.cpp
+++ b/cc/CCScrollbarAnimationControllerLinearFade.cpp
@@ -8,7 +8,7 @@
 
 #include "CCScrollbarLayerImpl.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCScrollbarAnimationControllerLinearFade> CCScrollbarAnimationControllerLinearFade::create(CCLayerImpl* scrollLayer, double fadeoutDelay, double fadeoutLength)
 {
@@ -74,5 +74,4 @@ float CCScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTi
     return 0;
 }
 
-} // namespace WebCore
-
+} // namespace cc
diff --git a/cc/CCScrollbarAnimationControllerLinearFade.h b/cc/CCScrollbarAnimationControllerLinearFade.h
index 76bf7d6..749dca5 100644
--- a/cc/CCScrollbarAnimationControllerLinearFade.h
+++ b/cc/CCScrollbarAnimationControllerLinearFade.h
@@ -7,7 +7,7 @@
 
 #include "CCScrollbarAnimationController.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCScrollbarAnimationControllerLinearFade : public CCScrollbarAnimationController {
 public:
@@ -34,6 +34,6 @@ private:
     double m_fadeoutLength;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCScrollbarAnimationControllerLinearFade_h
diff --git a/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp b/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
index 9294c65..a40b930 100644
--- a/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
+++ b/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
@@ -11,7 +11,7 @@
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace {
 
diff --git a/cc/CCScrollbarGeometryFixedThumb.cpp b/cc/CCScrollbarGeometryFixedThumb.cpp
index 89b8bf07..dc55829 100644
--- a/cc/CCScrollbarGeometryFixedThumb.cpp
+++ b/cc/CCScrollbarGeometryFixedThumb.cpp
@@ -14,7 +14,7 @@ using WebKit::WebRect;
 using WebKit::WebScrollbar;
 using WebKit::WebScrollbarThemeGeometry;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCScrollbarGeometryFixedThumb> CCScrollbarGeometryFixedThumb::create(PassOwnPtr<WebScrollbarThemeGeometry> geometry)
 {
diff --git a/cc/CCScrollbarGeometryFixedThumb.h b/cc/CCScrollbarGeometryFixedThumb.h
index 2b10c90..fe0db12 100644
--- a/cc/CCScrollbarGeometryFixedThumb.h
+++ b/cc/CCScrollbarGeometryFixedThumb.h
@@ -8,7 +8,7 @@
 #include "CCScrollbarGeometryStub.h"
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 // This scrollbar geometry class behaves exactly like a normal geometry except
 // it always returns a fixed thumb length. This allows a page to zoom (changing
diff --git a/cc/CCScrollbarGeometryStub.cpp b/cc/CCScrollbarGeometryStub.cpp
index 7ce7a1d..7be7b15 100644
--- a/cc/CCScrollbarGeometryStub.cpp
+++ b/cc/CCScrollbarGeometryStub.cpp
@@ -10,7 +10,7 @@ using WebKit::WebRect;
 using WebKit::WebScrollbar;
 using WebKit::WebScrollbarThemeGeometry;
 
-namespace WebCore {
+namespace cc {
 
 CCScrollbarGeometryStub::CCScrollbarGeometryStub(PassOwnPtr<WebScrollbarThemeGeometry> geometry)
     : m_geometry(geometry)
diff --git a/cc/CCScrollbarGeometryStub.h b/cc/CCScrollbarGeometryStub.h
index f44f706..0d23a4e 100644
--- a/cc/CCScrollbarGeometryStub.h
+++ b/cc/CCScrollbarGeometryStub.h
@@ -9,7 +9,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 // This subclass wraps an existing scrollbar geometry class so that
 // another class can derive from it and override specific functions, while
diff --git a/cc/CCScrollbarLayerImpl.cpp b/cc/CCScrollbarLayerImpl.cpp
index bac0fe4..b62d5cb 100644
--- a/cc/CCScrollbarLayerImpl.cpp
+++ b/cc/CCScrollbarLayerImpl.cpp
@@ -15,7 +15,7 @@
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCScrollbarLayerImpl> CCScrollbarLayerImpl::create(int id)
 {
diff --git a/cc/CCScrollbarLayerImpl.h b/cc/CCScrollbarLayerImpl.h
index acda561..0db2ae1 100644
--- a/cc/CCScrollbarLayerImpl.h
+++ b/cc/CCScrollbarLayerImpl.h
@@ -13,7 +13,7 @@
 #include <public/WebScrollbar.h>
 #include <public/WebVector.h>
 
-namespace WebCore {
+namespace cc {
 
 class ScrollView;
 
diff --git a/cc/CCSettings.cpp b/cc/CCSettings.cpp
index 32c023c..3044b65 100644
--- a/cc/CCSettings.cpp
+++ b/cc/CCSettings.cpp
@@ -12,7 +12,7 @@ static bool s_partialSwapEnabled = false;
 static bool s_acceleratedAnimationEnabled = false;
 } // namespace
 
-namespace WebCore {
+namespace cc {
 
 bool CCSettings::perTilePaintingEnabled() { return s_perTilePaintingEnabled; }
 void CCSettings::setPerTilePaintingEnabled(bool enabled) { s_perTilePaintingEnabled = enabled; }
@@ -30,4 +30,4 @@ void CCSettings::reset()
     s_acceleratedAnimationEnabled = false;
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCSettings.h b/cc/CCSettings.h
index 5bfbb86..d038112 100644
--- a/cc/CCSettings.h
+++ b/cc/CCSettings.h
@@ -7,7 +7,7 @@
 
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCSettings {
 public:
@@ -26,6 +26,6 @@ public:
     static void reset();
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCSettings_h
diff --git a/cc/CCSharedQuadState.cpp b/cc/CCSharedQuadState.cpp
index a5cf6f0..65fe2f0 100644
--- a/cc/CCSharedQuadState.cpp
+++ b/cc/CCSharedQuadState.cpp
@@ -8,7 +8,7 @@
 
 #include "FloatQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCSharedQuadState> CCSharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
 {
diff --git a/cc/CCSharedQuadState.h b/cc/CCSharedQuadState.h
index 0158086..f4f9726 100644
--- a/cc/CCSharedQuadState.h
+++ b/cc/CCSharedQuadState.h
@@ -9,7 +9,7 @@
 #include <public/WebTransformationMatrix.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 struct CCSharedQuadState {
     int id;
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp
index f6d4f67..0a52d64 100644
--- a/cc/CCSingleThreadProxy.cpp
+++ b/cc/CCSingleThreadProxy.cpp
@@ -16,7 +16,7 @@
 
 using namespace WTF;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost)
 {
diff --git a/cc/CCSingleThreadProxy.h b/cc/CCSingleThreadProxy.h
index acdf4cf..50c0b51 100644
--- a/cc/CCSingleThreadProxy.h
+++ b/cc/CCSingleThreadProxy.h
@@ -11,7 +11,7 @@
 #include <limits>
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerTreeHost;
 
@@ -125,6 +125,6 @@ private:
     DebugScopedSetMainThreadBlocked m_mainThreadBlocked;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCSolidColorDrawQuad.cpp b/cc/CCSolidColorDrawQuad.cpp
index 26f0d8a..ef49d8b 100644
--- a/cc/CCSolidColorDrawQuad.cpp
+++ b/cc/CCSolidColorDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCSolidColorDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCSolidColorDrawQuad> CCSolidColorDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color)
 {
diff --git a/cc/CCSolidColorDrawQuad.h b/cc/CCSolidColorDrawQuad.h
index a14c81a..9b4a3a0 100644
--- a/cc/CCSolidColorDrawQuad.h
+++ b/cc/CCSolidColorDrawQuad.h
@@ -9,7 +9,7 @@
 #include "SkColor.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCSolidColorLayerImpl.cpp b/cc/CCSolidColorLayerImpl.cpp
index 03b5dd3..e51930c 100644
--- a/cc/CCSolidColorLayerImpl.cpp
+++ b/cc/CCSolidColorLayerImpl.cpp
@@ -15,7 +15,7 @@
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 CCSolidColorLayerImpl::CCSolidColorLayerImpl(int id)
     : CCLayerImpl(id)
@@ -44,5 +44,5 @@ void CCSolidColorLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData&
     }
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCSolidColorLayerImpl.h b/cc/CCSolidColorLayerImpl.h
index 70aae713..73f5787 100644
--- a/cc/CCSolidColorLayerImpl.h
+++ b/cc/CCSolidColorLayerImpl.h
@@ -8,7 +8,7 @@
 #include "CCLayerImpl.h"
 #include <public/WebTransformationMatrix.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCSolidColorLayerImpl : public CCLayerImpl {
 public:
diff --git a/cc/CCSolidColorLayerImplTest.cpp b/cc/CCSolidColorLayerImplTest.cpp
index a6807b2..c6c0d54 100644
--- a/cc/CCSolidColorLayerImplTest.cpp
+++ b/cc/CCSolidColorLayerImplTest.cpp
@@ -14,7 +14,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace CCLayerTestCommon;
 
 namespace {
diff --git a/cc/CCStreamVideoDrawQuad.cpp b/cc/CCStreamVideoDrawQuad.cpp
index c766f98..4fcae06 100644
--- a/cc/CCStreamVideoDrawQuad.cpp
+++ b/cc/CCStreamVideoDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCStreamVideoDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCStreamVideoDrawQuad> CCStreamVideoDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
 {
diff --git a/cc/CCStreamVideoDrawQuad.h b/cc/CCStreamVideoDrawQuad.h
index 2ad0ed8..d0e4843 100644
--- a/cc/CCStreamVideoDrawQuad.h
+++ b/cc/CCStreamVideoDrawQuad.h
@@ -10,7 +10,7 @@
 
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCTexture.cpp b/cc/CCTexture.cpp
index 424d5fd..add8429 100644
--- a/cc/CCTexture.cpp
+++ b/cc/CCTexture.cpp
@@ -6,7 +6,7 @@
 
 #include "CCTexture.h"
 
-namespace WebCore {
+namespace cc {
 
 void CCTexture::setDimensions(const IntSize& size, GC3Denum format)
 {
diff --git a/cc/CCTexture.h b/cc/CCTexture.h
index 02699d27..8d0def3 100644
--- a/cc/CCTexture.h
+++ b/cc/CCTexture.h
@@ -10,7 +10,7 @@
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCTexture {
 public:
diff --git a/cc/CCTextureDrawQuad.cpp b/cc/CCTextureDrawQuad.cpp
index 4451ad2..ec2847b 100644
--- a/cc/CCTextureDrawQuad.cpp
+++ b/cc/CCTextureDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCTextureDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCTextureDrawQuad> CCTextureDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped)
 {
diff --git a/cc/CCTextureDrawQuad.h b/cc/CCTextureDrawQuad.h
index fd0a6d0..a4012df 100644
--- a/cc/CCTextureDrawQuad.h
+++ b/cc/CCTextureDrawQuad.h
@@ -9,7 +9,7 @@
 #include "FloatRect.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCTextureLayerImpl.cpp b/cc/CCTextureLayerImpl.cpp
index ef3e342..f262297 100644
--- a/cc/CCTextureLayerImpl.cpp
+++ b/cc/CCTextureLayerImpl.cpp
@@ -13,7 +13,7 @@
 #include "CCRenderer.h"
 #include "CCTextureDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 CCTextureLayerImpl::CCTextureLayerImpl(int id)
     : CCLayerImpl(id)
diff --git a/cc/CCTextureLayerImpl.h b/cc/CCTextureLayerImpl.h
index 275daab..f7d0de6 100644
--- a/cc/CCTextureLayerImpl.h
+++ b/cc/CCTextureLayerImpl.h
@@ -7,7 +7,7 @@
 
 #include "CCLayerImpl.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCTextureLayerImpl : public CCLayerImpl {
 public:
diff --git a/cc/CCTextureUpdateController.cpp b/cc/CCTextureUpdateController.cpp
index ca49d77..73e22c7 100644
--- a/cc/CCTextureUpdateController.cpp
+++ b/cc/CCTextureUpdateController.cpp
@@ -24,7 +24,7 @@ static const int textureUploadFlushPeriod = 4;
 
 } // anonymous namespace
 
-namespace WebCore {
+namespace cc {
 
 size_t CCTextureUpdateController::maxPartialTextureUpdates()
 {
diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
index 3d485a7..76f81a0 100644
--- a/cc/CCTextureUpdateController.h
+++ b/cc/CCTextureUpdateController.h
@@ -10,7 +10,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class TextureCopier;
 class TextureUploader;
diff --git a/cc/CCTextureUpdateControllerTest.cpp b/cc/CCTextureUpdateControllerTest.cpp
index 8d47f7c..48c34ec 100644
--- a/cc/CCTextureUpdateControllerTest.cpp
+++ b/cc/CCTextureUpdateControllerTest.cpp
@@ -16,7 +16,7 @@
 #include <public/WebThread.h>
 #include <wtf/RefPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 using testing::Test;
@@ -59,7 +59,7 @@ public:
 
     virtual void beginUploads() OVERRIDE;
     virtual void endUploads() OVERRIDE;
-    virtual void uploadTexture(WebCore::CCResourceProvider*, Parameters) OVERRIDE;
+    virtual void uploadTexture(cc::CCResourceProvider*, Parameters) OVERRIDE;
 
 private:
     CCTextureUpdateControllerTest* m_test;
@@ -233,7 +233,7 @@ void TextureUploaderForUploadTest::endUploads()
     m_test->onEndUploads();
 }
 
-void TextureUploaderForUploadTest::uploadTexture(WebCore::CCResourceProvider*, Parameters)
+void TextureUploaderForUploadTest::uploadTexture(cc::CCResourceProvider*, Parameters)
 {
     m_test->onUpload();
 }
@@ -518,7 +518,7 @@ TEST_F(CCTextureUpdateControllerTest, TripleUpdateFinalUpdateAllPartial)
     EXPECT_EQ(kFullUploads + kPartialUploads, m_numTotalUploads);
 }
 
-class FakeCCTextureUpdateControllerClient : public WebCore::CCTextureUpdateControllerClient {
+class FakeCCTextureUpdateControllerClient : public cc::CCTextureUpdateControllerClient {
 public:
     FakeCCTextureUpdateControllerClient() { reset(); }
     void reset() { m_completedCalled = false; }
@@ -530,9 +530,9 @@ protected:
     bool m_completedCalled;
 };
 
-class FakeCCTextureUpdateController : public WebCore::CCTextureUpdateController {
+class FakeCCTextureUpdateController : public cc::CCTextureUpdateController {
 public:
-    static PassOwnPtr<FakeCCTextureUpdateController> create(WebCore::CCTextureUpdateControllerClient* client, WebCore::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
+    static PassOwnPtr<FakeCCTextureUpdateController> create(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
     {
         return adoptPtr(new FakeCCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader));
     }
@@ -545,8 +545,8 @@ public:
     virtual size_t updateMoreTexturesSize() const OVERRIDE { return m_updateMoreTexturesSize; }
 
 protected:
-    FakeCCTextureUpdateController(WebCore::CCTextureUpdateControllerClient* client, WebCore::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
-        : WebCore::CCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader)
+    FakeCCTextureUpdateController(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
+        : cc::CCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader)
         , m_monotonicTimeNow(0)
         , m_updateMoreTexturesTime(0)
         , m_updateMoreTexturesSize(0) { }
diff --git a/cc/CCTextureUpdateQueue.cpp b/cc/CCTextureUpdateQueue.cpp
index 02f6c13..1619ab2 100644
--- a/cc/CCTextureUpdateQueue.cpp
+++ b/cc/CCTextureUpdateQueue.cpp
@@ -8,7 +8,7 @@
 
 #include "CCTextureUpdateQueue.h"
 
-namespace WebCore {
+namespace cc {
 
 CCTextureUpdateQueue::CCTextureUpdateQueue()
 {
diff --git a/cc/CCTextureUpdateQueue.h b/cc/CCTextureUpdateQueue.h
index afe33b3..5549b55 100644
--- a/cc/CCTextureUpdateQueue.h
+++ b/cc/CCTextureUpdateQueue.h
@@ -10,7 +10,7 @@
 #include <wtf/Deque.h>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCTextureUpdateQueue {
     WTF_MAKE_NONCOPYABLE(CCTextureUpdateQueue);
diff --git a/cc/CCThread.h b/cc/CCThread.h
index a20d5e0..e27ce91 100644
--- a/cc/CCThread.h
+++ b/cc/CCThread.h
@@ -9,7 +9,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
+namespace cc {
 
 // CCThread provides basic infrastructure for messaging with the compositor in a
 // platform-neutral way.
diff --git a/cc/CCThreadProxy.cpp b/cc/CCThreadProxy.cpp
index 009ac1c..ec86bef 100644
--- a/cc/CCThreadProxy.cpp
+++ b/cc/CCThreadProxy.cpp
@@ -29,7 +29,7 @@ static const double contextRecreationTickRate = 0.03;
 
 } // anonymous namespace
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 
@@ -919,4 +919,4 @@ void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple
     completion->signal();
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
index fde5857..0e26168 100644
--- a/cc/CCThreadProxy.h
+++ b/cc/CCThreadProxy.h
@@ -13,7 +13,7 @@
 #include "CCTextureUpdateController.h"
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCInputHandler;
 class CCLayerTreeHost;
diff --git a/cc/CCThreadTask.h b/cc/CCThreadTask.h
index c9d843e..25c5509 100644
--- a/cc/CCThreadTask.h
+++ b/cc/CCThreadTask.h
@@ -8,7 +8,7 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 template<typename T>
 class CCThreadTask0 : public CCThread::Task {
@@ -300,6 +300,6 @@ PassOwnPtr<CCThread::Task> createCCThreadTask(
 
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCThreadTask_h
diff --git a/cc/CCThreadTaskTest.cpp b/cc/CCThreadTaskTest.cpp
index 7a757ef..1ccb968 100644
--- a/cc/CCThreadTaskTest.cpp
+++ b/cc/CCThreadTaskTest.cpp
@@ -9,8 +9,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+using namespace cc;
 using namespace WTF;
-using namespace WebCore;
 
 namespace {
 
diff --git a/cc/CCThreadedTest.cpp b/cc/CCThreadedTest.cpp
index 332c7bc..4a1f2cb 100644
--- a/cc/CCThreadedTest.cpp
+++ b/cc/CCThreadedTest.cpp
@@ -33,7 +33,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 
 namespace WebKitTests {
@@ -132,9 +132,9 @@ MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const CCLayer
 }
 
 // Adapts CCLayerTreeHost for test. Injects MockLayerTreeHostImpl.
-class MockLayerTreeHost : public WebCore::CCLayerTreeHost {
+class MockLayerTreeHost : public cc::CCLayerTreeHost {
 public:
-    static PassOwnPtr<MockLayerTreeHost> create(TestHooks* testHooks, WebCore::CCLayerTreeHostClient* client, PassRefPtr<WebCore::LayerChromium> rootLayer, const WebCore::CCLayerTreeSettings& settings)
+    static PassOwnPtr<MockLayerTreeHost> create(TestHooks* testHooks, cc::CCLayerTreeHostClient* client, PassRefPtr<cc::LayerChromium> rootLayer, const cc::CCLayerTreeSettings& settings)
     {
         OwnPtr<MockLayerTreeHost> layerTreeHost(adoptPtr(new MockLayerTreeHost(testHooks, client, settings)));
         bool success = layerTreeHost->initialize();
@@ -149,7 +149,7 @@ public:
         return layerTreeHost.release();
     }
 
-    virtual PassOwnPtr<WebCore::CCLayerTreeHostImpl> createLayerTreeHostImpl(WebCore::CCLayerTreeHostImplClient* client)
+    virtual PassOwnPtr<cc::CCLayerTreeHostImpl> createLayerTreeHostImpl(cc::CCLayerTreeHostImplClient* client)
     {
         return MockLayerTreeHostImpl::create(m_testHooks, settings(), client);
     }
@@ -161,7 +161,7 @@ public:
     }
 
 private:
-    MockLayerTreeHost(TestHooks* testHooks, WebCore::CCLayerTreeHostClient* client, const WebCore::CCLayerTreeSettings& settings)
+    MockLayerTreeHost(TestHooks* testHooks, cc::CCLayerTreeHostClient* client, const cc::CCLayerTreeSettings& settings)
         : CCLayerTreeHost(client, settings)
         , m_testHooks(testHooks)
     {
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
index 8dc4393..53da84e 100644
--- a/cc/CCThreadedTest.h
+++ b/cc/CCThreadedTest.h
@@ -13,7 +13,7 @@
 #include <public/WebAnimationDelegate.h>
 #include <public/WebThread.h>
 
-namespace WebCore {
+namespace cc {
 class CCLayerImpl;
 class CCLayerTreeHost;
 class CCLayerTreeHostClient;
@@ -26,13 +26,13 @@ namespace WebKitTests {
 // Used by test stubs to notify the test when something interesting happens.
 class TestHooks : public WebKit::WebAnimationDelegate {
 public:
-    virtual void beginCommitOnCCThread(WebCore::CCLayerTreeHostImpl*) { }
-    virtual void commitCompleteOnCCThread(WebCore::CCLayerTreeHostImpl*) { }
-    virtual bool prepareToDrawOnCCThread(WebCore::CCLayerTreeHostImpl*) { return true; }
-    virtual void drawLayersOnCCThread(WebCore::CCLayerTreeHostImpl*) { }
-    virtual void animateLayers(WebCore::CCLayerTreeHostImpl*, double monotonicTime) { }
-    virtual void willAnimateLayers(WebCore::CCLayerTreeHostImpl*, double monotonicTime) { }
-    virtual void applyScrollAndScale(const WebCore::IntSize&, float) { }
+    virtual void beginCommitOnCCThread(cc::CCLayerTreeHostImpl*) { }
+    virtual void commitCompleteOnCCThread(cc::CCLayerTreeHostImpl*) { }
+    virtual bool prepareToDrawOnCCThread(cc::CCLayerTreeHostImpl*) { return true; }
+    virtual void drawLayersOnCCThread(cc::CCLayerTreeHostImpl*) { }
+    virtual void animateLayers(cc::CCLayerTreeHostImpl*, double monotonicTime) { }
+    virtual void willAnimateLayers(cc::CCLayerTreeHostImpl*, double monotonicTime) { }
+    virtual void applyScrollAndScale(const cc::IntSize&, float) { }
     virtual void animate(double monotonicTime) { }
     virtual void layout() { }
     virtual void didRecreateOutputSurface(bool succeeded) { }
@@ -51,7 +51,7 @@ public:
 class TimeoutTask;
 class BeginTask;
 
-class MockCCLayerTreeHostClient : public WebCore::CCLayerTreeHostClient {
+class MockCCLayerTreeHostClient : public cc::CCLayerTreeHostClient {
 };
 
 // The CCThreadedTests runs with the main loop running. It instantiates a single MockLayerTreeHost and associated
@@ -87,12 +87,12 @@ public:
 
     void clearTimeout() { m_timeoutTask = 0; }
 
-    WebCore::CCLayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
+    cc::CCLayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
 
 protected:
     CCThreadedTest();
 
-    virtual void initializeSettings(WebCore::CCLayerTreeSettings&) { }
+    virtual void initializeSettings(cc::CCLayerTreeSettings&) { }
 
     virtual void scheduleComposite();
 
@@ -112,12 +112,12 @@ protected:
     virtual void runTest(bool threaded);
     WebKit::WebThread* webThread() const { return m_webThread.get(); }
 
-    WebCore::CCLayerTreeSettings m_settings;
+    cc::CCLayerTreeSettings m_settings;
     OwnPtr<MockCCLayerTreeHostClient> m_client;
-    OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
+    OwnPtr<cc::CCLayerTreeHost> m_layerTreeHost;
 
 protected:
-    RefPtr<WebCore::CCScopedThreadProxy> m_mainThreadProxy;
+    RefPtr<cc::CCScopedThreadProxy> m_mainThreadProxy;
 
 private:
     bool m_beginning;
@@ -141,9 +141,9 @@ public:
 };
 
 // Adapts CCLayerTreeHostImpl for test. Runs real code, then invokes test hooks.
-class MockLayerTreeHostImpl : public WebCore::CCLayerTreeHostImpl {
+class MockLayerTreeHostImpl : public cc::CCLayerTreeHostImpl {
 public:
-    static PassOwnPtr<MockLayerTreeHostImpl> create(TestHooks*, const WebCore::CCLayerTreeSettings&, WebCore::CCLayerTreeHostImplClient*);
+    static PassOwnPtr<MockLayerTreeHostImpl> create(TestHooks*, const cc::CCLayerTreeSettings&, cc::CCLayerTreeHostImplClient*);
 
     virtual void beginCommit();
     virtual void commitComplete();
@@ -151,7 +151,7 @@ public:
     virtual void drawLayers(const FrameData&);
 
     // Make these public.
-    typedef Vector<WebCore::CCLayerImpl*> CCLayerList;
+    typedef Vector<cc::CCLayerImpl*> CCLayerList;
     using CCLayerTreeHostImpl::calculateRenderSurfaceLayerList;
 
 protected:
@@ -159,7 +159,7 @@ protected:
     virtual double lowFrequencyAnimationInterval() const;
 
 private:
-    MockLayerTreeHostImpl(TestHooks*, const WebCore::CCLayerTreeSettings&, WebCore::CCLayerTreeHostImplClient*);
+    MockLayerTreeHostImpl(TestHooks*, const cc::CCLayerTreeSettings&, cc::CCLayerTreeHostImplClient*);
 
     TestHooks* m_testHooks;
 };
diff --git a/cc/CCTileDrawQuad.cpp b/cc/CCTileDrawQuad.cpp
index 6d13788..a49cf86 100644
--- a/cc/CCTileDrawQuad.cpp
+++ b/cc/CCTileDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCTileDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCTileDrawQuad> CCTileDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
 {
diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h
index 9a9969c..c9dadb7 100644
--- a/cc/CCTileDrawQuad.h
+++ b/cc/CCTileDrawQuad.h
@@ -11,7 +11,7 @@
 #include "IntSize.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 #pragma pack(push, 4)
 
diff --git a/cc/CCTiledLayerImpl.cpp b/cc/CCTiledLayerImpl.cpp
index 5c63275..ead258a 100644
--- a/cc/CCTiledLayerImpl.cpp
+++ b/cc/CCTiledLayerImpl.cpp
@@ -24,7 +24,7 @@
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 static const int debugTileBorderWidth = 1;
 static const int debugTileBorderAlpha = 100;
@@ -214,6 +214,6 @@ void CCTiledLayerImpl::didLoseContext()
     m_tiler->reset();
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CCTiledLayerImpl.h b/cc/CCTiledLayerImpl.h
index 48d52f5..56d3521 100644
--- a/cc/CCTiledLayerImpl.h
+++ b/cc/CCTiledLayerImpl.h
@@ -8,7 +8,7 @@
 #include "CCLayerImpl.h"
 #include <public/WebTransformationMatrix.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerTilingData;
 class DrawableTile;
diff --git a/cc/CCTiledLayerImplTest.cpp b/cc/CCTiledLayerImplTest.cpp
index bd4642e..062aac3 100644
--- a/cc/CCTiledLayerImplTest.cpp
+++ b/cc/CCTiledLayerImplTest.cpp
@@ -15,7 +15,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace CCLayerTestCommon;
 
 namespace {
diff --git a/cc/CCTimeSource.h b/cc/CCTimeSource.h
index e74c508..e0536cb 100644
--- a/cc/CCTimeSource.h
+++ b/cc/CCTimeSource.h
@@ -7,7 +7,7 @@
 
 #include <wtf/RefCounted.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 
diff --git a/cc/CCTimer.cpp b/cc/CCTimer.cpp
index 52222b7..3e68632 100644
--- a/cc/CCTimer.cpp
+++ b/cc/CCTimer.cpp
@@ -8,7 +8,7 @@
 
 #include "CCThread.h"
 
-namespace WebCore {
+namespace cc {
 
 class CCTimerTask : public CCThread::Task {
 public:
@@ -76,4 +76,4 @@ void CCTimer::stop()
     m_task = 0;
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCTimer.h b/cc/CCTimer.h
index 7cf3340..7cb2f1b 100644
--- a/cc/CCTimer.h
+++ b/cc/CCTimer.h
@@ -6,7 +6,7 @@
 #define CCTimer_h
 
 
-namespace WebCore {
+namespace cc {
 
 class CCThread;
 class CCTimerTask;
@@ -37,6 +37,6 @@ private:
     CCTimerTask* m_task; // weak pointer
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/CCTimerTest.cpp b/cc/CCTimerTest.cpp
index fe65d6e..aabc42f 100644
--- a/cc/CCTimerTest.cpp
+++ b/cc/CCTimerTest.cpp
@@ -9,7 +9,7 @@
 #include "CCSchedulerTestCommon.h"
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 
 namespace {
diff --git a/cc/CCTimingFunction.cpp b/cc/CCTimingFunction.cpp
index 6446948..224a0ba 100644
--- a/cc/CCTimingFunction.cpp
+++ b/cc/CCTimingFunction.cpp
@@ -12,7 +12,7 @@ namespace {
 const double epsilon = 1e-6;
 } // namespace
 
-namespace WebCore {
+namespace cc {
 
 CCTimingFunction::CCTimingFunction()
 {
@@ -73,4 +73,4 @@ PassOwnPtr<CCTimingFunction> CCEaseInOutTimingFunction::create()
     return CCCubicBezierTimingFunction::create(0.42, 0, 0.58, 1);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/CCTimingFunction.h b/cc/CCTimingFunction.h
index 30bba72..990403a 100644
--- a/cc/CCTimingFunction.h
+++ b/cc/CCTimingFunction.h
@@ -9,7 +9,7 @@
 #include "UnitBezier.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 // See http://www.w3.org/TR/css3-transitions/.
 class CCTimingFunction : public CCFloatAnimationCurve {
@@ -58,7 +58,6 @@ public:
     static PassOwnPtr<CCTimingFunction> create();
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // CCTimingFunction_h
-
diff --git a/cc/CCVideoLayerImpl.cpp b/cc/CCVideoLayerImpl.cpp
index 8b0bcd4..becf213 100644
--- a/cc/CCVideoLayerImpl.cpp
+++ b/cc/CCVideoLayerImpl.cpp
@@ -21,7 +21,7 @@
 #include "NotImplemented.h"
 #include <public/WebVideoFrame.h>
 
-namespace WebCore {
+namespace cc {
 
 CCVideoLayerImpl::CCVideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider)
     : CCLayerImpl(id)
diff --git a/cc/CCVideoLayerImpl.h b/cc/CCVideoLayerImpl.h
index bd216cc..cc65b1f 100644
--- a/cc/CCVideoLayerImpl.h
+++ b/cc/CCVideoLayerImpl.h
@@ -15,7 +15,7 @@ namespace WebKit {
 class WebVideoFrame;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerTreeHostImpl;
 class CCVideoLayerImpl;
diff --git a/cc/CCYUVVideoDrawQuad.cpp b/cc/CCYUVVideoDrawQuad.cpp
index 66e0fc1..9a7744e 100644
--- a/cc/CCYUVVideoDrawQuad.cpp
+++ b/cc/CCYUVVideoDrawQuad.cpp
@@ -6,7 +6,7 @@
 
 #include "CCYUVVideoDrawQuad.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCYUVVideoDrawQuad> CCYUVVideoDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const CCVideoLayerImpl::FramePlane& yPlane, const CCVideoLayerImpl::FramePlane& uPlane, const CCVideoLayerImpl::FramePlane& vPlane)
 {
diff --git a/cc/CCYUVVideoDrawQuad.h b/cc/CCYUVVideoDrawQuad.h
index 240922f..e626267 100644
--- a/cc/CCYUVVideoDrawQuad.h
+++ b/cc/CCYUVVideoDrawQuad.h
@@ -9,7 +9,7 @@
 #include "CCVideoLayerImpl.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCYUVVideoDrawQuad : public CCDrawQuad {
     WTF_MAKE_NONCOPYABLE(CCYUVVideoDrawQuad);
diff --git a/cc/CanvasLayerTextureUpdater.cpp b/cc/CanvasLayerTextureUpdater.cpp
index dd63b97..eae5d16a 100644
--- a/cc/CanvasLayerTextureUpdater.cpp
+++ b/cc/CanvasLayerTextureUpdater.cpp
@@ -19,7 +19,7 @@
 #include "TraceEvent.h"
 #include <wtf/CurrentTime.h>
 
-namespace WebCore {
+namespace cc {
 
 CanvasLayerTextureUpdater::CanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
     : m_painter(painter)
@@ -34,12 +34,12 @@ void CanvasLayerTextureUpdater::paintContents(SkCanvas* canvas, const IntRect& c
 {
     TRACE_EVENT0("cc", "CanvasLayerTextureUpdater::paintContents");
     canvas->save();
-    canvas->translate(WebCoreFloatToSkScalar(-contentRect.x()), WebCoreFloatToSkScalar(-contentRect.y()));
+    canvas->translate(CCFloatToSkScalar(-contentRect.x()), CCFloatToSkScalar(-contentRect.y()));
 
     IntRect layerRect = contentRect;
 
     if (contentsWidthScale != 1 || contentsHeightScale != 1) {
-        canvas->scale(WebCoreFloatToSkScalar(contentsWidthScale), WebCoreFloatToSkScalar(contentsHeightScale));
+        canvas->scale(CCFloatToSkScalar(contentsWidthScale), CCFloatToSkScalar(contentsHeightScale));
 
         FloatRect rect = contentRect;
         rect.scale(1 / contentsWidthScale, 1 / contentsHeightScale);
@@ -66,5 +66,5 @@ void CanvasLayerTextureUpdater::paintContents(SkCanvas* canvas, const IntRect& c
     m_contentRect = contentRect;
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/CanvasLayerTextureUpdater.h b/cc/CanvasLayerTextureUpdater.h
index 051f9fc..c8bb9b0 100644
--- a/cc/CanvasLayerTextureUpdater.h
+++ b/cc/CanvasLayerTextureUpdater.h
@@ -12,7 +12,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class LayerPainterChromium;
 
@@ -34,6 +34,6 @@ private:
     OwnPtr<LayerPainterChromium> m_painter;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // CanvasLayerTextureUpdater_h
diff --git a/cc/ContentLayerChromium.cpp b/cc/ContentLayerChromium.cpp
index 4a5b788..c662f69 100644
--- a/cc/ContentLayerChromium.cpp
+++ b/cc/ContentLayerChromium.cpp
@@ -18,7 +18,7 @@
 #include <public/Platform.h>
 #include <wtf/CurrentTime.h>
 
-namespace WebCore {
+namespace cc {
 
 ContentLayerPainter::ContentLayerPainter(ContentLayerChromiumClient* client)
     : m_client(client)
diff --git a/cc/ContentLayerChromium.h b/cc/ContentLayerChromium.h
index 32bbc76..2e824d4 100644
--- a/cc/ContentLayerChromium.h
+++ b/cc/ContentLayerChromium.h
@@ -13,7 +13,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class ContentLayerChromiumClient;
 class FloatRect;
diff --git a/cc/ContentLayerChromiumClient.h b/cc/ContentLayerChromiumClient.h
index f2f85b2..54a9267 100644
--- a/cc/ContentLayerChromiumClient.h
+++ b/cc/ContentLayerChromiumClient.h
@@ -7,7 +7,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 class FloatRect;
 class IntRect;
 
diff --git a/cc/DEPS b/cc/DEPS
index c24f5f8..dd7cfe4 100644
--- a/cc/DEPS
+++ b/cc/DEPS
@@ -10,11 +10,22 @@ include_rules = [
   "+third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h",
   "+third_party/WebKit/Source/WebCore/platform/graphics/IntRect.h",
   "+third_party/WebKit/Source/WebCore/platform/graphics/IntSize.h",
+  "+Source/WebCore/platform/graphics/FloatPoint.h",
+  "+Source/WebCore/platform/graphics/FloatPoint3D.h",
+  "+Source/WebCore/platform/graphics/FloatQuad.h",
+  "+Source/WebCore/platform/graphics/FloatRect.h",
+  "+Source/WebCore/platform/graphics/FloatSize.h",
+  "+Source/WebCore/platform/graphics/IntPoint.h",
+  "+Source/WebCore/platform/graphics/IntRect.h",
+  "+Source/WebCore/platform/graphics/IntSize.h",
 # http://crbug.com/144540
   "+third_party/WebKit/Source/WebCore/platform/graphics/Region.h",
+  "+Source/WebCore/platform/graphics/Region.h",
 # TODO(jamesr): Resolve these
   "+third_party/WebKit/Source/WebCore/platform/graphics/UnitBezier.h",
   "+third_party/WebKit/Source/WebCore/platform/graphics/gpu/TilingData.h",
+  "+Source/WebCore/platform/graphics/UnitBezier.h",
+  "+Source/WebCore/platform/graphics/gpu/TilingData.h",
 # TODO(jamesr): We depend on these things just to do test setup. We should be
 # able to run unit tests without these dependencies.
   "+third_party/WebKit/Source/Platform/chromium/public/Platform.h",
diff --git a/cc/FloatQuadTest.cpp b/cc/FloatQuadTest.cpp
index 7e8358b..ff8cffe 100644
--- a/cc/FloatQuadTest.cpp
+++ b/cc/FloatQuadTest.cpp
@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using WebKit::WebTransformationMatrix;
 
 namespace {
diff --git a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
index cc3ad38..3ae8aef 100644
--- a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
+++ b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
@@ -19,7 +19,7 @@
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebSharedGraphicsContext3D;
 
-namespace WebCore {
+namespace cc {
 
 static PassOwnPtr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
                                                     IntSize canvasSize,
@@ -115,5 +115,5 @@ void FrameBufferSkPictureCanvasLayerTextureUpdater::updateTextureRect(WebGraphic
     context->flush();
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h
index 5a9452f..77d1013 100644
--- a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h
+++ b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h
@@ -17,7 +17,7 @@ class WebGraphicsContext3D;
 class WebSharedGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 // This class records the contentRect into an SkPicture, then uses accelerated
 // drawing to update the texture. The accelerated drawing goes to an
@@ -47,6 +47,6 @@ public:
 private:
     explicit FrameBufferSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 };
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // FrameBufferSkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/GeometryBinding.cpp b/cc/GeometryBinding.cpp
index 65ee243..bac1059 100644
--- a/cc/GeometryBinding.cpp
+++ b/cc/GeometryBinding.cpp
@@ -12,7 +12,7 @@
 #include "GraphicsContext3D.h"
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, const FloatRect& quadVertexRect)
     : m_context(context)
@@ -56,6 +56,6 @@ void GeometryBinding::prepareForDraw()
     GLC(m_context, m_context->enableVertexAttribArray(texCoordAttribLocation()));
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/GeometryBinding.h b/cc/GeometryBinding.h
index c018ff7..f0b6e72 100644
--- a/cc/GeometryBinding.h
+++ b/cc/GeometryBinding.h
@@ -13,7 +13,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class GeometryBinding {
 public:
@@ -41,7 +41,7 @@ private:
     bool m_initialized;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/HeadsUpDisplayLayerChromium.cpp b/cc/HeadsUpDisplayLayerChromium.cpp
index 9a782cd..fcd0b23 100644
--- a/cc/HeadsUpDisplayLayerChromium.cpp
+++ b/cc/HeadsUpDisplayLayerChromium.cpp
@@ -10,7 +10,7 @@
 #include "CCLayerTreeHost.h"
 #include "TraceEvent.h"
 
-namespace WebCore {
+namespace cc {
 
 PassRefPtr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
 {
diff --git a/cc/HeadsUpDisplayLayerChromium.h b/cc/HeadsUpDisplayLayerChromium.h
index 2f81574..a28351b 100644
--- a/cc/HeadsUpDisplayLayerChromium.h
+++ b/cc/HeadsUpDisplayLayerChromium.h
@@ -10,7 +10,7 @@
 #include "IntSize.h"
 #include "LayerChromium.h"
 
-namespace WebCore {
+namespace cc {
 
 class HeadsUpDisplayLayerChromium : public LayerChromium {
 public:
diff --git a/cc/IOSurfaceLayerChromium.cpp b/cc/IOSurfaceLayerChromium.cpp
index fde7140..896defa 100644
--- a/cc/IOSurfaceLayerChromium.cpp
+++ b/cc/IOSurfaceLayerChromium.cpp
@@ -10,7 +10,7 @@
 
 #include "CCIOSurfaceLayerImpl.h"
 
-namespace WebCore {
+namespace cc {
 
 PassRefPtr<IOSurfaceLayerChromium> IOSurfaceLayerChromium::create()
 {
diff --git a/cc/IOSurfaceLayerChromium.h b/cc/IOSurfaceLayerChromium.h
index 47247f8..f1eb8e1 100644
--- a/cc/IOSurfaceLayerChromium.h
+++ b/cc/IOSurfaceLayerChromium.h
@@ -10,7 +10,7 @@
 
 #include "LayerChromium.h"
 
-namespace WebCore {
+namespace cc {
 
 class IOSurfaceLayerChromium : public LayerChromium {
 public:
diff --git a/cc/ImageLayerChromium.cpp b/cc/ImageLayerChromium.cpp
index 09c97d8..d728bce 100644
--- a/cc/ImageLayerChromium.cpp
+++ b/cc/ImageLayerChromium.cpp
@@ -12,7 +12,7 @@
 #include "LayerTextureUpdater.h"
 #include "PlatformColor.h"
 
-namespace WebCore {
+namespace cc {
 
 class ImageLayerTextureUpdater : public LayerTextureUpdater {
 public:
diff --git a/cc/ImageLayerChromium.h b/cc/ImageLayerChromium.h
index 8be33a7..8f76363 100644
--- a/cc/ImageLayerChromium.h
+++ b/cc/ImageLayerChromium.h
@@ -11,7 +11,7 @@
 #include "ContentLayerChromium.h"
 #include "SkBitmap.h"
 
-namespace WebCore {
+namespace cc {
 
 class ImageLayerTextureUpdater;
 
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp
index 09d955e..59a63ef 100644
--- a/cc/LayerChromium.cpp
+++ b/cc/LayerChromium.cpp
@@ -20,7 +20,7 @@
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 static int s_nextLayerId = 1;
 
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h
index 583a448..fed90bf 100644
--- a/cc/LayerChromium.h
+++ b/cc/LayerChromium.h
@@ -29,7 +29,7 @@ class WebAnimationDelegate;
 class WebLayerScrollClient;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCActiveAnimation;
 struct CCAnimationEvent;
diff --git a/cc/LayerPainterChromium.h b/cc/LayerPainterChromium.h
index 98eadf5..d552382 100644
--- a/cc/LayerPainterChromium.h
+++ b/cc/LayerPainterChromium.h
@@ -10,7 +10,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class FloatRect;
 class IntRect;
@@ -21,7 +21,6 @@ public:
     virtual void paint(SkCanvas*, const IntRect& contentRect, FloatRect& opaque) = 0;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerPainterChromium_h
-
diff --git a/cc/LayerTextureSubImage.cpp b/cc/LayerTextureSubImage.cpp
index 961693b..60f5311 100644
--- a/cc/LayerTextureSubImage.cpp
+++ b/cc/LayerTextureSubImage.cpp
@@ -16,7 +16,7 @@
 
 using WebKit::WebGraphicsContext3D;
 
-namespace WebCore {
+namespace cc {
 
 LayerTextureSubImage::LayerTextureSubImage(bool useMapTexSubImage)
     : m_useMapTexSubImage(useMapTexSubImage)
@@ -112,6 +112,6 @@ void LayerTextureSubImage::uploadWithMapTexSubImage(const uint8_t* image, const
     GLC(context, context->unmapTexSubImage2DCHROMIUM(pixelDest));
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/LayerTextureSubImage.h b/cc/LayerTextureSubImage.h
index bb63bf1..2c6cc14 100644
--- a/cc/LayerTextureSubImage.h
+++ b/cc/LayerTextureSubImage.h
@@ -17,7 +17,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class LayerTextureSubImage {
 public:
@@ -41,6 +41,6 @@ private:
     OwnArrayPtr<uint8_t> m_subImage;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerTextureSubImage_h
diff --git a/cc/LayerTextureUpdater.h b/cc/LayerTextureUpdater.h
index 68a9dd9..a8e649d 100644
--- a/cc/LayerTextureUpdater.h
+++ b/cc/LayerTextureUpdater.h
@@ -12,7 +12,7 @@
 #include "GraphicsTypes3D.h"
 #include <wtf/RefCounted.h>
 
-namespace WebCore {
+namespace cc {
 
 class IntRect;
 class IntSize;
@@ -63,6 +63,6 @@ public:
     virtual void setOpaque(bool) { }
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // LayerTextureUpdater_h
diff --git a/cc/PlatformColor.h b/cc/PlatformColor.h
index 2898047..61ffd31 100644
--- a/cc/PlatformColor.h
+++ b/cc/PlatformColor.h
@@ -10,7 +10,7 @@
 #include "SkTypes.h" 
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 class PlatformColor {
 public:
@@ -53,6 +53,6 @@ public:
     }
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif
diff --git a/cc/ProgramBinding.cpp b/cc/ProgramBinding.cpp
index 1c175b9..27d5226 100644
--- a/cc/ProgramBinding.cpp
+++ b/cc/ProgramBinding.cpp
@@ -16,7 +16,7 @@
 
 using WebKit::WebGraphicsContext3D;
 
-namespace WebCore {
+namespace cc {
 
 ProgramBindingBase::ProgramBindingBase()
     : m_program(0)
@@ -142,6 +142,6 @@ void ProgramBindingBase::cleanupShaders(WebGraphicsContext3D* context)
     }
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/ProgramBinding.h b/cc/ProgramBinding.h
index 5c59fd2..9f0d067 100644
--- a/cc/ProgramBinding.h
+++ b/cc/ProgramBinding.h
@@ -13,7 +13,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class ProgramBindingBase {
 public:
@@ -77,7 +77,7 @@ private:
     FragmentShader m_fragmentShader;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/RateLimiter.cpp b/cc/RateLimiter.cpp
index 7455703..8a0f018 100644
--- a/cc/RateLimiter.cpp
+++ b/cc/RateLimiter.cpp
@@ -12,7 +12,7 @@
 #include "TraceEvent.h"
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 class RateLimiter::Task : public CCThread::Task {
 public:
diff --git a/cc/RateLimiter.h b/cc/RateLimiter.h
index 8cb8a1d..13c7915 100644
--- a/cc/RateLimiter.h
+++ b/cc/RateLimiter.h
@@ -14,7 +14,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class RateLimiterClient {
 public:
diff --git a/cc/RenderSurfaceChromium.cpp b/cc/RenderSurfaceChromium.cpp
index 0ca05ee..320a3d8 100644
--- a/cc/RenderSurfaceChromium.cpp
+++ b/cc/RenderSurfaceChromium.cpp
@@ -14,7 +14,7 @@
 
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 RenderSurfaceChromium::RenderSurfaceChromium(LayerChromium* owningLayer)
     : m_owningLayer(owningLayer)
diff --git a/cc/RenderSurfaceChromium.h b/cc/RenderSurfaceChromium.h
index bd27b1c..22d8880 100644
--- a/cc/RenderSurfaceChromium.h
+++ b/cc/RenderSurfaceChromium.h
@@ -13,7 +13,7 @@
 #include <public/WebTransformationMatrix.h>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
+namespace cc {
 
 class LayerChromium;
 
diff --git a/cc/ScrollbarLayerChromium.cpp b/cc/ScrollbarLayerChromium.cpp
index a82567b..85801e6 100644
--- a/cc/ScrollbarLayerChromium.cpp
+++ b/cc/ScrollbarLayerChromium.cpp
@@ -17,7 +17,7 @@
 
 using WebKit::WebRect;
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCLayerImpl> ScrollbarLayerChromium::createCCLayerImpl()
 {
diff --git a/cc/ScrollbarLayerChromium.h b/cc/ScrollbarLayerChromium.h
index f5f7d78..b4b8b8b 100644
--- a/cc/ScrollbarLayerChromium.h
+++ b/cc/ScrollbarLayerChromium.h
@@ -14,7 +14,7 @@
 #include <public/WebScrollbarThemeGeometry.h>
 #include <public/WebScrollbarThemePainter.h>
 
-namespace WebCore {
+namespace cc {
 
 class Scrollbar;
 class ScrollbarThemeComposite;
diff --git a/cc/ShaderChromium.cpp b/cc/ShaderChromium.cpp
index bfb642e..f08adc1 100644
--- a/cc/ShaderChromium.cpp
+++ b/cc/ShaderChromium.cpp
@@ -16,7 +16,7 @@
 
 using WebKit::WebGraphicsContext3D;
 
-namespace WebCore {
+namespace cc {
 
 namespace {
 
@@ -880,6 +880,6 @@ std::string FragmentShaderCheckerboard::getShaderString() const
     );
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/ShaderChromium.h b/cc/ShaderChromium.h
index 503ae47..753d92a 100644
--- a/cc/ShaderChromium.h
+++ b/cc/ShaderChromium.h
@@ -14,7 +14,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class VertexShaderPosTex {
 public:
@@ -344,7 +344,7 @@ private:
     int m_frequencyLocation;
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
diff --git a/cc/SkPictureCanvasLayerTextureUpdater.cpp b/cc/SkPictureCanvasLayerTextureUpdater.cpp
index 3668d34..62026d7 100644
--- a/cc/SkPictureCanvasLayerTextureUpdater.cpp
+++ b/cc/SkPictureCanvasLayerTextureUpdater.cpp
@@ -13,7 +13,7 @@
 #include "SkCanvas.h"
 #include "TraceEvent.h"
 
-namespace WebCore {
+namespace cc {
 
 SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
     : CanvasLayerTextureUpdater(painter)
@@ -43,5 +43,5 @@ void SkPictureCanvasLayerTextureUpdater::setOpaque(bool opaque)
     m_layerIsOpaque = opaque;
 }
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/SkPictureCanvasLayerTextureUpdater.h b/cc/SkPictureCanvasLayerTextureUpdater.h
index 2635ff7..fd9bb5f 100644
--- a/cc/SkPictureCanvasLayerTextureUpdater.h
+++ b/cc/SkPictureCanvasLayerTextureUpdater.h
@@ -13,7 +13,7 @@
 
 class SkCanvas;
 
-namespace WebCore {
+namespace cc {
 
 class LayerPainterChromium;
 
@@ -43,6 +43,6 @@ private:
     bool m_layerIsOpaque;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)
 #endif // SkPictureCanvasLayerTextureUpdater_h
diff --git a/cc/SolidColorLayerChromium.cpp b/cc/SolidColorLayerChromium.cpp
index b3652ba..8955f77 100644
--- a/cc/SolidColorLayerChromium.cpp
+++ b/cc/SolidColorLayerChromium.cpp
@@ -10,7 +10,7 @@
 
 #include "CCSolidColorLayerImpl.h"
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCLayerImpl> SolidColorLayerChromium::createCCLayerImpl()
 {
@@ -31,6 +31,6 @@ SolidColorLayerChromium::~SolidColorLayerChromium()
 {
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/SolidColorLayerChromium.h b/cc/SolidColorLayerChromium.h
index 53ac9dc..c8d173f 100644
--- a/cc/SolidColorLayerChromium.h
+++ b/cc/SolidColorLayerChromium.h
@@ -10,7 +10,7 @@
 
 #include "LayerChromium.h"
 
-namespace WebCore {
+namespace cc {
 
 // A Layer that renders a solid color. The color is specified by using
 // setBackgroundColor() on the base class.
@@ -29,4 +29,3 @@ protected:
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif
-
diff --git a/cc/TextureCopier.cpp b/cc/TextureCopier.cpp
index e2cdd4b..b0db144 100644
--- a/cc/TextureCopier.cpp
+++ b/cc/TextureCopier.cpp
@@ -11,7 +11,7 @@
 #include "TraceEvent.h"
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 #if USE(ACCELERATED_COMPOSITING)
 AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
diff --git a/cc/TextureCopier.h b/cc/TextureCopier.h
index 1bb890e..13d3fbb 100644
--- a/cc/TextureCopier.h
+++ b/cc/TextureCopier.h
@@ -16,7 +16,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 class IntSize;
 
 class TextureCopier {
diff --git a/cc/TextureLayerChromium.cpp b/cc/TextureLayerChromium.cpp
index f55e74b..c1f561e 100644
--- a/cc/TextureLayerChromium.cpp
+++ b/cc/TextureLayerChromium.cpp
@@ -13,7 +13,7 @@
 #include "TextureLayerChromiumClient.h"
 #include <public/WebGraphicsContext3D.h>
 
-namespace WebCore {
+namespace cc {
 
 PassRefPtr<TextureLayerChromium> TextureLayerChromium::create(TextureLayerChromiumClient* client)
 {
diff --git a/cc/TextureLayerChromium.h b/cc/TextureLayerChromium.h
index ab3b39a..1886c79 100644
--- a/cc/TextureLayerChromium.h
+++ b/cc/TextureLayerChromium.h
@@ -13,7 +13,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class TextureLayerChromiumClient;
 
diff --git a/cc/TextureLayerChromiumClient.h b/cc/TextureLayerChromiumClient.h
index 1fc0dcf..4edbe9f 100644
--- a/cc/TextureLayerChromiumClient.h
+++ b/cc/TextureLayerChromiumClient.h
@@ -9,7 +9,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 class CCTextureUpdateQueue;
 
 class TextureLayerChromiumClient {
diff --git a/cc/TextureUploader.h b/cc/TextureUploader.h
index 1826fcb..abb6089 100644
--- a/cc/TextureUploader.h
+++ b/cc/TextureUploader.h
@@ -7,7 +7,7 @@
 
 #include "LayerTextureUpdater.h"
 
-namespace WebCore {
+namespace cc {
 
 class TextureUploader {
 public:
diff --git a/cc/ThrottledTextureUploader.cpp b/cc/ThrottledTextureUploader.cpp
index 594342e..274205d 100644
--- a/cc/ThrottledTextureUploader.cpp
+++ b/cc/ThrottledTextureUploader.cpp
@@ -16,7 +16,7 @@ static const size_t maxPendingQueries = 2;
 
 } // anonymous namespace
 
-namespace WebCore {
+namespace cc {
 
 ThrottledTextureUploader::Query::Query(WebKit::WebGraphicsContext3D* context)
     : m_context(context)
diff --git a/cc/ThrottledTextureUploader.h b/cc/ThrottledTextureUploader.h
index f51d866..b462e07 100644
--- a/cc/ThrottledTextureUploader.h
+++ b/cc/ThrottledTextureUploader.h
@@ -13,7 +13,7 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-namespace WebCore {
+namespace cc {
 
 class ThrottledTextureUploader : public TextureUploader {
     WTF_MAKE_NONCOPYABLE(ThrottledTextureUploader);
diff --git a/cc/TiledLayerChromium.cpp b/cc/TiledLayerChromium.cpp
index 1a29940..62c9202 100644
--- a/cc/TiledLayerChromium.cpp
+++ b/cc/TiledLayerChromium.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
-namespace WebCore {
+namespace cc {
 
 class UpdatableTile : public CCLayerTilingData::Tile {
     WTF_MAKE_NONCOPYABLE(UpdatableTile);
@@ -144,7 +144,7 @@ void TiledLayerChromium::updateBounds()
     Region oldRegion(IntRect(IntPoint(), oldBounds));
     Region newRegion(IntRect(IntPoint(), newBounds));
     newRegion.subtract(oldRegion);
-    Vector<IntRect> rects = newRegion.rects();
+    Vector<WebCore::IntRect> rects = newRegion.rects();
     for (size_t i = 0; i < rects.size(); ++i)
         invalidateContentRect(rects[i]);
 }
diff --git a/cc/TiledLayerChromium.h b/cc/TiledLayerChromium.h
index c7f57f0..18b6da3 100644
--- a/cc/TiledLayerChromium.h
+++ b/cc/TiledLayerChromium.h
@@ -11,7 +11,7 @@
 #include "LayerChromium.h"
 #include "LayerTextureUpdater.h"
 
-namespace WebCore {
+namespace cc {
 class UpdatableTile;
 
 class TiledLayerChromium : public LayerChromium {
diff --git a/cc/TreeSynchronizer.cpp b/cc/TreeSynchronizer.cpp
index 29e676c..9b42e73 100644
--- a/cc/TreeSynchronizer.cpp
+++ b/cc/TreeSynchronizer.cpp
@@ -13,7 +13,7 @@
 #include "ScrollbarLayerChromium.h"
 #include <wtf/RefPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 PassOwnPtr<CCLayerImpl> TreeSynchronizer::synchronizeTrees(LayerChromium* layerChromiumRoot, PassOwnPtr<CCLayerImpl> oldCCLayerImplRoot, CCLayerTreeHostImpl* hostImpl)
 {
@@ -109,4 +109,4 @@ void TreeSynchronizer::updateScrollbarLayerPointersRecursive(const RawPtrCCLayer
         ccScrollLayerImpl->setVerticalScrollbarLayer(ccScrollbarLayerImpl);
 }
 
-} // namespace WebCore
+} // namespace cc
diff --git a/cc/TreeSynchronizer.h b/cc/TreeSynchronizer.h
index 5c59e5b..06991ef 100644
--- a/cc/TreeSynchronizer.h
+++ b/cc/TreeSynchronizer.h
@@ -10,7 +10,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class CCLayerImpl;
 class CCLayerTreeHostImpl;
@@ -36,6 +36,6 @@ private:
     static void updateScrollbarLayerPointersRecursive(const RawPtrCCLayerImplMap& newLayers, LayerChromium*);
 };
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // TreeSynchronizer_h
diff --git a/cc/UnthrottledTextureUploader.h b/cc/UnthrottledTextureUploader.h
index 36a6cb4..3e24d90 100644
--- a/cc/UnthrottledTextureUploader.h
+++ b/cc/UnthrottledTextureUploader.h
@@ -8,7 +8,7 @@
 #include "CCResourceProvider.h"
 #include "TextureUploader.h"
 
-namespace WebCore {
+namespace cc {
 
 class UnthrottledTextureUploader : public TextureUploader {
     WTF_MAKE_NONCOPYABLE(UnthrottledTextureUploader);
diff --git a/cc/VideoLayerChromium.cpp b/cc/VideoLayerChromium.cpp
index 7bfee0c..ac0ba87 100644
--- a/cc/VideoLayerChromium.cpp
+++ b/cc/VideoLayerChromium.cpp
@@ -9,7 +9,7 @@
 
 #include "CCVideoLayerImpl.h"
 
-namespace WebCore {
+namespace cc {
 
 PassRefPtr<VideoLayerChromium> VideoLayerChromium::create(WebKit::WebVideoFrameProvider* provider)
 {
@@ -32,6 +32,6 @@ PassOwnPtr<CCLayerImpl> VideoLayerChromium::createCCLayerImpl()
     return CCVideoLayerImpl::create(m_layerId, m_provider);
 }
 
-} // namespace WebCore
+} // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/cc/VideoLayerChromium.h b/cc/VideoLayerChromium.h
index 88671d0..2712a29 100644
--- a/cc/VideoLayerChromium.h
+++ b/cc/VideoLayerChromium.h
@@ -14,7 +14,7 @@ namespace WebKit {
 class WebVideoFrameProvider;
 }
 
-namespace WebCore {
+namespace cc {
 
 class CCVideoLayerImpl;
 
diff --git a/cc/cc.gypi b/cc/cc.gypi
index 979b418..0dada34 100644
--- a/cc/cc.gypi
+++ b/cc/cc.gypi
@@ -19,7 +19,9 @@
         'cc_stubs_dirs': ['stubs'],
       }, {
         'cc_stubs_dirs': [
+          'stubs',
           '<(SHARED_INTERMEDIATE_DIR)/webkit',
+          '<(webkit_src_dir)',
           '<(webkit_src_dir)/Source/WebCore/platform',
           '<(webkit_src_dir)/Source/WebCore/platform/animation',
           '<(webkit_src_dir)/Source/WebCore/platform/chromium',
@@ -35,4 +37,11 @@
       }],
     ],
   },
+  'conditions': [
+    ['inside_chromium_build==0', {
+      'defines': [
+        'INSIDE_WEBKIT_BUILD=1',
+      ],
+    }],
+  ],
 }
diff --git a/cc/stubs/Extensions3D.h b/cc/stubs/Extensions3D.h
index b2e34d7..bbeb9e6 100644
--- a/cc/stubs/Extensions3D.h
+++ b/cc/stubs/Extensions3D.h
@@ -8,7 +8,7 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
-namespace WebCore {
+namespace cc {
 
 class Extensions3D {
 public:
@@ -23,4 +23,3 @@ public:
 
 
 #endif  // CC_STUBS_EXTENSIONS3D_H_
-
diff --git a/cc/stubs/Extensions3DChromium.h b/cc/stubs/Extensions3DChromium.h
index 335023c..f5d36d2 100644
--- a/cc/stubs/Extensions3DChromium.h
+++ b/cc/stubs/Extensions3DChromium.h
@@ -18,7 +18,7 @@
 #undef GL_FRAMEBUFFER_ATTACHMENT_ANGLE
 #endif
 
-namespace WebCore {
+namespace cc {
 
 class Extensions3DChromium {
 public:
@@ -52,4 +52,3 @@ public:
 }
 
 #endif  // CC_STUBS_EXTENSIONS3DCHROMIUM_H_
-
diff --git a/cc/stubs/FloatPoint.h b/cc/stubs/FloatPoint.h
index 41f1e18..4ce2681 100644
--- a/cc/stubs/FloatPoint.h
+++ b/cc/stubs/FloatPoint.h
@@ -2,4 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_FLOATPOINT_H_
+#define CC_STUBS_FLOATPOINT_H_
+
+#include "FloatSize.h"
+#include "IntPoint.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/FloatPoint.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatPoint.h"
+#endif
+
+namespace cc {
+
+class FloatPoint : public WebCore::FloatPoint {
+public:
+    FloatPoint() { }
+
+    FloatPoint(float width, float height)
+        : WebCore::FloatPoint(width, height)
+    {
+    }
+
+    FloatPoint(FloatSize size)
+        : WebCore::FloatPoint(size)
+    {
+    }
+
+    FloatPoint(IntPoint point)
+        : WebCore::FloatPoint(point)
+    {
+    }
+
+    FloatPoint(WebCore::IntPoint point)
+        : WebCore::FloatPoint(point)
+    {
+    }
+
+    FloatPoint(WebCore::FloatPoint point)
+        : WebCore::FloatPoint(point.x(), point.y())
+    {
+
+    }
+};
+
+}
+
+#endif
diff --git a/cc/stubs/FloatPoint3D.h b/cc/stubs/FloatPoint3D.h
index 66edfc3..02ff076 100644
--- a/cc/stubs/FloatPoint3D.h
+++ b/cc/stubs/FloatPoint3D.h
@@ -2,4 +2,49 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_FLOATPOINT3D_H_
+#define CC_STUBS_FLOATPOINT3D_H_
+
+#include "FloatPoint.h"
+
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/FloatPoint3D.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatPoint3D.h"
+#endif
+
+namespace cc {
+
+class FloatPoint3D : public WebCore::FloatPoint3D {
+public:
+    FloatPoint3D() { }
+
+    FloatPoint3D(float x, float y, float z)
+        : WebCore::FloatPoint3D(x, y, z)
+    {
+    }
+
+    FloatPoint3D(FloatPoint point)
+        : WebCore::FloatPoint3D(point.x(), point.y(), 0)
+    {
+    }
+
+    FloatPoint3D(const FloatPoint3D& point)
+        : WebCore::FloatPoint3D(point)
+    {
+    }
+
+    FloatPoint3D(WebCore::FloatPoint3D point)
+        : WebCore::FloatPoint3D(point)
+    {
+    }
+
+    FloatPoint3D(WebCore::FloatPoint point)
+        : WebCore::FloatPoint3D(point)
+    {
+    }
+};
+
+}
+
+#endif
diff --git a/cc/stubs/FloatQuad.h b/cc/stubs/FloatQuad.h
index a5d85e1..f2f45ed 100644
--- a/cc/stubs/FloatQuad.h
+++ b/cc/stubs/FloatQuad.h
@@ -2,5 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_FLOATQUAD_H_
+#define CC_STUBS_FLOATQUAD_H_
+
+#include "FloatPoint.h"
+#include "FloatRect.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/FloatQuad.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatQuad.h"
+#endif
+
+namespace cc {
+
+class FloatQuad : public WebCore::FloatQuad
+{
+public:
+    FloatQuad() { }
+
+    FloatQuad(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3, const FloatPoint& p4)
+        : WebCore::FloatQuad(p1, p2, p3, p4)
+    {
+    }
+
+    FloatQuad(const FloatRect& rect)
+        : WebCore::FloatQuad(rect)
+    {
+    }
+
+    FloatQuad(const IntRect& rect)
+        : WebCore::FloatQuad(rect)
+    {
+    }
+
+    FloatQuad(const WebCore::FloatRect& rect)
+        : WebCore::FloatQuad(rect)
+    {
+    }
+
+    FloatQuad(const WebCore::IntRect& rect)
+        : WebCore::FloatQuad(rect)
+    {
+    }
+
+    FloatQuad(const WebCore::FloatQuad& quad)
+        : WebCore::FloatQuad(quad)
+    {
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/FloatRect.h b/cc/stubs/FloatRect.h
index 7c949d3..2eb03e2 100644
--- a/cc/stubs/FloatRect.h
+++ b/cc/stubs/FloatRect.h
@@ -2,5 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_FLOATRECT_H_
+#define CC_STUBS_FLOATRECT_H_
+
+#include "FloatPoint.h"
+#include "FloatSize.h"
+#include "IntRect.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/FloatRect.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatRect.h"
+#endif
+
+namespace cc {
+
+class FloatRect : public WebCore::FloatRect {
+public:
+    FloatRect() { }
+
+    FloatRect(const FloatPoint& location, const FloatSize& size)
+        : WebCore::FloatRect(location, size)
+    {
+    }
+
+    FloatRect(const IntPoint& location, const IntSize& size)
+        : WebCore::FloatRect(location, size)
+    {
+    }
+
+    FloatRect(float x, float y, float width, float height)
+        : WebCore::FloatRect(x, y, width, height)
+    {
+    }
+
+    FloatRect(const IntRect& rect)
+        : WebCore::FloatRect(rect)
+    {
+    }
+
+    FloatRect(const WebCore::IntRect& rect)
+        : WebCore::FloatRect(rect)
+    {
+    }
+
+    FloatRect(const WebCore::FloatRect& rect)
+        :WebCore::FloatRect(rect)
+    {
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/FloatSize.h b/cc/stubs/FloatSize.h
index bcf3e1c..9db5978 100644
--- a/cc/stubs/FloatSize.h
+++ b/cc/stubs/FloatSize.h
@@ -2,5 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_FLOATSIZE_H_
+#define CC_STUBS_FLOATSIZE_H_
+
+#include "IntSize.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/FloatSize.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatSize.h"
+#endif
+
+namespace cc {
+class FloatSize : public WebCore::FloatSize {
+public:
+    FloatSize() { }
+
+    FloatSize(float width, float height)
+        : WebCore::FloatSize(width, height)
+    {
+    }
+
+    FloatSize(IntSize size)
+        : WebCore::FloatSize(size.width(), size.height())
+    {
+    }
+
+    FloatSize(WebCore::FloatSize size)
+        : WebCore::FloatSize(size.width(), size.height())
+    {
+    }
+
+    FloatSize(WebCore::IntSize size)
+        : WebCore::FloatSize(size.width(), size.height())
+    {
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/GraphicsContext3D.h b/cc/stubs/GraphicsContext3D.h
index eff588e..e7f7a60 100644
--- a/cc/stubs/GraphicsContext3D.h
+++ b/cc/stubs/GraphicsContext3D.h
@@ -13,7 +13,7 @@
 #undef NO_ERROR
 #endif
 
-namespace WebCore {
+namespace cc {
 
 class GraphicsContext3D {
 public:
@@ -72,4 +72,3 @@ public:
 }
 
 #endif  // CC_STUBS_GRAPHICSCONTEXT3D_H_
-
diff --git a/cc/stubs/IntPoint.h b/cc/stubs/IntPoint.h
index c9768a9..fa12dea 100644
--- a/cc/stubs/IntPoint.h
+++ b/cc/stubs/IntPoint.h
@@ -2,5 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_INTPOINT_H_
+#define CC_STUBS_INTPOINT_H_
+
+#include "IntSize.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/IntPoint.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h"
+#endif
+
+namespace cc {
+
+class IntPoint : public WebCore::IntPoint {
+public:
+    IntPoint() { }
+
+    IntPoint(int width, int height)
+        : WebCore::IntPoint(width, height)
+    {
+    }
+
+    IntPoint(IntSize size)
+        : WebCore::IntPoint(size.width(), size.height())
+    {
+    }
+
+    IntPoint(WebCore::IntPoint point)
+        : WebCore::IntPoint(point.x(), point.y())
+    {
+
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/IntRect.h b/cc/stubs/IntRect.h
index 954b938..1599967 100644
--- a/cc/stubs/IntRect.h
+++ b/cc/stubs/IntRect.h
@@ -2,5 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_INTRECT_H_
+#define CC_STUBS_INTRECT_H_
+
+#include "IntPoint.h"
+#include "IntSize.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/IntRect.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntRect.h"
+#endif
+
+namespace cc {
+
+class IntRect : public WebCore::IntRect {
+public:
+    IntRect() { }
+
+    IntRect(const IntPoint& location, const IntSize& size)
+        : WebCore::IntRect(location, size)
+    {
+    }
+
+    IntRect(int x, int y, int width, int height)
+        : WebCore::IntRect(x, y, width, height)
+    {
+    }
+
+    IntRect(WebCore::IntRect rect)
+        : WebCore::IntRect(rect.x(), rect.y(), rect.width(), rect.height())
+    {
+
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/IntSize.h b/cc/stubs/IntSize.h
index 04eb4b1..c53f4f1 100644
--- a/cc/stubs/IntSize.h
+++ b/cc/stubs/IntSize.h
@@ -2,5 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_INTSIZE_H_
+#define CC_STUBS_INTSIZE_H_
+
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/IntSize.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntSize.h"
+#endif
+
+namespace cc {
+
+class IntSize : public WebCore::IntSize {
+public:
+    IntSize() { }
+
+    IntSize(int width, int height)
+        : WebCore::IntSize(width, height)
+    {
+    }
+
+    IntSize(WebCore::IntSize size)
+        : WebCore::IntSize(size.width(), size.height())
+    {
+
+    }
+};
+
+}
 
+#endif
diff --git a/cc/stubs/Region.h b/cc/stubs/Region.h
index c7f8f50..6930641 100644
--- a/cc/stubs/Region.h
+++ b/cc/stubs/Region.h
@@ -5,6 +5,35 @@
 #ifndef CC_STUBS_REGION_H_
 #define CC_STUBS_REGION_H_
 
+#include "IntRect.h"
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/Region.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/Region.h"
+#endif
+
+namespace cc {
+
+class Region : public WebCore::Region {
+public:
+    Region() { }
+
+    Region(const IntRect& rect)
+        : WebCore::Region(rect)
+    {
+    }
+
+    Region(const WebCore::IntRect& rect)
+        : WebCore::Region(rect)
+    {
+    }
+
+    Region(const WebCore::Region& region)
+        : WebCore::Region(region)
+    {
+    }
+};
+
+}
 
 #endif  // CC_STUBS_REGION_H_
diff --git a/cc/stubs/SkiaUtils.h b/cc/stubs/SkiaUtils.h
index f5ceb4eb..fb81f3e 100644
--- a/cc/stubs/SkiaUtils.h
+++ b/cc/stubs/SkiaUtils.h
@@ -5,9 +5,9 @@
 #ifndef CC_STUBS_SKIAUTILS_H_
 #define CC_STUBS_SKIAUTILS_H_
 
-namespace WebCore {
+namespace cc {
 
-inline SkScalar WebCoreFloatToSkScalar(float f)
+inline SkScalar CCFloatToSkScalar(float f)
 {
     return SkFloatToScalar(isfinite(f) ? f : 0);
 }
diff --git a/cc/stubs/TilingData.h b/cc/stubs/TilingData.h
index 03e48eb..0221500 100644
--- a/cc/stubs/TilingData.h
+++ b/cc/stubs/TilingData.h
@@ -5,6 +5,14 @@
 #ifndef CC_STUBS_TILINGDATA_H_
 #define CC_STUBS_TILINGDATA_H_
 
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/gpu/TilingData.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/gpu/TilingData.h"
+#endif
+
+namespace cc {
+    typedef WebCore::TilingData TilingData;
+}
 
 #endif  // CC_STUBS_TILINGDATA_H_
diff --git a/cc/stubs/UnitBezier.h b/cc/stubs/UnitBezier.h
index 90f810c..1ff5da9 100644
--- a/cc/stubs/UnitBezier.h
+++ b/cc/stubs/UnitBezier.h
@@ -3,4 +3,12 @@
 // found in the LICENSE file.
 
 // TODO(jamesr): Remove or refactor this dependency.
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WebCore/platform/graphics/UnitBezier.h"
+#else
 #include "third_party/WebKit/Source/WebCore/platform/graphics/UnitBezier.h"
+#endif
+
+namespace cc {
+typedef WebCore::UnitBezier UnitBezier;
+}
diff --git a/cc/test/CCAnimationTestCommon.cpp b/cc/test/CCAnimationTestCommon.cpp
index 9312d77..62cb17a 100644
--- a/cc/test/CCAnimationTestCommon.cpp
+++ b/cc/test/CCAnimationTestCommon.cpp
@@ -12,7 +12,7 @@
 #include "LayerChromium.h"
 #include <public/WebTransformOperations.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace {
 
@@ -75,7 +75,7 @@ float FakeFloatAnimationCurve::getValue(double now) const
     return 0;
 }
 
-PassOwnPtr<WebCore::CCAnimationCurve> FakeFloatAnimationCurve::clone() const
+PassOwnPtr<cc::CCAnimationCurve> FakeFloatAnimationCurve::clone() const
 {
     return adoptPtr(new FakeFloatAnimationCurve);
 }
@@ -99,7 +99,7 @@ WebKit::WebTransformationMatrix FakeTransformTransition::getValue(double time) c
     return WebKit::WebTransformationMatrix();
 }
 
-PassOwnPtr<WebCore::CCAnimationCurve> FakeTransformTransition::clone() const
+PassOwnPtr<cc::CCAnimationCurve> FakeTransformTransition::clone() const
 {
     return adoptPtr(new FakeTransformTransition(*this));
 }
@@ -163,37 +163,37 @@ const WebKit::WebTransformationMatrix& FakeLayerAnimationControllerClient::trans
     return m_transform;
 }
 
-PassOwnPtr<WebCore::CCAnimationCurve> FakeFloatTransition::clone() const
+PassOwnPtr<cc::CCAnimationCurve> FakeFloatTransition::clone() const
 {
     return adoptPtr(new FakeFloatTransition(*this));
 }
 
-void addOpacityTransitionToController(WebCore::CCLayerAnimationController& controller, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
+void addOpacityTransitionToController(cc::CCLayerAnimationController& controller, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
 {
     addOpacityTransition(controller, duration, startOpacity, endOpacity, useTimingFunction);
 }
 
-void addAnimatedTransformToController(WebCore::CCLayerAnimationController& controller, double duration, int deltaX, int deltaY)
+void addAnimatedTransformToController(cc::CCLayerAnimationController& controller, double duration, int deltaX, int deltaY)
 {
     addAnimatedTransform(controller, duration, deltaX, deltaY);
 }
 
-void addOpacityTransitionToLayer(WebCore::LayerChromium& layer, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
+void addOpacityTransitionToLayer(cc::LayerChromium& layer, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
 {
     addOpacityTransition(layer, duration, startOpacity, endOpacity, useTimingFunction);
 }
 
-void addOpacityTransitionToLayer(WebCore::CCLayerImpl& layer, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
+void addOpacityTransitionToLayer(cc::CCLayerImpl& layer, double duration, float startOpacity, float endOpacity, bool useTimingFunction)
 {
     addOpacityTransition(*layer.layerAnimationController(), duration, startOpacity, endOpacity, useTimingFunction);
 }
 
-void addAnimatedTransformToLayer(WebCore::LayerChromium& layer, double duration, int deltaX, int deltaY)
+void addAnimatedTransformToLayer(cc::LayerChromium& layer, double duration, int deltaX, int deltaY)
 {
     addAnimatedTransform(layer, duration, deltaX, deltaY);
 }
 
-void addAnimatedTransformToLayer(WebCore::CCLayerImpl& layer, double duration, int deltaX, int deltaY)
+void addAnimatedTransformToLayer(cc::CCLayerImpl& layer, double duration, int deltaX, int deltaY)
 {
     addAnimatedTransform(*layer.layerAnimationController(), duration, deltaX, deltaY);
 }
diff --git a/cc/test/CCAnimationTestCommon.h b/cc/test/CCAnimationTestCommon.h
index 51f5a51..6995f77 100644
--- a/cc/test/CCAnimationTestCommon.h
+++ b/cc/test/CCAnimationTestCommon.h
@@ -12,24 +12,24 @@
 
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCLayerImpl;
 class LayerChromium;
 }
 
 namespace WebKitTests {
 
-class FakeFloatAnimationCurve : public WebCore::CCFloatAnimationCurve {
+class FakeFloatAnimationCurve : public cc::CCFloatAnimationCurve {
 public:
     FakeFloatAnimationCurve();
     virtual ~FakeFloatAnimationCurve();
 
     virtual double duration() const OVERRIDE;
     virtual float getValue(double now) const OVERRIDE;
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
+    virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;
 };
 
-class FakeTransformTransition : public WebCore::CCTransformAnimationCurve {
+class FakeTransformTransition : public cc::CCTransformAnimationCurve {
 public:
     FakeTransformTransition(double duration);
     virtual ~FakeTransformTransition();
@@ -37,13 +37,13 @@ public:
     virtual double duration() const OVERRIDE;
     virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE;
 
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
+    virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
 };
 
-class FakeFloatTransition : public WebCore::CCFloatAnimationCurve {
+class FakeFloatTransition : public cc::CCFloatAnimationCurve {
 public:
     FakeFloatTransition(double duration, float from, float to);
     virtual ~FakeFloatTransition();
@@ -51,7 +51,7 @@ public:
     virtual double duration() const OVERRIDE;
     virtual float getValue(double time) const OVERRIDE;
 
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
+    virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
@@ -59,7 +59,7 @@ private:
     float m_to;
 };
 
-class FakeLayerAnimationControllerClient : public WebCore::CCLayerAnimationControllerClient {
+class FakeLayerAnimationControllerClient : public cc::CCLayerAnimationControllerClient {
 public:
     FakeLayerAnimationControllerClient();
     virtual ~FakeLayerAnimationControllerClient();
@@ -76,14 +76,14 @@ private:
     WebKit::WebTransformationMatrix m_transform;
 };
 
-void addOpacityTransitionToController(WebCore::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addAnimatedTransformToController(WebCore::CCLayerAnimationController&, double duration, int deltaX, int deltaY);
+void addOpacityTransitionToController(cc::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addAnimatedTransformToController(cc::CCLayerAnimationController&, double duration, int deltaX, int deltaY);
 
-void addOpacityTransitionToLayer(WebCore::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addOpacityTransitionToLayer(WebCore::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addOpacityTransitionToLayer(cc::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addOpacityTransitionToLayer(cc::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
 
-void addAnimatedTransformToLayer(WebCore::LayerChromium&, double duration, int deltaX, int deltaY);
-void addAnimatedTransformToLayer(WebCore::CCLayerImpl&, double duration, int deltaX, int deltaY);
+void addAnimatedTransformToLayer(cc::LayerChromium&, double duration, int deltaX, int deltaY);
+void addAnimatedTransformToLayer(cc::CCLayerImpl&, double duration, int deltaX, int deltaY);
 
 } // namespace WebKitTests
 
diff --git a/cc/test/CCLayerTestCommon.cpp b/cc/test/CCLayerTestCommon.cpp
index 1195012..7fb0afc9 100644
--- a/cc/test/CCLayerTestCommon.cpp
+++ b/cc/test/CCLayerTestCommon.cpp
@@ -10,7 +10,7 @@
 #include <gtest/gtest.h>
 #include <wtf/Vector.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace CCLayerTestCommon {
 
diff --git a/cc/test/CCLayerTestCommon.h b/cc/test/CCLayerTestCommon.h
index fc726fa..9627ba1 100644
--- a/cc/test/CCLayerTestCommon.h
+++ b/cc/test/CCLayerTestCommon.h
@@ -13,7 +13,7 @@ namespace CCLayerTestCommon {
 
 extern const char* quadString;
 
-void verifyQuadsExactlyCoverRect(const WebCore::CCQuadList&, const WebCore::IntRect&);
+void verifyQuadsExactlyCoverRect(const cc::CCQuadList&, const cc::IntRect&);
 
 } // namespace CCLayerTestCommon
 #endif // CCLayerTestCommon_h
diff --git a/cc/test/CCOcclusionTrackerTestCommon.h b/cc/test/CCOcclusionTrackerTestCommon.h
index 90e0cc3..14f2091 100644
--- a/cc/test/CCOcclusionTrackerTestCommon.h
+++ b/cc/test/CCOcclusionTrackerTestCommon.h
@@ -15,22 +15,22 @@ namespace WebKitTests {
 
 // A subclass to expose the total current occlusion.
 template<typename LayerType, typename RenderSurfaceType>
-class TestCCOcclusionTrackerBase : public WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
+class TestCCOcclusionTrackerBase : public cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
 public:
-    TestCCOcclusionTrackerBase(WebCore::IntRect screenScissorRect, bool recordMetricsForFrame = false)
-        : WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
+    TestCCOcclusionTrackerBase(cc::IntRect screenScissorRect, bool recordMetricsForFrame = false)
+        : cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
     {
     }
 
-    WebCore::Region occlusionInScreenSpace() const { return WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen; }
-    WebCore::Region occlusionInTargetSurface() const { return WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget; }
+    cc::Region occlusionInScreenSpace() const { return cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen; }
+    cc::Region occlusionInTargetSurface() const { return cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget; }
 
-    void setOcclusionInScreenSpace(const WebCore::Region& region) { WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen = region; }
-    void setOcclusionInTargetSurface(const WebCore::Region& region) { WebCore::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget = region; }
+    void setOcclusionInScreenSpace(const cc::Region& region) { cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen = region; }
+    void setOcclusionInTargetSurface(const cc::Region& region) { cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget = region; }
 };
 
-typedef TestCCOcclusionTrackerBase<WebCore::LayerChromium, WebCore::RenderSurfaceChromium> TestCCOcclusionTracker;
-typedef TestCCOcclusionTrackerBase<WebCore::CCLayerImpl, WebCore::CCRenderSurface> TestCCOcclusionTrackerImpl;
+typedef TestCCOcclusionTrackerBase<cc::LayerChromium, cc::RenderSurfaceChromium> TestCCOcclusionTracker;
+typedef TestCCOcclusionTrackerBase<cc::CCLayerImpl, cc::CCRenderSurface> TestCCOcclusionTrackerImpl;
 
 }
 
diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
index 8e3c1c8..673fd7d 100644
--- a/cc/test/CCSchedulerTestCommon.h
+++ b/cc/test/CCSchedulerTestCommon.h
@@ -14,7 +14,7 @@
 
 namespace WebKitTests {
 
-class FakeCCTimeSourceClient : public WebCore::CCTimeSourceClient {
+class FakeCCTimeSourceClient : public cc::CCTimeSourceClient {
 public:
     FakeCCTimeSourceClient() { reset(); }
     void reset() { m_tickCalled = false; }
@@ -26,7 +26,7 @@ protected:
     bool m_tickCalled;
 };
 
-class FakeCCThread : public WebCore::CCThread {
+class FakeCCThread : public cc::CCThread {
 public:
     FakeCCThread() { reset(); }
     void reset()
@@ -73,7 +73,7 @@ protected:
     bool m_runPendingTaskOnOverwrite;
 };
 
-class FakeCCTimeSource : public WebCore::CCTimeSource {
+class FakeCCTimeSource : public cc::CCTimeSource {
 public:
     FakeCCTimeSource()
         : m_active(false)
@@ -85,7 +85,7 @@ public:
 
     virtual ~FakeCCTimeSource() { }
 
-    virtual void setClient(WebCore::CCTimeSourceClient* client) OVERRIDE { m_client = client; }
+    virtual void setClient(cc::CCTimeSourceClient* client) OVERRIDE { m_client = client; }
     virtual void setActive(bool b) OVERRIDE { m_active = b; }
     virtual bool active() const OVERRIDE { return m_active; }
     virtual void setTimebaseAndInterval(double timebase, double interval) OVERRIDE { }
@@ -104,12 +104,12 @@ public:
 protected:
     bool m_active;
     double m_nextTickTime;
-    WebCore::CCTimeSourceClient* m_client;
+    cc::CCTimeSourceClient* m_client;
 };
 
-class FakeCCDelayBasedTimeSource : public WebCore::CCDelayBasedTimeSource {
+class FakeCCDelayBasedTimeSource : public cc::CCDelayBasedTimeSource {
 public:
-    static PassRefPtr<FakeCCDelayBasedTimeSource> create(double interval, WebCore::CCThread* thread)
+    static PassRefPtr<FakeCCDelayBasedTimeSource> create(double interval, cc::CCThread* thread)
     {
         return adoptRef(new FakeCCDelayBasedTimeSource(interval, thread));
     }
@@ -118,16 +118,16 @@ public:
     virtual double monotonicTimeNow() const OVERRIDE { return m_monotonicTimeNow; }
 
 protected:
-    FakeCCDelayBasedTimeSource(double interval, WebCore::CCThread* thread)
+    FakeCCDelayBasedTimeSource(double interval, cc::CCThread* thread)
         : CCDelayBasedTimeSource(interval, thread)
         , m_monotonicTimeNow(0) { }
 
     double m_monotonicTimeNow;
 };
 
-class FakeCCFrameRateController : public WebCore::CCFrameRateController {
+class FakeCCFrameRateController : public cc::CCFrameRateController {
 public:
-    FakeCCFrameRateController(PassRefPtr<WebCore::CCTimeSource> timer) : WebCore::CCFrameRateController(timer) { }
+    FakeCCFrameRateController(PassRefPtr<cc::CCTimeSource> timer) : cc::CCFrameRateController(timer) { }
 
     int numFramesPending() const { return m_numFramesPending; }
 };
diff --git a/cc/test/CCTestCommon.h b/cc/test/CCTestCommon.h
index c1ab34a..c748744 100644
--- a/cc/test/CCTestCommon.h
+++ b/cc/test/CCTestCommon.h
@@ -13,8 +13,8 @@ namespace WebKitTests {
 // of this class to ensure that you start and end with a clean slate.
 class CCScopedSettings {
 public:
-    CCScopedSettings() { WebCore::CCSettings::reset(); }
-    ~CCScopedSettings() { WebCore::CCSettings::reset(); }
+    CCScopedSettings() { cc::CCSettings::reset(); }
+    ~CCScopedSettings() { cc::CCSettings::reset(); }
 };
 
 } // namespace WebKitTests
diff --git a/cc/test/CCTiledLayerTestCommon.cpp b/cc/test/CCTiledLayerTestCommon.cpp
index 542d459..519f426 100644
--- a/cc/test/CCTiledLayerTestCommon.cpp
+++ b/cc/test/CCTiledLayerTestCommon.cpp
@@ -6,7 +6,7 @@
 
 #include "CCTiledLayerTestCommon.h"
 
-using namespace WebCore;
+using namespace cc;
 
 namespace WebKitTests {
 
@@ -26,7 +26,7 @@ void FakeLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourcePr
     m_layer->updateRect();
 }
 
-void FakeLayerTextureUpdater::Texture::prepareRect(const IntRect&, WebCore::CCRenderingStats&)
+void FakeLayerTextureUpdater::Texture::prepareRect(const IntRect&, cc::CCRenderingStats&)
 {
     m_layer->prepareRect();
 }
@@ -122,17 +122,17 @@ void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& ca
     }
 }
 
-WebCore::CCPrioritizedTextureManager* FakeTiledLayerChromium::textureManager() const
+cc::CCPrioritizedTextureManager* FakeTiledLayerChromium::textureManager() const
 {
     return m_textureManager;
 }
 
-WebCore::LayerTextureUpdater* FakeTiledLayerChromium::textureUpdater() const
+cc::LayerTextureUpdater* FakeTiledLayerChromium::textureUpdater() const
 {
     return m_fakeTextureUpdater.get();
 }
 
-WebCore::IntSize FakeTiledLayerWithScaledBounds::contentBounds() const
+cc::IntSize FakeTiledLayerWithScaledBounds::contentBounds() const
 {
     return m_forcedContentBounds;
 }
@@ -142,7 +142,7 @@ bool FakeTextureUploader::isBusy()
     return false;
 }
 
-void FakeTextureUploader::uploadTexture(WebCore::CCResourceProvider* resourceProvider, Parameters upload)
+void FakeTextureUploader::uploadTexture(cc::CCResourceProvider* resourceProvider, Parameters upload)
 {
     upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destOffset);
 }
diff --git a/cc/test/CCTiledLayerTestCommon.h b/cc/test/CCTiledLayerTestCommon.h
index c9a38b4..c708d1d 100644
--- a/cc/test/CCTiledLayerTestCommon.h
+++ b/cc/test/CCTiledLayerTestCommon.h
@@ -22,15 +22,15 @@ namespace WebKitTests {
 
 class FakeTiledLayerChromium;
 
-class FakeLayerTextureUpdater : public WebCore::LayerTextureUpdater {
+class FakeLayerTextureUpdater : public cc::LayerTextureUpdater {
 public:
-    class Texture : public WebCore::LayerTextureUpdater::Texture {
+    class Texture : public cc::LayerTextureUpdater::Texture {
     public:
-        Texture(FakeLayerTextureUpdater*, PassOwnPtr<WebCore::CCPrioritizedTexture>);
+        Texture(FakeLayerTextureUpdater*, PassOwnPtr<cc::CCPrioritizedTexture>);
         virtual ~Texture();
 
-        virtual void updateRect(WebCore::CCResourceProvider* , const WebCore::IntRect&, const WebCore::IntSize&) OVERRIDE;
-        virtual void prepareRect(const WebCore::IntRect&, WebCore::CCRenderingStats&) OVERRIDE;
+        virtual void updateRect(cc::CCResourceProvider* , const cc::IntRect&, const cc::IntSize&) OVERRIDE;
+        virtual void prepareRect(const cc::IntRect&, cc::CCRenderingStats&) OVERRIDE;
 
     private:
         FakeLayerTextureUpdater* m_layer;
@@ -39,15 +39,15 @@ public:
     FakeLayerTextureUpdater();
     virtual ~FakeLayerTextureUpdater();
 
-    virtual PassOwnPtr<WebCore::LayerTextureUpdater::Texture> createTexture(WebCore::CCPrioritizedTextureManager*) OVERRIDE;
+    virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;
 
-    virtual void prepareToUpdate(const WebCore::IntRect& contentRect, const WebCore::IntSize&, float, float, WebCore::IntRect& resultingOpaqueRect, WebCore::CCRenderingStats&) OVERRIDE;
+    virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;
     // Sets the rect to invalidate during the next call to prepareToUpdate(). After the next
     // call to prepareToUpdate() the rect is reset.
-    void setRectToInvalidate(const WebCore::IntRect&, FakeTiledLayerChromium*);
+    void setRectToInvalidate(const cc::IntRect&, FakeTiledLayerChromium*);
     // Last rect passed to prepareToUpdate().
-    const WebCore::IntRect& lastUpdateRect()  const { return m_lastUpdateRect; }
+    const cc::IntRect& lastUpdateRect()  const { return m_lastUpdateRect; }
 
     // Number of times prepareToUpdate has been invoked.
     int prepareCount() const { return m_prepareCount; }
@@ -63,82 +63,82 @@ public:
     void clearPrepareRectCount() { m_prepareRectCount = 0; }
     void prepareRect() { m_prepareRectCount++; }
 
-    void setOpaquePaintRect(const WebCore::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
+    void setOpaquePaintRect(const cc::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
 
 private:
     int m_prepareCount;
     int m_updateCount;
     int m_prepareRectCount;
-    WebCore::IntRect m_rectToInvalidate;
-    WebCore::IntRect m_lastUpdateRect;
-    WebCore::IntRect m_opaquePaintRect;
+    cc::IntRect m_rectToInvalidate;
+    cc::IntRect m_lastUpdateRect;
+    cc::IntRect m_opaquePaintRect;
     RefPtr<FakeTiledLayerChromium> m_layer;
 };
 
-class FakeCCTiledLayerImpl : public WebCore::CCTiledLayerImpl {
+class FakeCCTiledLayerImpl : public cc::CCTiledLayerImpl {
 public:
     explicit FakeCCTiledLayerImpl(int id);
     virtual ~FakeCCTiledLayerImpl();
 
-    using WebCore::CCTiledLayerImpl::hasTileAt;
-    using WebCore::CCTiledLayerImpl::hasTextureIdForTileAt;
+    using cc::CCTiledLayerImpl::hasTileAt;
+    using cc::CCTiledLayerImpl::hasTextureIdForTileAt;
 };
 
-class FakeTiledLayerChromium : public WebCore::TiledLayerChromium {
+class FakeTiledLayerChromium : public cc::TiledLayerChromium {
 public:
-    explicit FakeTiledLayerChromium(WebCore::CCPrioritizedTextureManager*);
+    explicit FakeTiledLayerChromium(cc::CCPrioritizedTextureManager*);
     virtual ~FakeTiledLayerChromium();
 
-    static WebCore::IntSize tileSize() { return WebCore::IntSize(100, 100); }
+    static cc::IntSize tileSize() { return cc::IntSize(100, 100); }
 
-    using WebCore::TiledLayerChromium::invalidateContentRect;
-    using WebCore::TiledLayerChromium::needsIdlePaint;
-    using WebCore::TiledLayerChromium::skipsDraw;
-    using WebCore::TiledLayerChromium::numPaintedTiles;
-    using WebCore::TiledLayerChromium::idlePaintRect;
+    using cc::TiledLayerChromium::invalidateContentRect;
+    using cc::TiledLayerChromium::needsIdlePaint;
+    using cc::TiledLayerChromium::skipsDraw;
+    using cc::TiledLayerChromium::numPaintedTiles;
+    using cc::TiledLayerChromium::idlePaintRect;
 
-    virtual void setNeedsDisplayRect(const WebCore::FloatRect&) OVERRIDE;
-    const WebCore::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
+    virtual void setNeedsDisplayRect(const cc::FloatRect&) OVERRIDE;
+    const cc::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
 
-    virtual void setTexturePriorities(const WebCore::CCPriorityCalculator&) OVERRIDE;
+    virtual void setTexturePriorities(const cc::CCPriorityCalculator&) OVERRIDE;
 
-    virtual WebCore::CCPrioritizedTextureManager* textureManager() const OVERRIDE;
+    virtual cc::CCPrioritizedTextureManager* textureManager() const OVERRIDE;
     FakeLayerTextureUpdater* fakeLayerTextureUpdater() { return m_fakeTextureUpdater.get(); }
-    WebCore::FloatRect updateRect() { return m_updateRect; }
+    cc::FloatRect updateRect() { return m_updateRect; }
 
 protected:
-    virtual WebCore::LayerTextureUpdater* textureUpdater() const OVERRIDE;
+    virtual cc::LayerTextureUpdater* textureUpdater() const OVERRIDE;
     virtual void createTextureUpdaterIfNeeded() OVERRIDE { }
 
 private:
     RefPtr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
-    WebCore::CCPrioritizedTextureManager* m_textureManager;
-    WebCore::FloatRect m_lastNeedsDisplayRect;
+    cc::CCPrioritizedTextureManager* m_textureManager;
+    cc::FloatRect m_lastNeedsDisplayRect;
 };
 
 class FakeTiledLayerWithScaledBounds : public FakeTiledLayerChromium {
 public:
-    explicit FakeTiledLayerWithScaledBounds(WebCore::CCPrioritizedTextureManager*);
+    explicit FakeTiledLayerWithScaledBounds(cc::CCPrioritizedTextureManager*);
 
-    void setContentBounds(const WebCore::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
-    virtual WebCore::IntSize contentBounds() const OVERRIDE;
+    void setContentBounds(const cc::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
+    virtual cc::IntSize contentBounds() const OVERRIDE;
 
 protected:
-    WebCore::IntSize m_forcedContentBounds;
+    cc::IntSize m_forcedContentBounds;
 };
 
-class FakeTextureCopier : public WebCore::TextureCopier {
+class FakeTextureCopier : public cc::TextureCopier {
 public:
     virtual void copyTexture(Parameters) OVERRIDE { }
     virtual void flush() OVERRIDE { }
 };
 
-class FakeTextureUploader : public WebCore::TextureUploader {
+class FakeTextureUploader : public cc::TextureUploader {
 public:
     virtual bool isBusy() OVERRIDE;
     virtual void beginUploads() OVERRIDE { }
     virtual void endUploads() OVERRIDE { }
-    virtual void uploadTexture(WebCore::CCResourceProvider*, Parameters upload) OVERRIDE;
+    virtual void uploadTexture(cc::CCResourceProvider*, Parameters upload) OVERRIDE;
 };
 
 }
diff --git a/cc/test/FakeCCGraphicsContext.h b/cc/test/FakeCCGraphicsContext.h
index 0185eb3..2b35836 100644
--- a/cc/test/FakeCCGraphicsContext.h
+++ b/cc/test/FakeCCGraphicsContext.h
@@ -12,7 +12,7 @@
 
 namespace WebKit {
 
-static inline PassOwnPtr<WebCore::CCGraphicsContext> createFakeCCGraphicsContext()
+static inline PassOwnPtr<cc::CCGraphicsContext> createFakeCCGraphicsContext()
 {
     return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()));
 }
diff --git a/cc/test/FakeCCLayerTreeHostClient.h b/cc/test/FakeCCLayerTreeHostClient.h
index 79c22dc..06b3348 100644
--- a/cc/test/FakeCCLayerTreeHostClient.h
+++ b/cc/test/FakeCCLayerTreeHostClient.h
@@ -11,7 +11,7 @@
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "FakeWebCompositorOutputSurface.h"
 
-namespace WebCore {
+namespace cc {
 
 class FakeCCLayerTreeHostClient : public CCLayerTreeHostClient {
 public:
diff --git a/cc/test/FakeGraphicsContext3DTest.cpp b/cc/test/FakeGraphicsContext3DTest.cpp
index 011da56..ce43ce3 100644
--- a/cc/test/FakeGraphicsContext3DTest.cpp
+++ b/cc/test/FakeGraphicsContext3DTest.cpp
@@ -10,6 +10,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
+using namespace cc;
 using namespace WebCore;
 using namespace WebKit;
 
@@ -33,4 +34,3 @@ TEST(FakeGraphicsContext3DTest, ContextCreationShouldNotMakeCurrent)
     EXPECT_TRUE(context);
     EXPECT_EQ(0, context->makeCurrentCount());
 }
-
diff --git a/cc/test/FakeWebGraphicsContext3D.h b/cc/test/FakeWebGraphicsContext3D.h
index 67ad922..4e753f7 100644
--- a/cc/test/FakeWebGraphicsContext3D.h
+++ b/cc/test/FakeWebGraphicsContext3D.h
@@ -76,7 +76,7 @@ public:
 
     virtual WGC3Denum checkFramebufferStatus(WGC3Denum target)
     {
-        return WebCore::GraphicsContext3D::FRAMEBUFFER_COMPLETE;
+        return cc::GraphicsContext3D::FRAMEBUFFER_COMPLETE;
     }
 
     virtual void clear(WGC3Dbitfield mask) { }
@@ -122,13 +122,13 @@ public:
 
     virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value)
     {
-        if (pname == WebCore::GraphicsContext3D::MAX_TEXTURE_SIZE)
+        if (pname == cc::GraphicsContext3D::MAX_TEXTURE_SIZE)
             *value = 1024;
     }
 
     virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value)
     {
-        if (pname == WebCore::GraphicsContext3D::LINK_STATUS)
+        if (pname == cc::GraphicsContext3D::LINK_STATUS)
             *value = 1;
     }
 
@@ -137,7 +137,7 @@ public:
 
     virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value)
     {
-        if (pname == WebCore::GraphicsContext3D::COMPILE_STATUS)
+        if (pname == cc::GraphicsContext3D::COMPILE_STATUS)
             *value = 1;
     }
 
diff --git a/cc/test/MockCCQuadCuller.h b/cc/test/MockCCQuadCuller.h
index 9823fcc..6edfe08 100644
--- a/cc/test/MockCCQuadCuller.h
+++ b/cc/test/MockCCQuadCuller.h
@@ -10,7 +10,7 @@
 #include "IntRect.h"
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 
 class MockCCQuadCuller : public CCQuadSink {
 public:
@@ -54,5 +54,5 @@ private:
     CCSharedQuadStateList m_sharedQuadStateStorage;
 };
 
-} // namespace WebCore
+} // namespace cc
 #endif // MockCCQuadCuller_h
diff --git a/webkit/compositor_bindings/CCThreadImpl.cpp b/webkit/compositor_bindings/CCThreadImpl.cpp
index 6a58525..4e09658 100644
--- a/webkit/compositor_bindings/CCThreadImpl.cpp
+++ b/webkit/compositor_bindings/CCThreadImpl.cpp
@@ -9,8 +9,8 @@
 #include <public/Platform.h>
 #include <public/WebThread.h>
 
-using WebCore::CCThread;
-using WebCore::CCCompletionEvent;
+using cc::CCThread;
+using cc::CCCompletionEvent;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/CCThreadImpl.h b/webkit/compositor_bindings/CCThreadImpl.h
index 31b017e..b45acb3 100644
--- a/webkit/compositor_bindings/CCThreadImpl.h
+++ b/webkit/compositor_bindings/CCThreadImpl.h
@@ -15,17 +15,17 @@ namespace WebKit {
 class WebThread;
 
 // Implements CCThread in terms of WebThread.
-class CCThreadImpl : public WebCore::CCThread {
+class CCThreadImpl : public cc::CCThread {
 public:
     // Creates a CCThreadImpl wrapping the current thread.
-    static PassOwnPtr<WebCore::CCThread> createForCurrentThread();
+    static PassOwnPtr<cc::CCThread> createForCurrentThread();
 
     // Creates a CCThread wrapping a non-current WebThread.
-    static PassOwnPtr<WebCore::CCThread> createForDifferentThread(WebThread*);
+    static PassOwnPtr<cc::CCThread> createForDifferentThread(WebThread*);
 
     virtual ~CCThreadImpl();
-    virtual void postTask(PassOwnPtr<WebCore::CCThread::Task>);
-    virtual void postDelayedTask(PassOwnPtr<WebCore::CCThread::Task>, long long delayMs);
+    virtual void postTask(PassOwnPtr<cc::CCThread::Task>);
+    virtual void postDelayedTask(PassOwnPtr<cc::CCThread::Task>, long long delayMs);
     base::PlatformThreadId threadID() const;
 
 private:
diff --git a/webkit/compositor_bindings/LayerChromiumTest.cpp b/webkit/compositor_bindings/LayerChromiumTest.cpp
index 59fc7ba..9f5401b 100644
--- a/webkit/compositor_bindings/LayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/LayerChromiumTest.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 using WebKit::WebTransformationMatrix;
 using ::testing::Mock;
diff --git a/webkit/compositor_bindings/TextureCopierTest.cpp b/webkit/compositor_bindings/TextureCopierTest.cpp
index c2382d2..9b017ba 100644
--- a/webkit/compositor_bindings/TextureCopierTest.cpp
+++ b/webkit/compositor_bindings/TextureCopierTest.cpp
@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 using testing::InSequence;
 using testing::Test;
diff --git a/webkit/compositor_bindings/TextureLayerChromiumTest.cpp b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
index 947872d..0651fd9 100644
--- a/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
@@ -12,7 +12,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
diff --git a/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp b/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp
index 86b7a10..ea5a3e3 100644
--- a/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp
+++ b/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp
@@ -14,7 +14,7 @@
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKit;
 
 namespace {
diff --git a/webkit/compositor_bindings/TiledLayerChromiumTest.cpp b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
index 7a36566..3c7b964 100644
--- a/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
@@ -21,7 +21,7 @@
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 using namespace WTF;
 using WebKit::WebTransformationMatrix;
@@ -1471,7 +1471,7 @@ private:
 
 class UpdateTrackingTiledLayerChromium : public FakeTiledLayerChromium {
 public:
-    explicit UpdateTrackingTiledLayerChromium(WebCore::CCPrioritizedTextureManager* manager)
+    explicit UpdateTrackingTiledLayerChromium(CCPrioritizedTextureManager* manager)
         : FakeTiledLayerChromium(manager)
     {
         OwnPtr<TrackingLayerPainter> trackingLayerPainter(TrackingLayerPainter::create());
@@ -1483,7 +1483,7 @@ public:
     TrackingLayerPainter* trackingLayerPainter() const { return m_trackingLayerPainter; }
 
 protected:
-    virtual WebCore::LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_layerTextureUpdater.get(); }
+    virtual LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_layerTextureUpdater.get(); }
 
 private:
     TrackingLayerPainter* m_trackingLayerPainter;
diff --git a/webkit/compositor_bindings/TreeSynchronizerTest.cpp b/webkit/compositor_bindings/TreeSynchronizerTest.cpp
index 6268543..8d093d7 100644
--- a/webkit/compositor_bindings/TreeSynchronizerTest.cpp
+++ b/webkit/compositor_bindings/TreeSynchronizerTest.cpp
@@ -15,7 +15,7 @@
 #include "Region.h"
 #include <gtest/gtest.h>
 
-using namespace WebCore;
+using namespace cc;
 using namespace WebKitTests;
 
 namespace {
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index 2e45dc5..d13750e 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
@@ -13,17 +13,17 @@
 
 namespace WebKit {
 
-PassOwnPtr<WebCore::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
+PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
 {
     switch (type) {
     case WebAnimationCurve::TimingFunctionTypeEase:
-        return WebCore::CCEaseTimingFunction::create();
+        return cc::CCEaseTimingFunction::create();
     case WebAnimationCurve::TimingFunctionTypeEaseIn:
-        return WebCore::CCEaseInTimingFunction::create();
+        return cc::CCEaseInTimingFunction::create();
     case WebAnimationCurve::TimingFunctionTypeEaseOut:
-        return WebCore::CCEaseOutTimingFunction::create();
+        return cc::CCEaseOutTimingFunction::create();
     case WebAnimationCurve::TimingFunctionTypeEaseInOut:
-        return WebCore::CCEaseInOutTimingFunction::create();
+        return cc::CCEaseInOutTimingFunction::create();
     case WebAnimationCurve::TimingFunctionTypeLinear:
         return nullptr;
     }
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.h b/webkit/compositor_bindings/WebAnimationCurveCommon.h
index b911e82..2df8b5f 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.h
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.h
@@ -8,12 +8,12 @@
 #include <public/WebAnimationCurve.h>
 #include <wtf/Forward.h>
 
-namespace WebCore {
+namespace cc {
 class CCTimingFunction;
 }
 
 namespace WebKit {
-PassOwnPtr<WebCore::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType);
+PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType);
 }
 
 #endif // WebAnimationCurveCommon_h
diff --git a/webkit/compositor_bindings/WebAnimationImpl.cpp b/webkit/compositor_bindings/WebAnimationImpl.cpp
index bbae89b..b915082 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.cpp
+++ b/webkit/compositor_bindings/WebAnimationImpl.cpp
@@ -15,7 +15,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-using WebCore::CCActiveAnimation;
+using cc::CCActiveAnimation;
 
 namespace WebKit {
 
@@ -34,7 +34,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
         groupId = nextGroupId++;
 
     WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
-    OwnPtr<WebCore::CCAnimationCurve> curve;
+    OwnPtr<cc::CCAnimationCurve> curve;
     switch (curveType) {
     case WebAnimationCurve::AnimationCurveTypeFloat: {
         const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const WebFloatAnimationCurveImpl*>(&webCurve);
@@ -47,7 +47,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
         break;
     }
     }
-    m_animation = CCActiveAnimation::create(curve.release(), animationId, groupId, static_cast<WebCore::CCActiveAnimation::TargetProperty>(targetProperty));
+    m_animation = CCActiveAnimation::create(curve.release(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
 }
 
 WebAnimationImpl::~WebAnimationImpl()
@@ -104,9 +104,9 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates)
     m_animation->setAlternatesDirection(alternates);
 }
 
-PassOwnPtr<WebCore::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
+PassOwnPtr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
 {
-    OwnPtr<WebCore::CCActiveAnimation> toReturn(m_animation->clone(WebCore::CCActiveAnimation::NonControllingInstance));
+    OwnPtr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
     toReturn->setNeedsSynchronizedStartTime(true);
     return toReturn.release();
 }
diff --git a/webkit/compositor_bindings/WebAnimationImpl.h b/webkit/compositor_bindings/WebAnimationImpl.h
index e549650..a4abfc9 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.h
+++ b/webkit/compositor_bindings/WebAnimationImpl.h
@@ -9,7 +9,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCActiveAnimation;
 }
 
@@ -32,12 +32,11 @@ public:
     virtual bool alternatesDirection() const OVERRIDE;
     virtual void setAlternatesDirection(bool) OVERRIDE;
 
-    PassOwnPtr<WebCore::CCActiveAnimation> cloneToCCAnimation();
+    PassOwnPtr<cc::CCActiveAnimation> cloneToCCAnimation();
 private:
-    OwnPtr<WebCore::CCActiveAnimation> m_animation;
+    OwnPtr<cc::CCActiveAnimation> m_animation;
 };
 
 }
 
 #endif // WebAnimationImpl_h
-
diff --git a/webkit/compositor_bindings/WebCompositorImpl.cpp b/webkit/compositor_bindings/WebCompositorImpl.cpp
index 5086837..270e90a 100644
--- a/webkit/compositor_bindings/WebCompositorImpl.cpp
+++ b/webkit/compositor_bindings/WebCompositorImpl.cpp
@@ -21,7 +21,7 @@
 #include "webkit/glue/webthread_impl.h"
 #endif
 
-using namespace WebCore;
+using namespace cc;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebCompositorImpl.h b/webkit/compositor_bindings/WebCompositorImpl.h
index 68ae94a..c117a89 100644
--- a/webkit/compositor_bindings/WebCompositorImpl.h
+++ b/webkit/compositor_bindings/WebCompositorImpl.h
@@ -11,7 +11,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCThread;
 }
 
@@ -30,8 +30,8 @@ public:
 
 private:
     static bool s_initialized;
-    static WebCore::CCThread* s_mainThread;
-    static WebCore::CCThread* s_implThread;
+    static cc::CCThread* s_mainThread;
+    static cc::CCThread* s_implThread;
 };
 
 }
diff --git a/webkit/compositor_bindings/WebContentLayerImpl.cpp b/webkit/compositor_bindings/WebContentLayerImpl.cpp
index a1f88fd..61d5998 100644
--- a/webkit/compositor_bindings/WebContentLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebContentLayerImpl.cpp
@@ -6,6 +6,8 @@
 #include "WebContentLayerImpl.h"
 
 #include "ContentLayerChromium.h"
+#include "FloatRect.h"
+#include "IntRect.h"
 #include "SkMatrix44.h"
 #include "webcore_convert.h"
 #include <public/WebContentLayerClient.h>
@@ -14,7 +16,7 @@
 #include <public/WebRect.h>
 #include <public/WebSize.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebContentLayerImpl.h b/webkit/compositor_bindings/WebContentLayerImpl.h
index aee3906..0eb1a81 100644
--- a/webkit/compositor_bindings/WebContentLayerImpl.h
+++ b/webkit/compositor_bindings/WebContentLayerImpl.h
@@ -10,11 +10,16 @@
 #include <public/WebContentLayer.h>
 #include <wtf/OwnPtr.h>
 
+namespace cc {
+class IntRect;
+class FloatRect;
+}
+
 namespace WebKit {
 class WebContentLayerClient;
 
 class WebContentLayerImpl : public WebContentLayer,
-                            public WebCore::ContentLayerChromiumClient {
+                            public cc::ContentLayerChromiumClient {
 public:
     explicit WebContentLayerImpl(WebContentLayerClient*);
 
@@ -30,7 +35,7 @@ protected:
     virtual ~WebContentLayerImpl();
 
     // ContentLayerChromiumClient implementation.
-    virtual void paintContents(SkCanvas*, const WebCore::IntRect& clip, WebCore::FloatRect& opaque) OVERRIDE;
+    virtual void paintContents(SkCanvas*, const cc::IntRect& clip, cc::FloatRect& opaque) OVERRIDE;
 
     OwnPtr<WebLayerImpl> m_layer;
     WebContentLayerClient* m_client;
diff --git a/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
index b620e25..302ce5b 100644
--- a/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
@@ -13,7 +13,7 @@
 #include <public/WebFloatRect.h>
 #include <public/WebSize.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebExternalTextureLayerImpl.h b/webkit/compositor_bindings/WebExternalTextureLayerImpl.h
index 311f4ec..542a650 100644
--- a/webkit/compositor_bindings/WebExternalTextureLayerImpl.h
+++ b/webkit/compositor_bindings/WebExternalTextureLayerImpl.h
@@ -14,7 +14,7 @@ namespace WebKit {
 class WebLayerImpl;
 
 class WebExternalTextureLayerImpl : public WebExternalTextureLayer,
-                                    public WebCore::TextureLayerChromiumClient {
+                                    public cc::TextureLayerChromiumClient {
 public:
     explicit WebExternalTextureLayerImpl(WebExternalTextureLayerClient*);
     virtual ~WebExternalTextureLayerImpl();
@@ -30,7 +30,7 @@ public:
     virtual void setRateLimitContext(bool) OVERRIDE;
 
     // TextureLayerChromiumClient implementation.
-    virtual unsigned prepareTexture(WebCore::CCTextureUpdateQueue&) OVERRIDE;
+    virtual unsigned prepareTexture(cc::CCTextureUpdateQueue&) OVERRIDE;
     virtual WebGraphicsContext3D* context() OVERRIDE;
 
 private:
@@ -41,4 +41,3 @@ private:
 }
 
 #endif // WebExternalTextureLayerImpl_h
-
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
index cc1ad35..15351e1 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
@@ -21,7 +21,7 @@ WebFloatAnimationCurve* WebFloatAnimationCurve::create()
 }
 
 WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl()
-    : m_curve(WebCore::CCKeyframedFloatAnimationCurve::create())
+    : m_curve(cc::CCKeyframedFloatAnimationCurve::create())
 {
 }
 
@@ -41,12 +41,12 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe)
 
 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, TimingFunctionType type)
 {
-    m_curve->addKeyframe(WebCore::CCFloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
+    m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
 }
 
 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, double x1, double y1, double x2, double y2)
 {
-    m_curve->addKeyframe(WebCore::CCFloatKeyframe::create(keyframe.time, keyframe.value, WebCore::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
+    m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
 }
 
 float WebFloatAnimationCurveImpl::getValue(double time) const
@@ -54,7 +54,7 @@ float WebFloatAnimationCurveImpl::getValue(double time) const
     return m_curve->getValue(time);
 }
 
-PassOwnPtr<WebCore::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
 {
     return m_curve->clone();
 }
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
index 04c3c9a..be6d80c 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
@@ -9,7 +9,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCAnimationCurve;
 class CCKeyframedFloatAnimationCurve;
 }
@@ -31,10 +31,10 @@ public:
 
     virtual float getValue(double time) const OVERRIDE;
 
-    PassOwnPtr<WebCore::CCAnimationCurve> cloneToCCAnimationCurve() const;
+    PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
 
 private:
-    OwnPtr<WebCore::CCKeyframedFloatAnimationCurve> m_curve;
+    OwnPtr<cc::CCKeyframedFloatAnimationCurve> m_curve;
 };
 
 }
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
index b587e09..c358886e 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
@@ -119,7 +119,7 @@ TEST(WebFloatAnimationCurveTest, EaseTimingFunction)
     curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEase);
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -146,7 +146,7 @@ TEST(WebFloatAnimationCurveTest, EaseInTimingFunction)
     curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseIn);
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseInTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -160,7 +160,7 @@ TEST(WebFloatAnimationCurveTest, EaseOutTimingFunction)
     curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseOut);
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseOutTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -174,7 +174,7 @@ TEST(WebFloatAnimationCurveTest, EaseInOutTimingFunction)
     curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseInOut);
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseInOutTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -192,7 +192,7 @@ TEST(WebFloatAnimationCurveTest, CustomBezierTimingFunction)
     curve->add(WebFloatKeyframe(0, 0), x1, y1, x2, y2);
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -206,7 +206,7 @@ TEST(WebFloatAnimationCurveTest, DefaultTimingFunction)
     curve->add(WebFloatKeyframe(0, 0));
     curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
diff --git a/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp
index ed3b99a..5a27036 100644
--- a/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp
@@ -9,7 +9,7 @@
 #include "WebLayerImpl.h"
 #include "webcore_convert.h"
 
-using WebCore::IOSurfaceLayerChromium;
+using cc::IOSurfaceLayerChromium;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebImageLayerImpl.cpp b/webkit/compositor_bindings/WebImageLayerImpl.cpp
index bb1b56b..06717e0 100644
--- a/webkit/compositor_bindings/WebImageLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebImageLayerImpl.cpp
@@ -8,7 +8,7 @@
 #include "ImageLayerChromium.h"
 #include "WebLayerImpl.h"
 
-using WebCore::ImageLayerChromium;
+using cc::ImageLayerChromium;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebImageLayerImpl.h b/webkit/compositor_bindings/WebImageLayerImpl.h
index 242edf4..6478923 100644
--- a/webkit/compositor_bindings/WebImageLayerImpl.h
+++ b/webkit/compositor_bindings/WebImageLayerImpl.h
@@ -8,10 +8,6 @@
 #include <public/WebImageLayer.h>
 #include <wtf/OwnPtr.h>
 
-namespace WebCore {
-class ImageLayerChromium;
-}
-
 namespace WebKit {
 class WebLayerImpl;
 
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index df3f430..0d86f19 100644
--- a/webkit/compositor_bindings/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
@@ -19,8 +19,8 @@
 #include <public/WebSize.h>
 #include <public/WebTransformationMatrix.h>
 
-using WebCore::CCActiveAnimation;
-using WebCore::LayerChromium;
+using cc::CCActiveAnimation;
+using cc::LayerChromium;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebLayerImpl.h b/webkit/compositor_bindings/WebLayerImpl.h
index b34d43b..e6bcefe 100644
--- a/webkit/compositor_bindings/WebLayerImpl.h
+++ b/webkit/compositor_bindings/WebLayerImpl.h
@@ -9,7 +9,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
-namespace WebCore {
+namespace cc {
 class LayerChromium;
 }
 
@@ -18,7 +18,7 @@ namespace WebKit {
 class WebLayerImpl : public WebLayer {
 public:
     WebLayerImpl();
-    explicit WebLayerImpl(PassRefPtr<WebCore::LayerChromium>);
+    explicit WebLayerImpl(PassRefPtr<cc::LayerChromium>);
     virtual ~WebLayerImpl();
 
     // WebLayer implementation.
@@ -83,10 +83,10 @@ public:
     virtual void setFixedToContainerLayer(bool) OVERRIDE;
     virtual void setScrollClient(WebLayerScrollClient*) OVERRIDE;
 
-    WebCore::LayerChromium* layer() const;
+    cc::LayerChromium* layer() const;
 
 protected:
-    RefPtr<WebCore::LayerChromium> m_layer;
+    RefPtr<cc::LayerChromium> m_layer;
 };
 
 } // namespace WebKit
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index 237d9f3..ceae7da 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -20,7 +20,7 @@
 #include <public/WebRenderingStats.h>
 #include <public/WebSize.h>
 
-using namespace WebCore;
+using namespace cc;
 
 namespace WebKit {
 
@@ -211,7 +211,7 @@ void WebLayerTreeViewImpl::layout()
     m_client->layout();
 }
 
-void WebLayerTreeViewImpl::applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale)
+void WebLayerTreeViewImpl::applyScrollAndScale(const cc::IntSize& scrollDelta, float pageScale)
 {
     m_client->applyScrollAndScale(convert(scrollDelta), pageScale);
 }
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.h b/webkit/compositor_bindings/WebLayerTreeViewImpl.h
index e795f5a..3dbeb20 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.h
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.h
@@ -10,7 +10,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCLayerTreeHost;
 }
 
@@ -19,7 +19,7 @@ class WebLayer;
 class WebLayerTreeViewClient;
 class WebLayerTreeViewClientAdapter;
 
-class WebLayerTreeViewImpl : public WebLayerTreeView, public WebCore::CCLayerTreeHostClient {
+class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::CCLayerTreeHostClient {
 public:
     explicit WebLayerTreeViewImpl(WebLayerTreeViewClient*);
     virtual ~WebLayerTreeViewImpl();
@@ -51,15 +51,15 @@ public:
     virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight) OVERRIDE;
     virtual void loseCompositorContext(int numTimes) OVERRIDE;
 
-    // WebCore::CCLayerTreeHostClient implementation.
+    // cc::CCLayerTreeHostClient implementation.
     virtual void willBeginFrame() OVERRIDE;
     virtual void didBeginFrame() OVERRIDE;
     virtual void animate(double monotonicFrameBeginTime) OVERRIDE;
     virtual void layout() OVERRIDE;
-    virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale) OVERRIDE;
+    virtual void applyScrollAndScale(const cc::IntSize& scrollDelta, float pageScale) OVERRIDE;
     virtual PassOwnPtr<WebCompositorOutputSurface> createOutputSurface() OVERRIDE;
     virtual void didRecreateOutputSurface(bool success) OVERRIDE;
-    virtual PassOwnPtr<WebCore::CCInputHandler> createInputHandler() OVERRIDE;
+    virtual PassOwnPtr<cc::CCInputHandler> createInputHandler() OVERRIDE;
     virtual void willCommit() OVERRIDE;
     virtual void didCommit() OVERRIDE;
     virtual void didCommitAndDrawFrame() OVERRIDE;
@@ -68,7 +68,7 @@ public:
 
 private:
     WebLayerTreeViewClient* m_client;
-    OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
+    OwnPtr<cc::CCLayerTreeHost> m_layerTreeHost;
 };
 
 } // namespace WebKit
diff --git a/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp b/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp
index 6aa6978..f216de3 100644
--- a/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp
@@ -8,7 +8,7 @@
 #include "ScrollbarLayerChromium.h"
 #include "WebLayerImpl.h"
 
-using WebCore::ScrollbarLayerChromium;
+using cc::ScrollbarLayerChromium;
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp b/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp
index ff4cf4e..b5e90ff 100644
--- a/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp
@@ -8,7 +8,7 @@
 #include "SolidColorLayerChromium.h"
 #include "WebLayerImpl.h"
 
-using WebCore::SolidColorLayerChromium;
+using cc::SolidColorLayerChromium;
 
 namespace WebKit {
 
@@ -38,4 +38,3 @@ void WebSolidColorLayerImpl::setBackgroundColor(WebColor color)
 }
 
 } // namespace WebKit
-
diff --git a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
index 895fee5..89fb5ca 100644
--- a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
+++ b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp
@@ -11,8 +11,8 @@
 #include "webcore_convert.h"
 #include <public/WebInputHandlerClient.h>
 
-#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
-    COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums)
+#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \
+    COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enums)
 
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, CCInputHandlerClient::ScrollOnMainThread);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusStarted, CCInputHandlerClient::ScrollStarted);
@@ -38,7 +38,7 @@ WebToCCInputHandlerAdapter::~WebToCCInputHandlerAdapter()
 
 class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
 public:
-    ClientAdapter(WebCore::CCInputHandlerClient* client)
+    ClientAdapter(cc::CCInputHandlerClient* client)
         : m_client(client)
     {
     }
@@ -49,7 +49,7 @@ public:
 
     virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERRIDE
     {
-        return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<WebCore::CCInputHandlerClient::ScrollInputType>(type)));
+        return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<cc::CCInputHandlerClient::ScrollInputType>(type)));
     }
 
     virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
@@ -92,11 +92,11 @@ public:
     }
 
 private:
-    WebCore::CCInputHandlerClient* m_client;
+    cc::CCInputHandlerClient* m_client;
 };
 
 
-void WebToCCInputHandlerAdapter::bindToClient(WebCore::CCInputHandlerClient* client)
+void WebToCCInputHandlerAdapter::bindToClient(cc::CCInputHandlerClient* client)
 {
     m_clientAdapter = adoptPtr(new ClientAdapter(client));
     m_handler->bindToClient(m_clientAdapter.get());
@@ -108,4 +108,3 @@ void WebToCCInputHandlerAdapter::animate(double monotonicTime)
 }
 
 }
-
diff --git a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.h b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.h
index 0984e84..d04d34b 100644
--- a/webkit/compositor_bindings/WebToCCInputHandlerAdapter.h
+++ b/webkit/compositor_bindings/WebToCCInputHandlerAdapter.h
@@ -12,13 +12,13 @@
 
 namespace WebKit {
 
-class WebToCCInputHandlerAdapter : public WebCore::CCInputHandler {
+class WebToCCInputHandlerAdapter : public cc::CCInputHandler {
 public:
     static PassOwnPtr<WebToCCInputHandlerAdapter> create(PassOwnPtr<WebInputHandler>);
-    virtual ~WebToCCInputHandlerAdapter(); 
+    virtual ~WebToCCInputHandlerAdapter();
 
-    // WebCore::CCInputHandler implementation.
-    virtual void bindToClient(WebCore::CCInputHandlerClient*) OVERRIDE;
+    // cc::CCInputHandler implementation.
+    virtual void bindToClient(cc::CCInputHandlerClient*) OVERRIDE;
     virtual void animate(double monotonicTime) OVERRIDE;
 
 private:
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
index 2cdf000..dae0bd1 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
@@ -20,7 +20,7 @@ WebTransformAnimationCurve* WebTransformAnimationCurve::create()
 }
 
 WebTransformAnimationCurveImpl::WebTransformAnimationCurveImpl()
-    : m_curve(WebCore::CCKeyframedTransformAnimationCurve::create())
+    : m_curve(cc::CCKeyframedTransformAnimationCurve::create())
 {
 }
 
@@ -40,12 +40,12 @@ void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe)
 
 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, TimingFunctionType type)
 {
-    m_curve->addKeyframe(WebCore::CCTransformKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
+    m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
 }
 
 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, double x1, double y1, double x2, double y2)
 {
-    m_curve->addKeyframe(WebCore::CCTransformKeyframe::create(keyframe.time, keyframe.value, WebCore::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
+    m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
 }
 
 WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) const
@@ -53,7 +53,7 @@ WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) co
     return m_curve->getValue(time);
 }
 
-PassOwnPtr<WebCore::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimationCurve() const
 {
     return m_curve->clone();
 }
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
index b7d7018..8631ef9 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
@@ -9,7 +9,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-namespace WebCore {
+namespace cc {
 class CCAnimationCurve;
 class CCKeyframedTransformAnimationCurve;
 }
@@ -31,10 +31,10 @@ public:
 
     virtual WebTransformationMatrix getValue(double time) const OVERRIDE;
 
-    PassOwnPtr<WebCore::CCAnimationCurve> cloneToCCAnimationCurve() const;
+    PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
 
 private:
-    OwnPtr<WebCore::CCKeyframedTransformAnimationCurve> m_curve;
+    OwnPtr<cc::CCKeyframedTransformAnimationCurve> m_curve;
 };
 
 }
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
index ee86d61..09021c7 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
@@ -156,7 +156,7 @@ TEST(WebTransformAnimationCurveTest, EaseTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEase);
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -191,7 +191,7 @@ TEST(WebTransformAnimationCurveTest, EaseInTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseIn);
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseInTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -209,7 +209,7 @@ TEST(WebTransformAnimationCurveTest, EaseOutTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseOut);
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseOutTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -227,7 +227,7 @@ TEST(WebTransformAnimationCurveTest, EaseInOutTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseInOut);
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseInOutTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -249,7 +249,7 @@ TEST(WebTransformAnimationCurveTest, CustomBezierTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1), x1, y1, x2, y2);
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -267,7 +267,7 @@ TEST(WebTransformAnimationCurveTest, DefaultTimingFunction)
     curve->add(WebTransformKeyframe(0, operations1));
     curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
 
-    OwnPtr<WebCore::CCTimingFunction> timingFunction(WebCore::CCEaseTimingFunction::create());
+    OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
     for (int i = 0; i <= 4; ++i) {
         const double time = i * 0.25;
         EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
diff --git a/webkit/compositor_bindings/WebVideoLayerImpl.cpp b/webkit/compositor_bindings/WebVideoLayerImpl.cpp
index b1f6751..7241706 100644
--- a/webkit/compositor_bindings/WebVideoLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebVideoLayerImpl.cpp
@@ -16,7 +16,7 @@ WebVideoLayer* WebVideoLayer::create(WebVideoFrameProvider* provider)
 }
 
 WebVideoLayerImpl::WebVideoLayerImpl(WebVideoFrameProvider* provider)
-    : m_layer(adoptPtr(new WebLayerImpl(WebCore::VideoLayerChromium::create(provider))))
+    : m_layer(adoptPtr(new WebLayerImpl(cc::VideoLayerChromium::create(provider))))
 {
 }
author	enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-09-14 22:21:30 +0000
committer	enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-09-14 22:21:30 +0000
commit	9c88e5615608f133483adb6c5c1ba5e170290d6b (patch)
tree	a0aaebff1b1cdf8e306532e38986e2e546357756
parent	9a9805d494f06037618cbd966a08c4602a04b53f (diff)
download	chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.zip chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.tar.gz chromium_src-9c88e5615608f133483adb6c5c1ba5e170290d6b.tar.bz2