Commit bae47d6a authored by abarth@chromium.org's avatar abarth@chromium.org

Clean up remaining uses of WebCore namespace

This CL removes uses of the WebCore namespace that have crept in during the
transition.

TBR=eseidel@chromium.org

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

git-svn-id: svn://svn.chromium.org/blink/trunk@179104 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d0822ad0
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "core/dom/DOMPoint.h" #include "core/dom/DOMPoint.h"
namespace WebCore { namespace blink {
DOMPoint* DOMPoint::create(const Dictionary& point) DOMPoint* DOMPoint::create(const Dictionary& point)
{ {
...@@ -36,4 +36,4 @@ DOMPoint::DOMPoint(double x, double y, double z, double w) ...@@ -36,4 +36,4 @@ DOMPoint::DOMPoint(double x, double y, double z, double w)
{ {
} }
} // namespace WebCore } // namespace blink
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/Dictionary.h" #include "bindings/core/v8/Dictionary.h"
#include "core/dom/DOMPointReadOnly.h" #include "core/dom/DOMPointReadOnly.h"
namespace WebCore { namespace blink {
class DOMPoint FINAL : public DOMPointReadOnly { class DOMPoint FINAL : public DOMPointReadOnly {
public: public:
...@@ -24,6 +24,6 @@ protected: ...@@ -24,6 +24,6 @@ protected:
DOMPoint(double x, double y, double z, double w); DOMPoint(double x, double y, double z, double w);
}; };
} // namespace WebCore } // namespace blink
#endif #endif
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "core/dom/DOMPointReadOnly.h" #include "core/dom/DOMPointReadOnly.h"
namespace WebCore { namespace blink {
DOMPointReadOnly* DOMPointReadOnly::create(double x, double y, double z, double w) DOMPointReadOnly* DOMPointReadOnly::create(double x, double y, double z, double w)
{ {
...@@ -20,4 +20,4 @@ DOMPointReadOnly::DOMPointReadOnly(double x, double y, double z, double w) ...@@ -20,4 +20,4 @@ DOMPointReadOnly::DOMPointReadOnly(double x, double y, double z, double w)
{ {
} }
} // namespace WebCore } // namespace blink
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptWrappable.h" #include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
namespace WebCore { namespace blink {
class DOMPointReadOnly : public GarbageCollected<DOMPointReadOnly>, public ScriptWrappableBase { class DOMPointReadOnly : public GarbageCollected<DOMPointReadOnly>, public ScriptWrappableBase {
public: public:
...@@ -30,6 +30,6 @@ protected: ...@@ -30,6 +30,6 @@ protected:
double m_w; double m_w;
}; };
} // namespace WebCore } // namespace blink
#endif #endif
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "core/dom/DOMRect.h" #include "core/dom/DOMRect.h"
namespace WebCore { namespace blink {
DOMRect* DOMRect::create(double x, double y, double width, double height) DOMRect* DOMRect::create(double x, double y, double width, double height)
{ {
...@@ -17,4 +17,4 @@ DOMRect::DOMRect(double x, double y, double width, double height) ...@@ -17,4 +17,4 @@ DOMRect::DOMRect(double x, double y, double width, double height)
{ {
} }
} // namespace WebCore } // namespace blink
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/Dictionary.h" #include "bindings/core/v8/Dictionary.h"
#include "core/dom/DOMRectReadOnly.h" #include "core/dom/DOMRectReadOnly.h"
namespace WebCore { namespace blink {
class DOMRect FINAL : public DOMRectReadOnly { class DOMRect FINAL : public DOMRectReadOnly {
public: public:
...@@ -23,6 +23,6 @@ protected: ...@@ -23,6 +23,6 @@ protected:
DOMRect(double x, double y, double z, double w); DOMRect(double x, double y, double z, double w);
}; };
} // namespace WebCore } // namespace blink
#endif #endif
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "core/dom/DOMRectReadOnly.h" #include "core/dom/DOMRectReadOnly.h"
namespace WebCore { namespace blink {
DOMRectReadOnly* DOMRectReadOnly::create(double x, double y, double width, double height) DOMRectReadOnly* DOMRectReadOnly::create(double x, double y, double width, double height)
{ {
...@@ -20,4 +20,4 @@ DOMRectReadOnly::DOMRectReadOnly(double x, double y, double width, double height ...@@ -20,4 +20,4 @@ DOMRectReadOnly::DOMRectReadOnly(double x, double y, double width, double height
{ {
} }
} // namespace WebCore } // namespace blink
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptWrappable.h" #include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
namespace WebCore { namespace blink {
class DOMRectReadOnly : public GarbageCollected<DOMRectReadOnly>, public ScriptWrappableBase { class DOMRectReadOnly : public GarbageCollected<DOMRectReadOnly>, public ScriptWrappableBase {
public: public:
...@@ -35,6 +35,6 @@ protected: ...@@ -35,6 +35,6 @@ protected:
double m_height; double m_height;
}; };
} // namespace WebCore } // namespace blink
#endif #endif
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "wtf/testing/WTFTestHelpers.h" #include "wtf/testing/WTFTestHelpers.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
using namespace WebCore; using namespace blink;
namespace { namespace {
......
...@@ -946,6 +946,6 @@ DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ...@@ -946,6 +946,6 @@ DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co
} // namespace blink } // namespace blink
WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(WebCore::WebGLRenderingContextBase::TextureUnitState); WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextBase::TextureUnitState);
#endif // WebGLRenderingContextBase_h #endif // WebGLRenderingContextBase_h
...@@ -106,7 +106,7 @@ private: ...@@ -106,7 +106,7 @@ private:
namespace WTF { namespace WTF {
template<> template<>
struct VectorTraits<WebCore::WebGLVertexArrayObjectOES::VertexAttribState> : SimpleClassVectorTraits<WebCore::WebGLVertexArrayObjectOES::VertexAttribState> { struct VectorTraits<blink::WebGLVertexArrayObjectOES::VertexAttribState> : SimpleClassVectorTraits<blink::WebGLVertexArrayObjectOES::VertexAttribState> {
// Specialization needed as the VertexAttribState's struct fields // Specialization needed as the VertexAttribState's struct fields
// aren't handled as desired by the IsPod() trait. // aren't handled as desired by the IsPod() trait.
#if ENABLE(OILPAN) #if ENABLE(OILPAN)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "modules/geolocation/GeoNotifier.h" #include "modules/geolocation/GeoNotifier.h"
namespace WebCore { namespace blink {
void GeolocationWatchers::trace(Visitor* visitor) void GeolocationWatchers::trace(Visitor* visitor)
{ {
...@@ -73,4 +73,4 @@ void GeolocationWatchers::getNotifiersVector(HeapVector<Member<GeoNotifier> >& c ...@@ -73,4 +73,4 @@ void GeolocationWatchers::getNotifiersVector(HeapVector<Member<GeoNotifier> >& c
copyValuesToVector(m_idToNotifierMap, copy); copyValuesToVector(m_idToNotifierMap, copy);
} }
} // namespace WebCore } // namespace blink
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
namespace WebCore { namespace blink {
class GeoNotifier; class GeoNotifier;
...@@ -36,6 +36,6 @@ private: ...@@ -36,6 +36,6 @@ private:
NotifierToIdMap m_notifierToIdMap; NotifierToIdMap m_notifierToIdMap;
}; };
} // namespace WebCore } // namespace blink
#endif // GeolocationWatchers_h #endif // GeolocationWatchers_h
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptPromiseResolver.h" #include "bindings/core/v8/ScriptPromiseResolver.h"
#include "bindings/core/v8/ScriptState.h" #include "bindings/core/v8/ScriptState.h"
namespace WebCore { namespace blink {
PassRefPtrWillBeRawPtr<CacheStorage> CacheStorage::create() PassRefPtrWillBeRawPtr<CacheStorage> CacheStorage::create()
{ {
...@@ -71,4 +71,4 @@ CacheStorage::CacheStorage() ...@@ -71,4 +71,4 @@ CacheStorage::CacheStorage()
ScriptWrappable::init(this); ScriptWrappable::init(this);
} }
} // namespace WebCore } // namespace blink
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "wtf/Noncopyable.h" #include "wtf/Noncopyable.h"
#include "wtf/RefCounted.h" #include "wtf/RefCounted.h"
namespace WebCore { namespace blink {
// See https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html#cache-storage // See https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html#cache-storage
...@@ -33,6 +33,6 @@ private: ...@@ -33,6 +33,6 @@ private:
CacheStorage(); CacheStorage();
}; };
} // namespace WebCore } // namespace blink
#endif // CacheStorage_h #endif // CacheStorage_h
...@@ -32,7 +32,7 @@ using testing::PrintToString; ...@@ -32,7 +32,7 @@ using testing::PrintToString;
using testing::AnyNumber; using testing::AnyNumber;
namespace WebCore { namespace blink {
namespace { namespace {
...@@ -741,4 +741,4 @@ TEST_F(NewWebSocketChannelImplTest, failFromWebSocket) ...@@ -741,4 +741,4 @@ TEST_F(NewWebSocketChannelImplTest, failFromWebSocket)
} // namespace } // namespace
} // namespace WebCore } // namespace blink
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "wtf/PassOwnPtr.h" #include "wtf/PassOwnPtr.h"
#include "wtf/PassRefPtr.h" #include "wtf/PassRefPtr.h"
namespace WebCore { namespace blink {
RecordingImageBufferSurface::RecordingImageBufferSurface(const IntSize& size, OpacityMode opacityMode) RecordingImageBufferSurface::RecordingImageBufferSurface(const IntSize& size, OpacityMode opacityMode)
: ImageBufferSurface(size, opacityMode) : ImageBufferSurface(size, opacityMode)
...@@ -144,4 +144,4 @@ bool RecordingImageBufferSurface::handleOpaqueFrame() ...@@ -144,4 +144,4 @@ bool RecordingImageBufferSurface::handleOpaqueFrame()
return true; return true;
} }
} // namespace WebCore } // namespace blink
...@@ -13,7 +13,7 @@ class SkPicture; ...@@ -13,7 +13,7 @@ class SkPicture;
class SkPictureRecorder; class SkPictureRecorder;
class RecordingImageBufferSurfaceTest; class RecordingImageBufferSurfaceTest;
namespace WebCore { namespace blink {
class GraphicsContext; class GraphicsContext;
...@@ -47,6 +47,6 @@ private: ...@@ -47,6 +47,6 @@ private:
bool m_surfaceUsedSincePreviousFrameWasPresented; bool m_surfaceUsedSincePreviousFrameWasPresented;
}; };
} // namespace WebCore } // namespace blink
#endif #endif
...@@ -697,7 +697,7 @@ template <typename T> struct RemoveHeapPointerWrapperTypes { ...@@ -697,7 +697,7 @@ template <typename T> struct RemoveHeapPointerWrapperTypes {
}; };
template<typename T> template<typename T>
struct TraceIfNeeded : public TraceIfEnabled<T, WebCore::IsGarbageCollectedType<typename RemoveHeapPointerWrapperTypes<typename WTF::RemovePointer<T>::Type>::Type>::value> { }; struct TraceIfNeeded : public TraceIfEnabled<T, blink::IsGarbageCollectedType<typename RemoveHeapPointerWrapperTypes<typename WTF::RemovePointer<T>::Type>::Type>::value> { };
// This trace trait for std::pair will null weak members if their referent is // This trace trait for std::pair will null weak members if their referent is
// collected. If you have a collection that contain weakness it does not remove // collected. If you have a collection that contain weakness it does not remove
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment