diff options
| author | abarth@chromium.org <abarth@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2014-07-18 22:27:57 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2014-07-18 22:27:57 +0000 |
| commit | e46a61bc36aca1fa49cc3ef72c75e8017fbb45d1 (patch) | |
| tree | 82cf2bcd29bfbdaba3ae7bf1ee4bd079fb548d02 /third_party/WebKit/public | |
| parent | 99698544d9db94a040b9cab1eb43f8cdb300eddb (diff) | |
| download | chromium_src-e46a61bc36aca1fa49cc3ef72c75e8017fbb45d1.zip chromium_src-e46a61bc36aca1fa49cc3ef72c75e8017fbb45d1.tar.gz chromium_src-e46a61bc36aca1fa49cc3ef72c75e8017fbb45d1.tar.bz2 | |
Rename WebCore namespace to blink in Public
TBR=eseidel@chromium.org
Review URL: https://codereview.chromium.org/401973003
git-svn-id: svn://svn.chromium.org/blink/trunk@178490 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/public')
124 files changed, 436 insertions, 436 deletions
diff --git a/third_party/WebKit/public/platform/WebAnimation.h b/third_party/WebKit/public/platform/WebAnimation.h index 99ed78d..e51b62b 100644 --- a/third_party/WebKit/public/platform/WebAnimation.h +++ b/third_party/WebKit/public/platform/WebAnimation.h @@ -33,7 +33,7 @@ #include "wtf/Forward.h" #endif -namespace WebCore { +namespace blink { class CCActiveAnimation; } diff --git a/third_party/WebKit/public/platform/WebApplicationCacheHost.h b/third_party/WebKit/public/platform/WebApplicationCacheHost.h index ccd0b6a..bf037f0 100644 --- a/third_party/WebKit/public/platform/WebApplicationCacheHost.h +++ b/third_party/WebKit/public/platform/WebApplicationCacheHost.h @@ -48,7 +48,7 @@ struct WebURLError; // and calls delete when the instance is no longer needed. class WebApplicationCacheHost { public: - // These values must match WebCore::ApplicationCacheHost::Status values + // These values must match blink::ApplicationCacheHost::Status values enum Status { Uncached, Idle, @@ -58,7 +58,7 @@ public: Obsolete }; - // These values must match WebCore::ApplicationCacheHost::EventID values + // These values must match blink::ApplicationCacheHost::EventID values enum EventID { CheckingEvent, ErrorEvent, diff --git a/third_party/WebKit/public/platform/WebAudioBus.h b/third_party/WebKit/public/platform/WebAudioBus.h index fae16f0..42dabd34 100644 --- a/third_party/WebKit/public/platform/WebAudioBus.h +++ b/third_party/WebKit/public/platform/WebAudioBus.h @@ -27,7 +27,7 @@ #include "WebCommon.h" -namespace WebCore { class AudioBus; } +namespace blink { class AudioBus; } #if INSIDE_BLINK namespace WTF { template <typename T> class PassRefPtr; } @@ -63,7 +63,7 @@ public: float* channelData(unsigned channelIndex); #if INSIDE_BLINK - WTF::PassRefPtr<WebCore::AudioBus> release(); + WTF::PassRefPtr<blink::AudioBus> release(); #endif private: @@ -71,7 +71,7 @@ private: WebAudioBus(const WebAudioBus&); void operator=(const WebAudioBus&); - WebCore::AudioBus* m_private; + blink::AudioBus* m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebBlobData.h b/third_party/WebKit/public/platform/WebBlobData.h index 15e9a68..f9c69e9 100644 --- a/third_party/WebKit/public/platform/WebBlobData.h +++ b/third_party/WebKit/public/platform/WebBlobData.h @@ -37,7 +37,7 @@ #include "WebThreadSafeData.h" #include "WebURL.h" -namespace WebCore { class BlobData; } +namespace blink { class BlobData; } #if INSIDE_BLINK namespace WTF { template <typename T> class PassOwnPtr; } #endif @@ -72,13 +72,13 @@ public: BLINK_PLATFORM_EXPORT WebString contentType() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebBlobData(const WTF::PassOwnPtr<WebCore::BlobData>&); - BLINK_PLATFORM_EXPORT WebBlobData& operator=(const WTF::PassOwnPtr<WebCore::BlobData>&); - BLINK_PLATFORM_EXPORT operator WTF::PassOwnPtr<WebCore::BlobData>(); + BLINK_PLATFORM_EXPORT WebBlobData(const WTF::PassOwnPtr<blink::BlobData>&); + BLINK_PLATFORM_EXPORT WebBlobData& operator=(const WTF::PassOwnPtr<blink::BlobData>&); + BLINK_PLATFORM_EXPORT operator WTF::PassOwnPtr<blink::BlobData>(); #endif private: - WebPrivateOwnPtr<WebCore::BlobData> m_private; + WebPrivateOwnPtr<blink::BlobData> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h b/third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h index 5106b59..4cd224e 100644 --- a/third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h +++ b/third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h @@ -9,7 +9,7 @@ #include "WebContentDecryptionModuleException.h" #include "WebPrivatePtr.h" -namespace WebCore { +namespace blink { class ContentDecryptionModuleResult; } @@ -58,14 +58,14 @@ public: BLINK_PLATFORM_EXPORT void completeWithError(WebContentDecryptionModuleException, unsigned long systemCode, const WebString& message); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT explicit WebContentDecryptionModuleResult(WebCore::ContentDecryptionModuleResult*); + BLINK_PLATFORM_EXPORT explicit WebContentDecryptionModuleResult(blink::ContentDecryptionModuleResult*); #endif private: BLINK_PLATFORM_EXPORT void reset(); BLINK_PLATFORM_EXPORT void assign(const WebContentDecryptionModuleResult&); - WebPrivatePtr<WebCore::ContentDecryptionModuleResult> m_impl; + WebPrivatePtr<blink::ContentDecryptionModuleResult> m_impl; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebConvertableToTraceFormat.h b/third_party/WebKit/public/platform/WebConvertableToTraceFormat.h index ee944ac..23f101d 100644 --- a/third_party/WebKit/public/platform/WebConvertableToTraceFormat.h +++ b/third_party/WebKit/public/platform/WebConvertableToTraceFormat.h @@ -8,7 +8,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { namespace TraceEvent { class ConvertableToTraceFormat; } @@ -20,7 +20,7 @@ class WebConvertableToTraceFormat { public: WebConvertableToTraceFormat() { } #if INSIDE_BLINK - WebConvertableToTraceFormat(WebCore::TraceEvent::ConvertableToTraceFormat*); + WebConvertableToTraceFormat(blink::TraceEvent::ConvertableToTraceFormat*); #endif ~WebConvertableToTraceFormat() { reset(); } @@ -36,7 +36,7 @@ public: } private: - WebPrivatePtr<WebCore::TraceEvent::ConvertableToTraceFormat> m_private; + WebPrivatePtr<blink::TraceEvent::ConvertableToTraceFormat> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebCrypto.h b/third_party/WebKit/public/platform/WebCrypto.h index 7d8c0f3..d76989b 100644 --- a/third_party/WebKit/public/platform/WebCrypto.h +++ b/third_party/WebKit/public/platform/WebCrypto.h @@ -38,7 +38,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebCore { class CryptoResult; } +namespace blink { class CryptoResult; } #if INSIDE_BLINK namespace WTF { template <typename T> class PassRefPtr; } @@ -100,14 +100,14 @@ public: BLINK_PLATFORM_EXPORT bool cancelled() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT explicit WebCryptoResult(const WTF::PassRefPtr<WebCore::CryptoResult>&); + BLINK_PLATFORM_EXPORT explicit WebCryptoResult(const WTF::PassRefPtr<blink::CryptoResult>&); #endif private: BLINK_PLATFORM_EXPORT void reset(); BLINK_PLATFORM_EXPORT void assign(const WebCryptoResult&); - WebPrivatePtr<WebCore::CryptoResult> m_impl; + WebPrivatePtr<blink::CryptoResult> m_impl; }; class WebCryptoDigestor { diff --git a/third_party/WebKit/public/platform/WebCursorInfo.h b/third_party/WebKit/public/platform/WebCursorInfo.h index f7a4e69..6c23756 100644 --- a/third_party/WebKit/public/platform/WebCursorInfo.h +++ b/third_party/WebKit/public/platform/WebCursorInfo.h @@ -35,7 +35,7 @@ #include "WebPoint.h" #if INSIDE_BLINK -namespace WebCore { class Cursor; } +namespace blink { class Cursor; } #endif #ifdef WIN32 @@ -116,7 +116,7 @@ struct WebCursorInfo { } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT explicit WebCursorInfo(const WebCore::Cursor&); + BLINK_PLATFORM_EXPORT explicit WebCursorInfo(const blink::Cursor&); #endif }; diff --git a/third_party/WebKit/public/platform/WebData.h b/third_party/WebKit/public/platform/WebData.h index 0fc8ef1..5630c71 100644 --- a/third_party/WebKit/public/platform/WebData.h +++ b/third_party/WebKit/public/platform/WebData.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebPrivatePtr.h" -namespace WebCore { class SharedBuffer; } +namespace blink { class SharedBuffer; } namespace blink { @@ -80,9 +80,9 @@ public: bool isNull() const { return m_private.isNull(); } #if INSIDE_BLINK - WebData(const PassRefPtr<WebCore::SharedBuffer>&); - WebData& operator=(const PassRefPtr<WebCore::SharedBuffer>&); - operator PassRefPtr<WebCore::SharedBuffer>() const; + WebData(const PassRefPtr<blink::SharedBuffer>&); + WebData& operator=(const PassRefPtr<blink::SharedBuffer>&); + operator PassRefPtr<blink::SharedBuffer>() const; #else template <class C> WebData(const C& c) @@ -99,7 +99,7 @@ public: #endif private: - WebPrivatePtr<WebCore::SharedBuffer> m_private; + WebPrivatePtr<blink::SharedBuffer> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebDragData.h b/third_party/WebKit/public/platform/WebDragData.h index 73e778c..eed9176 100644 --- a/third_party/WebKit/public/platform/WebDragData.h +++ b/third_party/WebKit/public/platform/WebDragData.h @@ -36,7 +36,7 @@ #include "WebString.h" #include "WebURL.h" -namespace WebCore { class DataObject; } +namespace blink { class DataObject; } namespace blink { @@ -109,14 +109,14 @@ public: BLINK_EXPORT void setFilesystemId(const WebString&); #if BLINK_IMPLEMENTATION - explicit WebDragData(const PassRefPtrWillBeRawPtr<WebCore::DataObject>&); - WebDragData& operator=(const PassRefPtrWillBeRawPtr<WebCore::DataObject>&); - WebCore::DataObject* getValue() const; + explicit WebDragData(const PassRefPtrWillBeRawPtr<blink::DataObject>&); + WebDragData& operator=(const PassRefPtrWillBeRawPtr<blink::DataObject>&); + blink::DataObject* getValue() const; #endif private: void ensureMutable(); - WebPrivatePtr<WebCore::DataObject> m_private; + WebPrivatePtr<blink::DataObject> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebFileSystem.h b/third_party/WebKit/public/platform/WebFileSystem.h index 3e7ec59..7311ddc 100644 --- a/third_party/WebKit/public/platform/WebFileSystem.h +++ b/third_party/WebKit/public/platform/WebFileSystem.h @@ -148,7 +148,7 @@ public: // In local filesystem cases the backend may simply return the metadata of the file itself (as well as readMetadata does), while in // remote filesystem case the backend may download the file into a temporary snapshot file and return the metadata of the temporary file. // The returned metadata is used to create a File object for the |path|. - // The snapshot file is supposed to be deleted when the last reference to a WebCore::File referring to it's path is dropped. + // The snapshot file is supposed to be deleted when the last reference to a blink::File referring to it's path is dropped. // WebFileSystemCallbacks::didCreateSnapshotFile() with the metadata of the snapshot file must be called when the operation is completed successfully. // WebFileSystemCallbacks::didFail() must be called otherwise. virtual void createSnapshotFileAndReadMetadata(const WebURL& path, WebFileSystemCallbacks) { BLINK_ASSERT_NOT_REACHED(); } diff --git a/third_party/WebKit/public/platform/WebFileSystemCallbacks.h b/third_party/WebKit/public/platform/WebFileSystemCallbacks.h index 4616bf2..a0b59eb 100644 --- a/third_party/WebKit/public/platform/WebFileSystemCallbacks.h +++ b/third_party/WebKit/public/platform/WebFileSystemCallbacks.h @@ -38,7 +38,7 @@ #include "WebPrivatePtr.h" #include "WebVector.h" -namespace WebCore { +namespace blink { class AsyncFileSystemCallbacks; } namespace WTF { template <typename T> class PassOwnPtr; } @@ -66,7 +66,7 @@ public: BLINK_PLATFORM_EXPORT void assign(const WebFileSystemCallbacks&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebFileSystemCallbacks(const WTF::PassOwnPtr<WebCore::AsyncFileSystemCallbacks>&); + BLINK_PLATFORM_EXPORT WebFileSystemCallbacks(const WTF::PassOwnPtr<blink::AsyncFileSystemCallbacks>&); #endif // Callback for WebFileSystem's various operations that don't require diff --git a/third_party/WebKit/public/platform/WebFloatPoint.h b/third_party/WebKit/public/platform/WebFloatPoint.h index bd477d8..4dbd147 100644 --- a/third_party/WebKit/public/platform/WebFloatPoint.h +++ b/third_party/WebKit/public/platform/WebFloatPoint.h @@ -58,22 +58,22 @@ struct WebFloatPoint { } #if INSIDE_BLINK - WebFloatPoint(const WebCore::FloatPoint& p) + WebFloatPoint(const blink::FloatPoint& p) : x(p.x()) , y(p.y()) { } - WebFloatPoint& operator=(const WebCore::FloatPoint& p) + WebFloatPoint& operator=(const blink::FloatPoint& p) { x = p.x(); y = p.y(); return *this; } - operator WebCore::FloatPoint() const + operator blink::FloatPoint() const { - return WebCore::FloatPoint(x, y); + return blink::FloatPoint(x, y); } #else WebFloatPoint(const gfx::PointF& p) diff --git a/third_party/WebKit/public/platform/WebFloatPoint3D.h b/third_party/WebKit/public/platform/WebFloatPoint3D.h index 9194890..6dc4dcae 100644 --- a/third_party/WebKit/public/platform/WebFloatPoint3D.h +++ b/third_party/WebKit/public/platform/WebFloatPoint3D.h @@ -36,14 +36,14 @@ struct WebFloatPoint3D { } #if INSIDE_BLINK - WebFloatPoint3D(const WebCore::FloatPoint3D& p) + WebFloatPoint3D(const blink::FloatPoint3D& p) : x(p.x()) , y(p.y()) , z(p.z()) { } - WebFloatPoint3D& operator=(const WebCore::FloatPoint3D& p) + WebFloatPoint3D& operator=(const blink::FloatPoint3D& p) { x = p.x(); y = p.y(); @@ -51,9 +51,9 @@ struct WebFloatPoint3D { return *this; } - operator WebCore::FloatPoint3D() const + operator blink::FloatPoint3D() const { - return WebCore::FloatPoint3D(x, y, z); + return blink::FloatPoint3D(x, y, z); } #else WebFloatPoint3D(const gfx::Point3F& p) diff --git a/third_party/WebKit/public/platform/WebFloatQuad.h b/third_party/WebKit/public/platform/WebFloatQuad.h index bffbabd..98cff11 100644 --- a/third_party/WebKit/public/platform/WebFloatQuad.h +++ b/third_party/WebKit/public/platform/WebFloatQuad.h @@ -62,7 +62,7 @@ struct WebFloatQuad { BLINK_PLATFORM_EXPORT WebRect enclosingRect() const; #if INSIDE_BLINK - WebFloatQuad& operator=(const WebCore::FloatQuad& q) + WebFloatQuad& operator=(const blink::FloatQuad& q) { p[0] = q.p1(); p[1] = q.p2(); @@ -70,7 +70,7 @@ struct WebFloatQuad { p[3] = q.p4(); return *this; } - WebFloatQuad(const WebCore::FloatQuad& q) + WebFloatQuad(const blink::FloatQuad& q) { *this = q; } diff --git a/third_party/WebKit/public/platform/WebFloatRect.h b/third_party/WebKit/public/platform/WebFloatRect.h index 9402c16..3127044 100644 --- a/third_party/WebKit/public/platform/WebFloatRect.h +++ b/third_party/WebKit/public/platform/WebFloatRect.h @@ -68,7 +68,7 @@ struct WebFloatRect { } #if INSIDE_BLINK - WebFloatRect(const WebCore::FloatRect& r) + WebFloatRect(const blink::FloatRect& r) : x(r.x()) , y(r.y()) , width(r.width()) @@ -76,7 +76,7 @@ struct WebFloatRect { { } - WebFloatRect& operator=(const WebCore::FloatRect& r) + WebFloatRect& operator=(const blink::FloatRect& r) { x = r.x(); y = r.y(); @@ -85,9 +85,9 @@ struct WebFloatRect { return *this; } - operator WebCore::FloatRect() const + operator blink::FloatRect() const { - return WebCore::FloatRect(x, y, width, height); + return blink::FloatRect(x, y, width, height); } #else WebFloatRect(const gfx::RectF& r) diff --git a/third_party/WebKit/public/platform/WebFloatSize.h b/third_party/WebKit/public/platform/WebFloatSize.h index 72cfc7d..fbceb6c 100644 --- a/third_party/WebKit/public/platform/WebFloatSize.h +++ b/third_party/WebKit/public/platform/WebFloatSize.h @@ -64,22 +64,22 @@ struct WebFloatSize { } #if INSIDE_BLINK - WebFloatSize(const WebCore::FloatSize& s) + WebFloatSize(const blink::FloatSize& s) : width(s.width()) , height(s.height()) { } - WebFloatSize& operator=(const WebCore::FloatSize& s) + WebFloatSize& operator=(const blink::FloatSize& s) { width = s.width(); height = s.height(); return *this; } - operator WebCore::FloatSize() const + operator blink::FloatSize() const { - return WebCore::FloatSize(width, height); + return blink::FloatSize(width, height); } #else WebFloatSize(const gfx::SizeF& s) diff --git a/third_party/WebKit/public/platform/WebHTTPBody.h b/third_party/WebKit/public/platform/WebHTTPBody.h index 98d1110..dc6e4dc3 100644 --- a/third_party/WebKit/public/platform/WebHTTPBody.h +++ b/third_party/WebKit/public/platform/WebHTTPBody.h @@ -38,7 +38,7 @@ #include "WebURL.h" #if INSIDE_BLINK -namespace WebCore { class FormData; } +namespace blink { class FormData; } namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -101,9 +101,9 @@ public: BLINK_PLATFORM_EXPORT void setContainsPasswordData(bool); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebHTTPBody(const WTF::PassRefPtr<WebCore::FormData>&); - BLINK_PLATFORM_EXPORT WebHTTPBody& operator=(const WTF::PassRefPtr<WebCore::FormData>&); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::FormData>() const; + BLINK_PLATFORM_EXPORT WebHTTPBody(const WTF::PassRefPtr<blink::FormData>&); + BLINK_PLATFORM_EXPORT WebHTTPBody& operator=(const WTF::PassRefPtr<blink::FormData>&); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::FormData>() const; #endif private: diff --git a/third_party/WebKit/public/platform/WebHTTPLoadInfo.h b/third_party/WebKit/public/platform/WebHTTPLoadInfo.h index c0f4b8c..b258422 100644 --- a/third_party/WebKit/public/platform/WebHTTPLoadInfo.h +++ b/third_party/WebKit/public/platform/WebHTTPLoadInfo.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebPrivatePtr.h" -namespace WebCore { +namespace blink { struct ResourceLoadInfo; } @@ -75,12 +75,12 @@ public: BLINK_PLATFORM_EXPORT void setResponseHeadersText(const WebString&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebHTTPLoadInfo(WTF::PassRefPtr<WebCore::ResourceLoadInfo>); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::ResourceLoadInfo>() const; + BLINK_PLATFORM_EXPORT WebHTTPLoadInfo(WTF::PassRefPtr<blink::ResourceLoadInfo>); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::ResourceLoadInfo>() const; #endif private: - WebPrivatePtr<WebCore::ResourceLoadInfo> m_private; + WebPrivatePtr<blink::ResourceLoadInfo> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebIDBDatabaseError.h b/third_party/WebKit/public/platform/WebIDBDatabaseError.h index a50fcbd..cfe836fa 100644 --- a/third_party/WebKit/public/platform/WebIDBDatabaseError.h +++ b/third_party/WebKit/public/platform/WebIDBDatabaseError.h @@ -33,7 +33,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { class DOMError; } +namespace blink { class DOMError; } namespace blink { @@ -55,14 +55,14 @@ public: BLINK_EXPORT void reset(); #if BLINK_IMPLEMENTATION - operator PassRefPtrWillBeRawPtr<WebCore::DOMError>() const; + operator PassRefPtrWillBeRawPtr<blink::DOMError>() const; #endif private: BLINK_EXPORT void assign(unsigned short code); BLINK_EXPORT void assign(unsigned short code, const WebString& message); - WebPrivatePtr<WebCore::DOMError> m_private; + WebPrivatePtr<blink::DOMError> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebIDBKey.h b/third_party/WebKit/public/platform/WebIDBKey.h index 2c9a7a0..a26c81f 100644 --- a/third_party/WebKit/public/platform/WebIDBKey.h +++ b/third_party/WebKit/public/platform/WebIDBKey.h @@ -33,7 +33,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebCore { class IDBKey; } +namespace blink { class IDBKey; } namespace blink { @@ -77,13 +77,13 @@ public: BLINK_EXPORT double number() const; // Only valid for NumberType. #if BLINK_IMPLEMENTATION - WebIDBKey(WebCore::IDBKey*); - WebIDBKey& operator=(WebCore::IDBKey*); - operator WebCore::IDBKey*() const; + WebIDBKey(blink::IDBKey*); + WebIDBKey& operator=(blink::IDBKey*); + operator blink::IDBKey*() const; #endif private: - WebPrivatePtr<WebCore::IDBKey> m_private; + WebPrivatePtr<blink::IDBKey> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebIDBKeyPath.h b/third_party/WebKit/public/platform/WebIDBKeyPath.h index 94bb177..a5d6ad7 100644 --- a/third_party/WebKit/public/platform/WebIDBKeyPath.h +++ b/third_party/WebKit/public/platform/WebIDBKeyPath.h @@ -32,7 +32,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebCore { class IDBKeyPath; } +namespace blink { class IDBKeyPath; } namespace blink { @@ -59,13 +59,13 @@ public: BLINK_EXPORT WebString string() const; // Only valid for StringType. #if BLINK_IMPLEMENTATION - WebIDBKeyPath(const WebCore::IDBKeyPath&); - WebIDBKeyPath& operator=(const WebCore::IDBKeyPath&); - operator const WebCore::IDBKeyPath&() const; + WebIDBKeyPath(const blink::IDBKeyPath&); + WebIDBKeyPath& operator=(const blink::IDBKeyPath&); + operator const blink::IDBKeyPath&() const; #endif private: - WebPrivateOwnPtr<WebCore::IDBKeyPath> m_private; + WebPrivateOwnPtr<blink::IDBKeyPath> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebIDBKeyRange.h b/third_party/WebKit/public/platform/WebIDBKeyRange.h index 62fe27c..e85be7c 100644 --- a/third_party/WebKit/public/platform/WebIDBKeyRange.h +++ b/third_party/WebKit/public/platform/WebIDBKeyRange.h @@ -29,7 +29,7 @@ #include "WebCommon.h" #include "WebPrivatePtr.h" -namespace WebCore { class IDBKeyRange; } +namespace blink { class IDBKeyRange; } namespace blink { @@ -53,13 +53,13 @@ public: BLINK_EXPORT void reset(); #if BLINK_IMPLEMENTATION - WebIDBKeyRange(WebCore::IDBKeyRange*); - WebIDBKeyRange& operator=(WebCore::IDBKeyRange*); - operator WebCore::IDBKeyRange*() const; + WebIDBKeyRange(blink::IDBKeyRange*); + WebIDBKeyRange& operator=(blink::IDBKeyRange*); + operator blink::IDBKeyRange*() const; #endif private: - WebPrivatePtr<WebCore::IDBKeyRange> m_private; + WebPrivatePtr<blink::IDBKeyRange> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebIDBMetadata.h b/third_party/WebKit/public/platform/WebIDBMetadata.h index 86b4e8f..afa637e 100644 --- a/third_party/WebKit/public/platform/WebIDBMetadata.h +++ b/third_party/WebKit/public/platform/WebIDBMetadata.h @@ -31,7 +31,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebCore { +namespace blink { struct IDBDatabaseMetadata; } @@ -81,8 +81,8 @@ struct WebIDBMetadata { }; #if BLINK_IMPLEMENTATION - WebIDBMetadata(const WebCore::IDBDatabaseMetadata&); - operator WebCore::IDBDatabaseMetadata() const; + WebIDBMetadata(const blink::IDBDatabaseMetadata&); + operator blink::IDBDatabaseMetadata() const; #endif }; diff --git a/third_party/WebKit/public/platform/WebImage.h b/third_party/WebKit/public/platform/WebImage.h index 3043553..122faef 100644 --- a/third_party/WebKit/public/platform/WebImage.h +++ b/third_party/WebKit/public/platform/WebImage.h @@ -37,7 +37,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #if INSIDE_BLINK -namespace WebCore { class Image; } +namespace blink { class Image; } namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -80,8 +80,8 @@ public: BLINK_PLATFORM_EXPORT WebSize size() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebImage(const WTF::PassRefPtr<WebCore::Image>&); - BLINK_PLATFORM_EXPORT WebImage& operator=(const WTF::PassRefPtr<WebCore::Image>&); + BLINK_PLATFORM_EXPORT WebImage(const WTF::PassRefPtr<blink::Image>&); + BLINK_PLATFORM_EXPORT WebImage& operator=(const WTF::PassRefPtr<blink::Image>&); #endif WebImage(const SkBitmap& bitmap) : m_bitmap(bitmap) { } diff --git a/third_party/WebKit/public/platform/WebMediaStream.h b/third_party/WebKit/public/platform/WebMediaStream.h index 184fddc..182248a 100644 --- a/third_party/WebKit/public/platform/WebMediaStream.h +++ b/third_party/WebKit/public/platform/WebMediaStream.h @@ -30,7 +30,7 @@ #include "WebPrivatePtr.h" #include "WebVector.h" -namespace WebCore { +namespace blink { class MediaStreamDescriptor; } @@ -81,15 +81,15 @@ public: BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebMediaStream(WebCore::MediaStreamDescriptor*); - BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const; - BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamDescriptor*() const; - BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&); + BLINK_PLATFORM_EXPORT WebMediaStream(blink::MediaStreamDescriptor*); + BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<blink::MediaStreamDescriptor>&); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamDescriptor>() const; + BLINK_PLATFORM_EXPORT operator blink::MediaStreamDescriptor*() const; + BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<blink::MediaStreamDescriptor>&); #endif private: - WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private; + WebPrivatePtr<blink::MediaStreamDescriptor> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebMediaStreamSource.h b/third_party/WebKit/public/platform/WebMediaStreamSource.h index 4ad27c1..9d8b2d30 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamSource.h +++ b/third_party/WebKit/public/platform/WebMediaStreamSource.h @@ -36,7 +36,7 @@ #include "WebPrivatePtr.h" #include "WebVector.h" -namespace WebCore { +namespace blink { class MediaStreamSource; } @@ -55,11 +55,11 @@ public: BLINK_PLATFORM_EXPORT WebMediaStreamSource owner(); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT void setOwner(WebCore::MediaStreamSource*); + BLINK_PLATFORM_EXPORT void setOwner(blink::MediaStreamSource*); #endif private: - WebCore::MediaStreamSource* m_owner; + blink::MediaStreamSource* m_owner; }; enum Type { @@ -113,14 +113,14 @@ public: BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&); - BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(WebCore::MediaStreamSource*); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const; - BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamSource*() const; + BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<blink::MediaStreamSource>&); + BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(blink::MediaStreamSource*); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamSource>() const; + BLINK_PLATFORM_EXPORT operator blink::MediaStreamSource*() const; #endif private: - WebPrivatePtr<WebCore::MediaStreamSource> m_private; + WebPrivatePtr<blink::MediaStreamSource> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebMediaStreamTrack.h b/third_party/WebKit/public/platform/WebMediaStreamTrack.h index e08c1f9..76c9be2 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamTrack.h +++ b/third_party/WebKit/public/platform/WebMediaStreamTrack.h @@ -29,7 +29,7 @@ #include "WebNonCopyable.h" #include "WebPrivatePtr.h" -namespace WebCore { +namespace blink { class MediaStreamComponent; } @@ -49,11 +49,11 @@ public: BLINK_PLATFORM_EXPORT WebMediaStreamTrack owner(); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT void setOwner(WebCore::MediaStreamComponent*); + BLINK_PLATFORM_EXPORT void setOwner(blink::MediaStreamComponent*); #endif private: - WebCore::MediaStreamComponent* m_owner; + blink::MediaStreamComponent* m_owner; }; WebMediaStreamTrack() { } @@ -91,15 +91,15 @@ public: BLINK_PLATFORM_EXPORT void setSourceProvider(WebAudioSourceProvider*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponent>); - BLINK_PLATFORM_EXPORT WebMediaStreamTrack(WebCore::MediaStreamComponent*); - BLINK_PLATFORM_EXPORT WebMediaStreamTrack& operator=(WebCore::MediaStreamComponent*); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamComponent>() const; - BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamComponent*() const; + BLINK_PLATFORM_EXPORT WebMediaStreamTrack(PassRefPtr<blink::MediaStreamComponent>); + BLINK_PLATFORM_EXPORT WebMediaStreamTrack(blink::MediaStreamComponent*); + BLINK_PLATFORM_EXPORT WebMediaStreamTrack& operator=(blink::MediaStreamComponent*); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamComponent>() const; + BLINK_PLATFORM_EXPORT operator blink::MediaStreamComponent*() const; #endif private: - WebPrivatePtr<WebCore::MediaStreamComponent> m_private; + WebPrivatePtr<blink::MediaStreamComponent> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h b/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h index 11e0862..f275249 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h +++ b/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h @@ -32,7 +32,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebCore { +namespace blink { class MediaStreamTrackSourcesRequest; } @@ -72,11 +72,11 @@ public: BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebMediaStreamTrackSourcesRequest(WebCore::MediaStreamTrackSourcesRequest*); + BLINK_PLATFORM_EXPORT WebMediaStreamTrackSourcesRequest(blink::MediaStreamTrackSourcesRequest*); #endif private: - WebPrivatePtr<WebCore::MediaStreamTrackSourcesRequest> m_private; + WebPrivatePtr<blink::MediaStreamTrackSourcesRequest> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebPermissionCallbacks.h b/third_party/WebKit/public/platform/WebPermissionCallbacks.h index a5f5f96..a19a7ac 100644 --- a/third_party/WebKit/public/platform/WebPermissionCallbacks.h +++ b/third_party/WebKit/public/platform/WebPermissionCallbacks.h @@ -7,7 +7,7 @@ #include "WebPrivatePtr.h" -namespace WebCore { +namespace blink { class PermissionCallbacks; } @@ -32,7 +32,7 @@ public: BLINK_PLATFORM_EXPORT void assign(const WebPermissionCallbacks&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebPermissionCallbacks(const WTF::PassOwnPtr<WebCore::PermissionCallbacks>&); + BLINK_PLATFORM_EXPORT WebPermissionCallbacks(const WTF::PassOwnPtr<blink::PermissionCallbacks>&); #endif BLINK_PLATFORM_EXPORT void doAllow(); diff --git a/third_party/WebKit/public/platform/WebPoint.h b/third_party/WebKit/public/platform/WebPoint.h index 7424072..69d384f 100644 --- a/third_party/WebKit/public/platform/WebPoint.h +++ b/third_party/WebKit/public/platform/WebPoint.h @@ -58,22 +58,22 @@ struct WebPoint { } #if INSIDE_BLINK - WebPoint(const WebCore::IntPoint& p) + WebPoint(const blink::IntPoint& p) : x(p.x()) , y(p.y()) { } - WebPoint& operator=(const WebCore::IntPoint& p) + WebPoint& operator=(const blink::IntPoint& p) { x = p.x(); y = p.y(); return *this; } - operator WebCore::IntPoint() const + operator blink::IntPoint() const { - return WebCore::IntPoint(x, y); + return blink::IntPoint(x, y); } #else WebPoint(const gfx::Point& p) diff --git a/third_party/WebKit/public/platform/WebPrerender.h b/third_party/WebKit/public/platform/WebPrerender.h index eb77bf9..f5f23a8 100644 --- a/third_party/WebKit/public/platform/WebPrerender.h +++ b/third_party/WebKit/public/platform/WebPrerender.h @@ -41,7 +41,7 @@ #include "wtf/PassRefPtr.h" #endif -namespace WebCore { +namespace blink { class Prerender; } @@ -70,9 +70,9 @@ public: } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT explicit WebPrerender(PassRefPtr<WebCore::Prerender>); + BLINK_PLATFORM_EXPORT explicit WebPrerender(PassRefPtr<blink::Prerender>); - BLINK_PLATFORM_EXPORT const WebCore::Prerender* toPrerender() const; + BLINK_PLATFORM_EXPORT const blink::Prerender* toPrerender() const; #endif BLINK_PLATFORM_EXPORT void reset(); @@ -93,7 +93,7 @@ public: BLINK_PLATFORM_EXPORT void didSendDOMContentLoadedForPrerender(); private: - WebPrivatePtr<WebCore::Prerender> m_private; + WebPrivatePtr<blink::Prerender> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebPrivatePtr.h b/third_party/WebKit/public/platform/WebPrivatePtr.h index 36107fd..0d60916 100644 --- a/third_party/WebKit/public/platform/WebPrivatePtr.h +++ b/third_party/WebKit/public/platform/WebPrivatePtr.h @@ -35,7 +35,7 @@ #if INSIDE_BLINK -namespace WebCore { template<typename T> class TreeShared; } +namespace blink { template<typename T> class TreeShared; } #include "platform/heap/Handle.h" #include "wtf/PassRefPtr.h" @@ -53,8 +53,8 @@ enum LifetimeManagementType { template<typename T> class LifetimeOf { - static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, WebCore::GarbageCollected>::value; - static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, WebCore::RefCountedGarbageCollected>::value; + static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, blink::GarbageCollected>::value; + static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, blink::RefCountedGarbageCollected>::value; public: static const LifetimeManagementType value = !isGarbageCollected ? RefCountedLifetime : @@ -106,7 +106,7 @@ public: } if (!m_handle) - m_handle = new WebCore::Persistent<T>(); + m_handle = new blink::Persistent<T>(); (*m_handle) = val; } @@ -125,7 +125,7 @@ public: } private: - WebCore::Persistent<T>* m_handle; + blink::Persistent<T>* m_handle; }; template<typename T> @@ -184,11 +184,11 @@ private: // // Methods that are used only by other Blink classes should only be // // declared when INSIDE_BLINK is set. // #if INSIDE_BLINK -// WebFoo(const WTF::PassRefPtr<WebCore::Foo>&); +// WebFoo(const WTF::PassRefPtr<blink::Foo>&); // #endif // // private: -// WebPrivatePtr<WebCore::Foo> m_private; +// WebPrivatePtr<blink::Foo> m_private; // }; // // // WebFoo.cpp diff --git a/third_party/WebKit/public/platform/WebRTCConfiguration.h b/third_party/WebKit/public/platform/WebRTCConfiguration.h index f99a5b9..0881bb7 100644 --- a/third_party/WebKit/public/platform/WebRTCConfiguration.h +++ b/third_party/WebKit/public/platform/WebRTCConfiguration.h @@ -36,7 +36,7 @@ #include "WebPrivatePtr.h" #include "WebVector.h" -namespace WebCore { +namespace blink { class RTCIceServer; class RTCConfiguration; } @@ -67,11 +67,11 @@ public: BLINK_PLATFORM_EXPORT WebString credential() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCICEServer(const WTF::PassRefPtr<WebCore::RTCIceServer>&); + BLINK_PLATFORM_EXPORT WebRTCICEServer(const WTF::PassRefPtr<blink::RTCIceServer>&); #endif private: - WebPrivatePtr<WebCore::RTCIceServer> m_private; + WebPrivatePtr<blink::RTCIceServer> m_private; }; enum WebRTCIceTransports { @@ -103,11 +103,11 @@ public: BLINK_PLATFORM_EXPORT WebRTCIceTransports iceTransports() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCConfiguration(const WTF::PassRefPtr<WebCore::RTCConfiguration>&); + BLINK_PLATFORM_EXPORT WebRTCConfiguration(const WTF::PassRefPtr<blink::RTCConfiguration>&); #endif private: - WebPrivatePtr<WebCore::RTCConfiguration> m_private; + WebPrivatePtr<blink::RTCConfiguration> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRTCICECandidate.h b/third_party/WebKit/public/platform/WebRTCICECandidate.h index 773c977..bbced63 100644 --- a/third_party/WebKit/public/platform/WebRTCICECandidate.h +++ b/third_party/WebKit/public/platform/WebRTCICECandidate.h @@ -35,7 +35,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class RTCIceCandidateDescriptor; } diff --git a/third_party/WebKit/public/platform/WebRTCOfferOptions.h b/third_party/WebKit/public/platform/WebRTCOfferOptions.h index 384fb4d..00f111c 100644 --- a/third_party/WebKit/public/platform/WebRTCOfferOptions.h +++ b/third_party/WebKit/public/platform/WebRTCOfferOptions.h @@ -9,7 +9,7 @@ #include "WebNonCopyable.h" #include "WebPrivatePtr.h" -namespace WebCore { +namespace blink { class RTCOfferOptions; } @@ -38,11 +38,11 @@ public: BLINK_PLATFORM_EXPORT bool iceRestart() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCOfferOptions(const WTF::PassRefPtr<WebCore::RTCOfferOptions>&); + BLINK_PLATFORM_EXPORT WebRTCOfferOptions(const WTF::PassRefPtr<blink::RTCOfferOptions>&); #endif private: - WebPrivatePtr<WebCore::RTCOfferOptions> m_private; + WebPrivatePtr<blink::RTCOfferOptions> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h b/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h index 7166389..8e17f56 100644 --- a/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h +++ b/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h @@ -36,7 +36,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class RTCSessionDescriptionRequest; } @@ -76,11 +76,11 @@ public: BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCSessionDescriptionRequest(const WTF::PassRefPtr<WebCore::RTCSessionDescriptionRequest>&); + BLINK_PLATFORM_EXPORT WebRTCSessionDescriptionRequest(const WTF::PassRefPtr<blink::RTCSessionDescriptionRequest>&); #endif private: - WebPrivatePtr<WebCore::RTCSessionDescriptionRequest> m_private; + WebPrivatePtr<blink::RTCSessionDescriptionRequest> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRTCStatsRequest.h b/third_party/WebKit/public/platform/WebRTCStatsRequest.h index 8f0b235..57d76dc 100644 --- a/third_party/WebKit/public/platform/WebRTCStatsRequest.h +++ b/third_party/WebKit/public/platform/WebRTCStatsRequest.h @@ -35,7 +35,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class RTCStatsRequest; } @@ -95,11 +95,11 @@ public: BLINK_PLATFORM_EXPORT WebRTCStatsResponse createResponse() const; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCStatsRequest(const PassRefPtr<WebCore::RTCStatsRequest>&); + BLINK_PLATFORM_EXPORT WebRTCStatsRequest(const PassRefPtr<blink::RTCStatsRequest>&); #endif private: - WebPrivatePtr<WebCore::RTCStatsRequest> m_private; + WebPrivatePtr<blink::RTCStatsRequest> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRTCStatsResponse.h b/third_party/WebKit/public/platform/WebRTCStatsResponse.h index 91532a5..2e3d58c 100644 --- a/third_party/WebKit/public/platform/WebRTCStatsResponse.h +++ b/third_party/WebKit/public/platform/WebRTCStatsResponse.h @@ -29,7 +29,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class RTCStatsResponseBase; } @@ -55,12 +55,12 @@ public: BLINK_PLATFORM_EXPORT void addStatistic(size_t report, const WebString& name, const WebString& value); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCStatsResponse(WebCore::RTCStatsResponseBase*); - BLINK_PLATFORM_EXPORT operator WebCore::RTCStatsResponseBase*() const; + BLINK_PLATFORM_EXPORT WebRTCStatsResponse(blink::RTCStatsResponseBase*); + BLINK_PLATFORM_EXPORT operator blink::RTCStatsResponseBase*() const; #endif private: - WebPrivatePtr<WebCore::RTCStatsResponseBase> m_private; + WebPrivatePtr<blink::RTCStatsResponseBase> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRTCVoidRequest.h b/third_party/WebKit/public/platform/WebRTCVoidRequest.h index 7dc95c6..f037eaa 100644 --- a/third_party/WebKit/public/platform/WebRTCVoidRequest.h +++ b/third_party/WebKit/public/platform/WebRTCVoidRequest.h @@ -36,7 +36,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class RTCVoidRequest; } @@ -75,11 +75,11 @@ public: BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebRTCVoidRequest(const WTF::PassRefPtr<WebCore::RTCVoidRequest>&); + BLINK_PLATFORM_EXPORT WebRTCVoidRequest(const WTF::PassRefPtr<blink::RTCVoidRequest>&); #endif private: - WebPrivatePtr<WebCore::RTCVoidRequest> m_private; + WebPrivatePtr<blink::RTCVoidRequest> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebRect.h b/third_party/WebKit/public/platform/WebRect.h index 440e168..47a15f8 100644 --- a/third_party/WebKit/public/platform/WebRect.h +++ b/third_party/WebKit/public/platform/WebRect.h @@ -68,7 +68,7 @@ struct WebRect { } #if INSIDE_BLINK - WebRect(const WebCore::IntRect& r) + WebRect(const blink::IntRect& r) : x(r.x()) , y(r.y()) , width(r.width()) @@ -76,7 +76,7 @@ struct WebRect { { } - WebRect& operator=(const WebCore::IntRect& r) + WebRect& operator=(const blink::IntRect& r) { x = r.x(); y = r.y(); @@ -85,9 +85,9 @@ struct WebRect { return *this; } - operator WebCore::IntRect() const + operator blink::IntRect() const { - return WebCore::IntRect(x, y, width, height); + return blink::IntRect(x, y, width, height); } #else WebRect(const gfx::Rect& r) diff --git a/third_party/WebKit/public/platform/WebSchedulerProxy.h b/third_party/WebKit/public/platform/WebSchedulerProxy.h index 75968d4..2a69903 100644 --- a/third_party/WebKit/public/platform/WebSchedulerProxy.h +++ b/third_party/WebKit/public/platform/WebSchedulerProxy.h @@ -7,7 +7,7 @@ #include "WebThread.h" -namespace WebCore { +namespace blink { class Scheduler; } @@ -30,7 +30,7 @@ public: private: WebSchedulerProxy(); - WebCore::Scheduler* m_scheduler; + blink::Scheduler* m_scheduler; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebScrollbar.h b/third_party/WebKit/public/platform/WebScrollbar.h index 3425bb3..ef137ea 100644 --- a/third_party/WebKit/public/platform/WebScrollbar.h +++ b/third_party/WebKit/public/platform/WebScrollbar.h @@ -33,7 +33,7 @@ #include "wtf/PassOwnPtr.h" #endif -namespace WebCore { +namespace blink { class Scrollbar; } diff --git a/third_party/WebKit/public/platform/WebScrollbarLayer.h b/third_party/WebKit/public/platform/WebScrollbarLayer.h index ea0706e..0e605b0 100644 --- a/third_party/WebKit/public/platform/WebScrollbarLayer.h +++ b/third_party/WebKit/public/platform/WebScrollbarLayer.h @@ -30,7 +30,7 @@ #include "WebScrollbarThemeGeometry.h" #include "WebScrollbarThemePainter.h" -namespace WebCore { +namespace blink { class Scrollbar; } diff --git a/third_party/WebKit/public/platform/WebScrollbarThemePainter.h b/third_party/WebKit/public/platform/WebScrollbarThemePainter.h index 1417c0b..5de5ca0 100644 --- a/third_party/WebKit/public/platform/WebScrollbarThemePainter.h +++ b/third_party/WebKit/public/platform/WebScrollbarThemePainter.h @@ -28,7 +28,7 @@ #include "WebCanvas.h" -namespace WebCore { +namespace blink { class ScrollbarTheme; class Scrollbar; }; @@ -63,7 +63,7 @@ public: BLINK_EXPORT void paintThumb(WebCanvas*, const WebRect&); #if BLINK_IMPLEMENTATION - WebScrollbarThemePainter(WebCore::ScrollbarTheme*, WebCore::Scrollbar*); + WebScrollbarThemePainter(blink::ScrollbarTheme*, blink::Scrollbar*); #endif private: @@ -71,13 +71,13 @@ private: // static pointer and its lifetime is essentially infinite. The functions // called from the painter may not be thread-safe, so all calls must be made // from the same thread that it is created on. - WebCore::ScrollbarTheme* m_theme; + blink::ScrollbarTheme* m_theme; // It is assumed that the constructor of this paint object is responsible // for the lifetime of this scrollbar. The painter has to use the real // scrollbar (and not a WebScrollbar wrapper) due to static_casts for // RenderScrollbar and pointer-based HashMap lookups for Lion scrollbars. - WebCore::Scrollbar* m_scrollbar; + blink::Scrollbar* m_scrollbar; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebSerializedOrigin.h b/third_party/WebKit/public/platform/WebSerializedOrigin.h index 0e01ae4..322ed82 100644 --- a/third_party/WebKit/public/platform/WebSerializedOrigin.h +++ b/third_party/WebKit/public/platform/WebSerializedOrigin.h @@ -8,7 +8,7 @@ #include "WebString.h" #if INSIDE_BLINK -namespace WebCore { class SecurityOrigin; } +namespace blink { class SecurityOrigin; } #else #include <url/origin.h> #endif @@ -20,7 +20,7 @@ class WebSerializedOrigin { public: WebSerializedOrigin() : m_string("null") { } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebSerializedOrigin(const WebCore::SecurityOrigin&); + BLINK_PLATFORM_EXPORT WebSerializedOrigin(const blink::SecurityOrigin&); #else WebSerializedOrigin(const url::Origin& origin) : m_string(WebString::fromUTF8(origin.string())) { } operator url::Origin() const { return url::Origin(m_string.utf8()); } diff --git a/third_party/WebKit/public/platform/WebServiceWorkerProxy.h b/third_party/WebKit/public/platform/WebServiceWorkerProxy.h index 9d5230b..8cfa3dd 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerProxy.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerProxy.h @@ -7,7 +7,7 @@ #include "WebCommon.h" -namespace WebCore { class ServiceWorker; } +namespace blink { class ServiceWorker; } namespace blink { @@ -29,12 +29,12 @@ public: virtual void dispatchStateChangeEvent() = 0; #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebServiceWorkerProxy(WebCore::ServiceWorker*); - BLINK_PLATFORM_EXPORT WebCore::ServiceWorker* unwrap() const; + BLINK_PLATFORM_EXPORT WebServiceWorkerProxy(blink::ServiceWorker*); + BLINK_PLATFORM_EXPORT blink::ServiceWorker* unwrap() const; #endif protected: - WebCore::ServiceWorker* m_private; + blink::ServiceWorker* m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebServiceWorkerRequest.h b/third_party/WebKit/public/platform/WebServiceWorkerRequest.h index 8e2ddae..0d72d003 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerRequest.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerRequest.h @@ -53,8 +53,8 @@ public: bool isReload() const; #if INSIDE_BLINK - const WebCore::HTTPHeaderMap& headers() const; - const WebCore::Referrer& referrer() const; + const blink::HTTPHeaderMap& headers() const; + const blink::Referrer& referrer() const; #endif private: diff --git a/third_party/WebKit/public/platform/WebServiceWorkerResponse.h b/third_party/WebKit/public/platform/WebServiceWorkerResponse.h index 95894c6..876b4ee 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerResponse.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerResponse.h @@ -16,7 +16,7 @@ #include "wtf/HashMap.h" #include "wtf/text/StringHash.h" -namespace WebCore { +namespace blink { class BlobDataHandle; } #endif @@ -60,8 +60,8 @@ public: void setHeaders(const HashMap<String, String>&); const HashMap<String, String>& headers() const; - void setBlobDataHandle(PassRefPtr<WebCore::BlobDataHandle>); - PassRefPtr<WebCore::BlobDataHandle> blobDataHandle() const; + void setBlobDataHandle(PassRefPtr<blink::BlobDataHandle>); + PassRefPtr<blink::BlobDataHandle> blobDataHandle() const; #endif private: diff --git a/third_party/WebKit/public/platform/WebSize.h b/third_party/WebKit/public/platform/WebSize.h index f54cdb2..057414e 100644 --- a/third_party/WebKit/public/platform/WebSize.h +++ b/third_party/WebKit/public/platform/WebSize.h @@ -63,22 +63,22 @@ struct WebSize { } #if INSIDE_BLINK - WebSize(const WebCore::IntSize& s) + WebSize(const blink::IntSize& s) : width(s.width()) , height(s.height()) { } - WebSize& operator=(const WebCore::IntSize& s) + WebSize& operator=(const blink::IntSize& s) { width = s.width(); height = s.height(); return *this; } - operator WebCore::IntSize() const + operator blink::IntSize() const { - return WebCore::IntSize(width, height); + return blink::IntSize(width, height); } #else WebSize(const gfx::Size& s) diff --git a/third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h b/third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h index 3a9e88f9..9b273d9 100644 --- a/third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h +++ b/third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h @@ -35,9 +35,9 @@ #include "public/platform/WebNonCopyable.h" #include "public/platform/WebPrivatePtr.h" -namespace WebCore { +namespace blink { class WebSocketHandshakeRequest; -} // namespace WebCore +} // namespace blink namespace blink { @@ -54,11 +54,11 @@ public: BLINK_PLATFORM_EXPORT void setHeadersText(const WebString&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT const WebCore::WebSocketHandshakeRequest& toCoreRequest() const { return *m_private.get(); } + BLINK_PLATFORM_EXPORT const blink::WebSocketHandshakeRequest& toCoreRequest() const { return *m_private.get(); } #endif // INSIDE_BLINK private: - WebPrivatePtr<WebCore::WebSocketHandshakeRequest> m_private; + WebPrivatePtr<blink::WebSocketHandshakeRequest> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebSocketHandshakeResponseInfo.h b/third_party/WebKit/public/platform/WebSocketHandshakeResponseInfo.h index ed783fc..a471e19 100644 --- a/third_party/WebKit/public/platform/WebSocketHandshakeResponseInfo.h +++ b/third_party/WebKit/public/platform/WebSocketHandshakeResponseInfo.h @@ -35,9 +35,9 @@ #include "public/platform/WebNonCopyable.h" #include "public/platform/WebPrivateOwnPtr.h" -namespace WebCore { +namespace blink { class WebSocketHandshakeResponse; -} // namespace WebCore +} // namespace blink namespace blink { @@ -54,11 +54,11 @@ public: BLINK_PLATFORM_EXPORT void setHeadersText(const WebString&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT const WebCore::WebSocketHandshakeResponse& toCoreResponse() const { return *m_private.get(); } + BLINK_PLATFORM_EXPORT const blink::WebSocketHandshakeResponse& toCoreResponse() const { return *m_private.get(); } #endif // INSIDE_BLINK private: - WebPrivateOwnPtr<WebCore::WebSocketHandshakeResponse> m_private; + WebPrivateOwnPtr<blink::WebSocketHandshakeResponse> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebSocketStreamError.h b/third_party/WebKit/public/platform/WebSocketStreamError.h index 2bbef89..83584b4 100644 --- a/third_party/WebKit/public/platform/WebSocketStreamError.h +++ b/third_party/WebKit/public/platform/WebSocketStreamError.h @@ -38,7 +38,7 @@ #include "wtf/PassRefPtr.h" #endif -namespace WebCore { class SocketStreamError; } +namespace blink { class SocketStreamError; } namespace blink { @@ -55,13 +55,13 @@ public: void reset(); #if INSIDE_BLINK - WebSocketStreamError(WTF::PassRefPtr<WebCore::SocketStreamError>); - WebSocketStreamError& operator=(WTF::PassRefPtr<WebCore::SocketStreamError>); - operator WTF::PassRefPtr<WebCore::SocketStreamError>() const; + WebSocketStreamError(WTF::PassRefPtr<blink::SocketStreamError>); + WebSocketStreamError& operator=(WTF::PassRefPtr<blink::SocketStreamError>); + operator WTF::PassRefPtr<blink::SocketStreamError>() const; #endif private: - WebPrivatePtr<WebCore::SocketStreamError> m_private; + WebPrivatePtr<blink::SocketStreamError> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h b/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h index b72022a..cd30a57 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h @@ -30,7 +30,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { class PlatformSpeechSynthesisUtterance; } +namespace blink { class PlatformSpeechSynthesisUtterance; } namespace blink { @@ -62,13 +62,13 @@ public: BLINK_PLATFORM_EXPORT double startTime() const; // In seconds. #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance(WebCore::PlatformSpeechSynthesisUtterance*); - BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance& operator=(WebCore::PlatformSpeechSynthesisUtterance*); - BLINK_PLATFORM_EXPORT operator WebCore::PlatformSpeechSynthesisUtterance*() const; + BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance(blink::PlatformSpeechSynthesisUtterance*); + BLINK_PLATFORM_EXPORT WebSpeechSynthesisUtterance& operator=(blink::PlatformSpeechSynthesisUtterance*); + BLINK_PLATFORM_EXPORT operator blink::PlatformSpeechSynthesisUtterance*() const; #endif private: - WebPrivatePtr<WebCore::PlatformSpeechSynthesisUtterance> m_private; + WebPrivatePtr<blink::PlatformSpeechSynthesisUtterance> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h b/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h index 3654ee1..07fb813 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h @@ -30,7 +30,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebCore { +namespace blink { class PlatformSpeechSynthesisVoice; } @@ -58,11 +58,11 @@ public: BLINK_PLATFORM_EXPORT void setIsDefault(bool); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT operator WebCore::PlatformSpeechSynthesisVoice*() const; + BLINK_PLATFORM_EXPORT operator blink::PlatformSpeechSynthesisVoice*() const; #endif private: - WebPrivatePtr<WebCore::PlatformSpeechSynthesisVoice> m_private; + WebPrivatePtr<blink::PlatformSpeechSynthesisVoice> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h b/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h index 21175d8..02d441b 100644 --- a/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h +++ b/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h @@ -35,7 +35,7 @@ #include "WebPrivatePtr.h" #include "WebStorageQuotaError.h" -namespace WebCore { +namespace blink { class StorageQuotaCallbacks; } @@ -60,7 +60,7 @@ public: BLINK_PLATFORM_EXPORT void assign(const WebStorageQuotaCallbacks&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebStorageQuotaCallbacks(const WTF::PassOwnPtr<WebCore::StorageQuotaCallbacks>&); + BLINK_PLATFORM_EXPORT WebStorageQuotaCallbacks(const WTF::PassOwnPtr<blink::StorageQuotaCallbacks>&); #endif // Callback for WebFrameClient::queryStorageUsageAndQuota. diff --git a/third_party/WebKit/public/platform/WebThreadSafeData.h b/third_party/WebKit/public/platform/WebThreadSafeData.h index 1803456..b18a52e 100644 --- a/third_party/WebKit/public/platform/WebThreadSafeData.h +++ b/third_party/WebKit/public/platform/WebThreadSafeData.h @@ -38,7 +38,7 @@ #include <string> #endif -namespace WebCore { class RawData; } +namespace blink { class RawData; } namespace blink { @@ -58,8 +58,8 @@ public: bool isEmpty() const { return !size(); } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebThreadSafeData(const WTF::PassRefPtr<WebCore::RawData>&); - BLINK_PLATFORM_EXPORT WebThreadSafeData& operator=(const WTF::PassRefPtr<WebCore::RawData>&); + BLINK_PLATFORM_EXPORT WebThreadSafeData(const WTF::PassRefPtr<blink::RawData>&); + BLINK_PLATFORM_EXPORT WebThreadSafeData& operator=(const WTF::PassRefPtr<blink::RawData>&); #else operator std::string() const { @@ -69,7 +69,7 @@ public: #endif private: - WebPrivatePtr<WebCore::RawData> m_private; + WebPrivatePtr<blink::RawData> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebURL.h b/third_party/WebKit/public/platform/WebURL.h index 63c5a35..c2a8269 100644 --- a/third_party/WebKit/public/platform/WebURL.h +++ b/third_party/WebKit/public/platform/WebURL.h @@ -36,7 +36,7 @@ #include <url/third_party/mozilla/url_parse.h> #if INSIDE_BLINK -namespace WebCore { class KURL; } +namespace blink { class KURL; } #else #include <url/gurl.h> #endif @@ -102,9 +102,9 @@ public: } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebURL(const WebCore::KURL&); - BLINK_PLATFORM_EXPORT WebURL& operator=(const WebCore::KURL&); - BLINK_PLATFORM_EXPORT operator WebCore::KURL() const; + BLINK_PLATFORM_EXPORT WebURL(const blink::KURL&); + BLINK_PLATFORM_EXPORT WebURL& operator=(const blink::KURL&); + BLINK_PLATFORM_EXPORT operator blink::KURL() const; #else WebURL(const GURL& url) : m_string(WebString::fromUTF8(url.possibly_invalid_spec())) diff --git a/third_party/WebKit/public/platform/WebURLError.h b/third_party/WebKit/public/platform/WebURLError.h index cdd0b6a..6ba6304 100644 --- a/third_party/WebKit/public/platform/WebURLError.h +++ b/third_party/WebKit/public/platform/WebURLError.h @@ -35,7 +35,7 @@ #include "WebURL.h" #if INSIDE_BLINK -namespace WebCore { class ResourceError; } +namespace blink { class ResourceError; } #endif namespace blink { @@ -69,9 +69,9 @@ struct WebURLError { WebURLError() : reason(0), staleCopyInCache(false), isCancellation(false) { } #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebURLError(const WebCore::ResourceError&); - BLINK_PLATFORM_EXPORT WebURLError& operator=(const WebCore::ResourceError&); - BLINK_PLATFORM_EXPORT operator WebCore::ResourceError() const; + BLINK_PLATFORM_EXPORT WebURLError(const blink::ResourceError&); + BLINK_PLATFORM_EXPORT WebURLError& operator=(const blink::ResourceError&); + BLINK_PLATFORM_EXPORT operator blink::ResourceError() const; #endif }; diff --git a/third_party/WebKit/public/platform/WebURLLoadTiming.h b/third_party/WebKit/public/platform/WebURLLoadTiming.h index 460489c..164b07e 100644 --- a/third_party/WebKit/public/platform/WebURLLoadTiming.h +++ b/third_party/WebKit/public/platform/WebURLLoadTiming.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebPrivatePtr.h" -namespace WebCore { class ResourceLoadTiming; } +namespace blink { class ResourceLoadTiming; } namespace blink { class WebString; @@ -94,13 +94,13 @@ public: BLINK_PLATFORM_EXPORT void setSSLEnd(double); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebURLLoadTiming(const WTF::PassRefPtr<WebCore::ResourceLoadTiming>&); - BLINK_PLATFORM_EXPORT WebURLLoadTiming& operator=(const WTF::PassRefPtr<WebCore::ResourceLoadTiming>&); - BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::ResourceLoadTiming>() const; + BLINK_PLATFORM_EXPORT WebURLLoadTiming(const WTF::PassRefPtr<blink::ResourceLoadTiming>&); + BLINK_PLATFORM_EXPORT WebURLLoadTiming& operator=(const WTF::PassRefPtr<blink::ResourceLoadTiming>&); + BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::ResourceLoadTiming>() const; #endif private: - WebPrivatePtr<WebCore::ResourceLoadTiming> m_private; + WebPrivatePtr<blink::ResourceLoadTiming> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/platform/WebURLRequest.h b/third_party/WebKit/public/platform/WebURLRequest.h index 0120a8d..b26d470 100644 --- a/third_party/WebKit/public/platform/WebURLRequest.h +++ b/third_party/WebKit/public/platform/WebURLRequest.h @@ -36,7 +36,7 @@ #include "WebReferrerPolicy.h" #if INSIDE_BLINK -namespace WebCore { class ResourceRequest; } +namespace blink { class ResourceRequest; } #endif namespace blink { @@ -252,8 +252,8 @@ public: BLINK_PLATFORM_EXPORT void setPriority(Priority); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebCore::ResourceRequest& toMutableResourceRequest(); - BLINK_PLATFORM_EXPORT const WebCore::ResourceRequest& toResourceRequest() const; + BLINK_PLATFORM_EXPORT blink::ResourceRequest& toMutableResourceRequest(); + BLINK_PLATFORM_EXPORT const blink::ResourceRequest& toResourceRequest() const; #endif // FIXME: Drop these once we replace TargetType upstream. diff --git a/third_party/WebKit/public/platform/WebURLResponse.h b/third_party/WebKit/public/platform/WebURLResponse.h index 37ee12c..20e8316 100644 --- a/third_party/WebKit/public/platform/WebURLResponse.h +++ b/third_party/WebKit/public/platform/WebURLResponse.h @@ -35,7 +35,7 @@ #include "WebPrivateOwnPtr.h" #if INSIDE_BLINK -namespace WebCore { class ResourceResponse; } +namespace blink { class ResourceResponse; } #endif namespace blink { @@ -139,8 +139,8 @@ public: BLINK_PLATFORM_EXPORT void setSecurityInfo(const WebCString&); #if INSIDE_BLINK - BLINK_PLATFORM_EXPORT WebCore::ResourceResponse& toMutableResourceResponse(); - BLINK_PLATFORM_EXPORT const WebCore::ResourceResponse& toResourceResponse() const; + BLINK_PLATFORM_EXPORT blink::ResourceResponse& toMutableResourceResponse(); + BLINK_PLATFORM_EXPORT const blink::ResourceResponse& toResourceResponse() const; #endif // Flag whether this request was served from the disk cache entry. diff --git a/third_party/WebKit/public/platform/WebWorkerRunLoop.h b/third_party/WebKit/public/platform/WebWorkerRunLoop.h index d790a23..2557791 100644 --- a/third_party/WebKit/public/platform/WebWorkerRunLoop.h +++ b/third_party/WebKit/public/platform/WebWorkerRunLoop.h @@ -27,7 +27,7 @@ #include "WebCommon.h" -namespace WebCore { +namespace blink { class WorkerRunLoop; } @@ -47,11 +47,11 @@ public: BLINK_EXPORT bool lessThan(const WebWorkerRunLoop&) const; #if BLINK_IMPLEMENTATION - WebWorkerRunLoop(WebCore::WorkerRunLoop*); + WebWorkerRunLoop(blink::WorkerRunLoop*); #endif private: - WebCore::WorkerRunLoop* m_workerRunLoop; + blink::WorkerRunLoop* m_workerRunLoop; }; inline bool operator==(const WebWorkerRunLoop& a, const WebWorkerRunLoop& b) diff --git a/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h b/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h index a7aa3b8..d58cf79 100644 --- a/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h +++ b/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h @@ -33,7 +33,7 @@ #include "../WebCommon.h" -namespace WebCore { struct FontRenderStyle; } +namespace blink { struct FontRenderStyle; } namespace blink { @@ -52,7 +52,7 @@ struct BLINK_EXPORT WebFontRenderStyle { #if BLINK_IMPLEMENTATION || BLINK_PLATFORM_IMPLEMENTATION // Translates the members of this struct to a FontRenderStyle - void toFontRenderStyle(WebCore::FontRenderStyle*); + void toFontRenderStyle(blink::FontRenderStyle*); #endif void setDefaults(); diff --git a/third_party/WebKit/public/web/WebAXEnums.h b/third_party/WebKit/public/web/WebAXEnums.h index e8880d9..1e7ba68 100644 --- a/third_party/WebKit/public/web/WebAXEnums.h +++ b/third_party/WebKit/public/web/WebAXEnums.h @@ -34,7 +34,7 @@ namespace blink { // Accessibility events sent from Blink to the embedder. -// These values must match WebCore::AXObjectCache::AXNotification values. +// These values must match blink::AXObjectCache::AXNotification values. // Enforced in AssertMatchingEnums.cpp. enum WebAXEvent { WebAXEventActiveDescendantChanged, @@ -68,7 +68,7 @@ enum WebAXEvent { }; // Accessibility roles. -// These values must match WebCore::AccessibilityRole values. +// These values must match blink::AccessibilityRole values. // Enforced in AssertMatchingEnums.cpp. enum WebAXRole { WebAXRoleAlertDialog = 1, diff --git a/third_party/WebKit/public/web/WebAXObject.h b/third_party/WebKit/public/web/WebAXObject.h index c599034..60b4853 100644 --- a/third_party/WebKit/public/web/WebAXObject.h +++ b/third_party/WebKit/public/web/WebAXObject.h @@ -40,7 +40,7 @@ namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebCore { class AXObject; } +namespace blink { class AXObject; } namespace blink { @@ -217,13 +217,13 @@ public: BLINK_EXPORT void scrollToGlobalPoint(const WebPoint&) const; #if BLINK_IMPLEMENTATION - WebAXObject(const WTF::PassRefPtr<WebCore::AXObject>&); - WebAXObject& operator=(const WTF::PassRefPtr<WebCore::AXObject>&); - operator WTF::PassRefPtr<WebCore::AXObject>() const; + WebAXObject(const WTF::PassRefPtr<blink::AXObject>&); + WebAXObject& operator=(const WTF::PassRefPtr<blink::AXObject>&); + operator WTF::PassRefPtr<blink::AXObject>() const; #endif private: - WebPrivatePtr<WebCore::AXObject> m_private; + WebPrivatePtr<blink::AXObject> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebBlob.h b/third_party/WebKit/public/web/WebBlob.h index 3d0d829..c571a8f 100644 --- a/third_party/WebKit/public/web/WebBlob.h +++ b/third_party/WebKit/public/web/WebBlob.h @@ -48,7 +48,7 @@ class Value; template <class T> class Handle; } -namespace WebCore { class Blob; } +namespace blink { class Blob; } namespace blink { @@ -77,12 +77,12 @@ public: BLINK_EXPORT v8::Handle<v8::Value> toV8Value(v8::Handle<v8::Object> creationContext, v8::Isolate*); #if BLINK_IMPLEMENTATION - explicit WebBlob(const PassRefPtrWillBeRawPtr<WebCore::Blob>&); - WebBlob& operator=(const PassRefPtrWillBeRawPtr<WebCore::Blob>&); + explicit WebBlob(const PassRefPtrWillBeRawPtr<blink::Blob>&); + WebBlob& operator=(const PassRefPtrWillBeRawPtr<blink::Blob>&); #endif protected: - WebPrivatePtr<WebCore::Blob> m_private; + WebPrivatePtr<blink::Blob> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebCache.h b/third_party/WebKit/public/web/WebCache.h index 28557da..5bf1178 100644 --- a/third_party/WebKit/public/web/WebCache.h +++ b/third_party/WebKit/public/web/WebCache.h @@ -48,7 +48,7 @@ public: size_t deadSize; }; - // A struct mirroring WebCore::MemoryCache::TypeStatistic. + // A struct mirroring blink::MemoryCache::TypeStatistic. struct ResourceTypeStat { size_t count; size_t size; @@ -56,7 +56,7 @@ public: size_t decodedSize; }; - // A struct mirroring WebCore::MemoryCache::Statistics. + // A struct mirroring blink::MemoryCache::Statistics. struct ResourceTypeStats { ResourceTypeStat images; ResourceTypeStat cssStyleSheets; diff --git a/third_party/WebKit/public/web/WebCachedURLRequest.h b/third_party/WebKit/public/web/WebCachedURLRequest.h index c889171..8092054 100644 --- a/third_party/WebKit/public/web/WebCachedURLRequest.h +++ b/third_party/WebKit/public/web/WebCachedURLRequest.h @@ -35,7 +35,7 @@ #include "../platform/WebPrivateOwnPtr.h" #include "../platform/WebString.h" -namespace WebCore { class FetchRequest; } +namespace blink { class FetchRequest; } namespace blink { @@ -54,14 +54,14 @@ public: BLINK_EXPORT WebString initiatorName() const; #if BLINK_IMPLEMENTATION - explicit WebCachedURLRequest(WebCore::FetchRequest*); + explicit WebCachedURLRequest(blink::FetchRequest*); #endif private: WebCachedURLRequest(const WebCachedURLRequest&); WebCachedURLRequest& operator=(const WebCachedURLRequest&); - WebCore::FetchRequest* m_private; + blink::FetchRequest* m_private; mutable WebPrivateOwnPtr<WrappedResourceRequest> m_resourceRequestWrapper; }; diff --git a/third_party/WebKit/public/web/WebColorSuggestion.h b/third_party/WebKit/public/web/WebColorSuggestion.h index f1b838a..69b38c7 100644 --- a/third_party/WebKit/public/web/WebColorSuggestion.h +++ b/third_party/WebKit/public/web/WebColorSuggestion.h @@ -34,7 +34,7 @@ #include "public/platform/WebColor.h" #include "public/platform/WebString.h" -namespace WebCore { +namespace blink { struct ColorSuggestion; } @@ -45,8 +45,8 @@ struct WebColorSuggestion { WebString label; #if BLINK_IMPLEMENTATION - WebColorSuggestion(const WebCore::ColorSuggestion&); - WebColorSuggestion& operator=(const WebCore::ColorSuggestion&); + WebColorSuggestion(const blink::ColorSuggestion&); + WebColorSuggestion& operator=(const blink::ColorSuggestion&); #endif }; diff --git a/third_party/WebKit/public/web/WebDOMError.h b/third_party/WebKit/public/web/WebDOMError.h index ec7e9c7..9e2adf76 100644 --- a/third_party/WebKit/public/web/WebDOMError.h +++ b/third_party/WebKit/public/web/WebDOMError.h @@ -42,7 +42,7 @@ class Value; template <class T> class Handle; } -namespace WebCore { class DOMError; } +namespace blink { class DOMError; } namespace blink { @@ -69,12 +69,12 @@ public: BLINK_EXPORT v8::Handle<v8::Value> toV8Value(v8::Handle<v8::Object> creationContext, v8::Isolate*); #if BLINK_IMPLEMENTATION - explicit WebDOMError(const PassRefPtrWillBeRawPtr<WebCore::DOMError>&); - WebDOMError& operator=(const PassRefPtrWillBeRawPtr<WebCore::DOMError>&); + explicit WebDOMError(const PassRefPtrWillBeRawPtr<blink::DOMError>&); + WebDOMError& operator=(const PassRefPtrWillBeRawPtr<blink::DOMError>&); #endif protected: - WebPrivatePtr<WebCore::DOMError> m_private; + WebPrivatePtr<blink::DOMError> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebDOMEvent.h b/third_party/WebKit/public/web/WebDOMEvent.h index 2ee4932..78d9ba3 100644 --- a/third_party/WebKit/public/web/WebDOMEvent.h +++ b/third_party/WebKit/public/web/WebDOMEvent.h @@ -36,7 +36,7 @@ #include "../platform/WebString.h" #include "WebNode.h" -namespace WebCore { class Event; } +namespace blink { class Event; } #if BLINK_IMPLEMENTATION namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -92,8 +92,8 @@ public: BLINK_EXPORT bool isXMLHttpRequestProgressEvent() const; #if BLINK_IMPLEMENTATION - WebDOMEvent(const PassRefPtrWillBeRawPtr<WebCore::Event>&); - operator PassRefPtrWillBeRawPtr<WebCore::Event>() const; + WebDOMEvent(const PassRefPtrWillBeRawPtr<blink::Event>&); + operator PassRefPtrWillBeRawPtr<blink::Event>() const; #endif template<typename T> T to() @@ -112,7 +112,7 @@ public: protected: #if BLINK_IMPLEMENTATION - void assign(const PassRefPtrWillBeRawPtr<WebCore::Event>&); + void assign(const PassRefPtrWillBeRawPtr<blink::Event>&); template<typename T> T* unwrap() { @@ -125,7 +125,7 @@ protected: } #endif - WebPrivatePtr<WebCore::Event> m_private; + WebPrivatePtr<blink::Event> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebDOMEventListener.h b/third_party/WebKit/public/web/WebDOMEventListener.h index 7b247d1..5abd2a1 100644 --- a/third_party/WebKit/public/web/WebDOMEventListener.h +++ b/third_party/WebKit/public/web/WebDOMEventListener.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class EventTarget; } +namespace blink { class EventTarget; } #endif namespace blink { @@ -55,8 +55,8 @@ public: #if BLINK_IMPLEMENTATION void notifyEventListenerDeleted(EventListenerWrapper*); - EventListenerWrapper* createEventListenerWrapper(const WebString& eventType, bool useCapture, WebCore::EventTarget*); - EventListenerWrapper* getEventListenerWrapper(const WebString& eventType, bool useCapture, WebCore::EventTarget*); + EventListenerWrapper* createEventListenerWrapper(const WebString& eventType, bool useCapture, blink::EventTarget*); + EventListenerWrapper* getEventListenerWrapper(const WebString& eventType, bool useCapture, blink::EventTarget*); #endif private: diff --git a/third_party/WebKit/public/web/WebDOMFileSystem.h b/third_party/WebKit/public/web/WebDOMFileSystem.h index 6af71cf..e647546 100644 --- a/third_party/WebKit/public/web/WebDOMFileSystem.h +++ b/third_party/WebKit/public/web/WebDOMFileSystem.h @@ -48,7 +48,7 @@ class Value; template <class T> class Handle; } -namespace WebCore { class DOMFileSystem; } +namespace blink { class DOMFileSystem; } namespace blink { @@ -102,12 +102,12 @@ public: bool isNull() const { return m_private.isNull(); } #if BLINK_IMPLEMENTATION - WebDOMFileSystem(WebCore::DOMFileSystem*); - WebDOMFileSystem& operator=(WebCore::DOMFileSystem*); + WebDOMFileSystem(blink::DOMFileSystem*); + WebDOMFileSystem& operator=(blink::DOMFileSystem*); #endif private: - WebPrivatePtr<WebCore::DOMFileSystem> m_private; + WebPrivatePtr<blink::DOMFileSystem> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h b/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h index 7609721..3d35f63 100644 --- a/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h +++ b/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h @@ -43,7 +43,7 @@ class Value; template <class T> class Handle; } -namespace WebCore { class MediaStreamTrack; } +namespace blink { class MediaStreamTrack; } namespace blink { @@ -68,10 +68,10 @@ public: private: #if BLINK_IMPLEMENTATION - WebDOMMediaStreamTrack(PassRefPtrWillBeRawPtr<WebCore::MediaStreamTrack>); + WebDOMMediaStreamTrack(PassRefPtrWillBeRawPtr<blink::MediaStreamTrack>); #endif - WebPrivatePtr<WebCore::MediaStreamTrack> m_private; + WebPrivatePtr<blink::MediaStreamTrack> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebDOMMessageEvent.h b/third_party/WebKit/public/web/WebDOMMessageEvent.h index c220c0e..0d12d96 100644 --- a/third_party/WebKit/public/web/WebDOMMessageEvent.h +++ b/third_party/WebKit/public/web/WebDOMMessageEvent.h @@ -55,7 +55,7 @@ public: BLINK_EXPORT WebMessagePortChannelArray releaseChannels(); #if BLINK_IMPLEMENTATION - explicit WebDOMMessageEvent(const PassRefPtrWillBeRawPtr<WebCore::MessageEvent>& e) : WebDOMEvent(e) { } + explicit WebDOMMessageEvent(const PassRefPtrWillBeRawPtr<blink::MessageEvent>& e) : WebDOMEvent(e) { } #endif }; diff --git a/third_party/WebKit/public/web/WebDOMMouseEvent.h b/third_party/WebKit/public/web/WebDOMMouseEvent.h index a46dfec..46d5020 100644 --- a/third_party/WebKit/public/web/WebDOMMouseEvent.h +++ b/third_party/WebKit/public/web/WebDOMMouseEvent.h @@ -33,7 +33,7 @@ #include "WebDOMEvent.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class Event; } +namespace blink { class Event; } #endif namespace blink { diff --git a/third_party/WebKit/public/web/WebDatabase.h b/third_party/WebKit/public/web/WebDatabase.h index 14973c28..3d1f894 100644 --- a/third_party/WebKit/public/web/WebDatabase.h +++ b/third_party/WebKit/public/web/WebDatabase.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebSecurityOrigin.h" -namespace WebCore { class DatabaseBackendBase; } +namespace blink { class DatabaseBackendBase; } namespace blink { @@ -59,12 +59,12 @@ public: const WebString& originIdentifier, const WebString& databaseName); #if BLINK_IMPLEMENTATION - WebDatabase(const WebCore::DatabaseBackendBase*); + WebDatabase(const blink::DatabaseBackendBase*); #endif private: WebDatabase() { } - const WebCore::DatabaseBackendBase* m_database; + const blink::DatabaseBackendBase* m_database; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebDateTimeSuggestion.h b/third_party/WebKit/public/web/WebDateTimeSuggestion.h index 7bd10b6..b62a38e 100644 --- a/third_party/WebKit/public/web/WebDateTimeSuggestion.h +++ b/third_party/WebKit/public/web/WebDateTimeSuggestion.h @@ -29,7 +29,7 @@ #include "public/platform/WebString.h" #if BLINK_IMPLEMENTATION -namespace WebCore { struct DateTimeSuggestion; } +namespace blink { struct DateTimeSuggestion; } #endif namespace blink { @@ -42,8 +42,8 @@ struct WebDateTimeSuggestion { WebDateTimeSuggestion() { } #if BLINK_IMPLEMENTATION - WebDateTimeSuggestion(const WebCore::DateTimeSuggestion&); - WebDateTimeSuggestion& operator=(const WebCore::DateTimeSuggestion&); + WebDateTimeSuggestion(const blink::DateTimeSuggestion&); + WebDateTimeSuggestion& operator=(const blink::DateTimeSuggestion&); #endif }; diff --git a/third_party/WebKit/public/web/WebDocument.h b/third_party/WebKit/public/web/WebDocument.h index d0f0b6f..1123eb90 100644 --- a/third_party/WebKit/public/web/WebDocument.h +++ b/third_party/WebKit/public/web/WebDocument.h @@ -40,7 +40,7 @@ #include "WebSecurityOrigin.h" #if BLINK_IMPLEMENTATION -namespace WebCore { +namespace blink { class Document; class DocumentType; } @@ -137,9 +137,9 @@ public: BLINK_EXPORT v8::Handle<v8::Value> registerEmbedderCustomElement(const WebString& name, v8::Handle<v8::Value> options, WebExceptionCode&); #if BLINK_IMPLEMENTATION - WebDocument(const PassRefPtrWillBeRawPtr<WebCore::Document>&); - WebDocument& operator=(const PassRefPtrWillBeRawPtr<WebCore::Document>&); - operator PassRefPtrWillBeRawPtr<WebCore::Document>() const; + WebDocument(const PassRefPtrWillBeRawPtr<blink::Document>&); + WebDocument& operator=(const PassRefPtrWillBeRawPtr<blink::Document>&); + operator PassRefPtrWillBeRawPtr<blink::Document>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebDocumentType.h b/third_party/WebKit/public/web/WebDocumentType.h index a23eebd..9ce8f55 100644 --- a/third_party/WebKit/public/web/WebDocumentType.h +++ b/third_party/WebKit/public/web/WebDocumentType.h @@ -34,7 +34,7 @@ #include "WebNode.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class DocumentType; } +namespace blink { class DocumentType; } namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -57,9 +57,9 @@ public: BLINK_EXPORT WebString name() const; #if BLINK_IMPLEMENTATION - WebDocumentType(const PassRefPtrWillBeRawPtr<WebCore::DocumentType>&); - WebDocumentType& operator=(const PassRefPtrWillBeRawPtr<WebCore::DocumentType>&); - operator PassRefPtrWillBeRawPtr<WebCore::DocumentType>() const; + WebDocumentType(const PassRefPtrWillBeRawPtr<blink::DocumentType>&); + WebDocumentType& operator=(const PassRefPtrWillBeRawPtr<blink::DocumentType>&); + operator PassRefPtrWillBeRawPtr<blink::DocumentType>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebElement.h b/third_party/WebKit/public/web/WebElement.h index a8d2414..d520871 100644 --- a/third_party/WebKit/public/web/WebElement.h +++ b/third_party/WebKit/public/web/WebElement.h @@ -35,7 +35,7 @@ #include "WebNode.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class Element; } +namespace blink { class Element; } #endif namespace blink { @@ -85,9 +85,9 @@ struct WebRect; BLINK_EXPORT WebImage imageContents(); #if BLINK_IMPLEMENTATION - WebElement(const PassRefPtrWillBeRawPtr<WebCore::Element>&); - WebElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::Element>&); - operator PassRefPtrWillBeRawPtr<WebCore::Element>() const; + WebElement(const PassRefPtrWillBeRawPtr<blink::Element>&); + WebElement& operator=(const PassRefPtrWillBeRawPtr<blink::Element>&); + operator PassRefPtrWillBeRawPtr<blink::Element>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebElementCollection.h b/third_party/WebKit/public/web/WebElementCollection.h index 28a8ac9..b577023 100644 --- a/third_party/WebKit/public/web/WebElementCollection.h +++ b/third_party/WebKit/public/web/WebElementCollection.h @@ -35,7 +35,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { class HTMLCollection; } +namespace blink { class HTMLCollection; } #if BLINK_IMPLEMENTATION #include "platform/heap/Handle.h" namespace WTF { template <typename T> class PassRefPtr; } @@ -67,12 +67,12 @@ public: BLINK_EXPORT WebElement firstItem() const; #if BLINK_IMPLEMENTATION - WebElementCollection(const PassRefPtrWillBeRawPtr<WebCore::HTMLCollection>&); - WebElementCollection& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLCollection>&); + WebElementCollection(const PassRefPtrWillBeRawPtr<blink::HTMLCollection>&); + WebElementCollection& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLCollection>&); #endif private: - WebPrivatePtr<WebCore::HTMLCollection> m_private; + WebPrivatePtr<blink::HTMLCollection> m_private; mutable unsigned m_current; }; diff --git a/third_party/WebKit/public/web/WebFontDescription.h b/third_party/WebKit/public/web/WebFontDescription.h index b7b29ba..3695993 100644 --- a/third_party/WebKit/public/web/WebFontDescription.h +++ b/third_party/WebKit/public/web/WebFontDescription.h @@ -34,7 +34,7 @@ #include "../platform/WebString.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class FontDescription; } +namespace blink { class FontDescription; } #endif namespace blink { @@ -95,9 +95,9 @@ struct WebFontDescription { short wordSpacing; #if BLINK_IMPLEMENTATION - WebFontDescription(const WebCore::FontDescription&); + WebFontDescription(const blink::FontDescription&); - operator WebCore::FontDescription() const; + operator blink::FontDescription() const; #endif }; diff --git a/third_party/WebKit/public/web/WebFormControlElement.h b/third_party/WebKit/public/web/WebFormControlElement.h index e8862d1..0026b27 100644 --- a/third_party/WebKit/public/web/WebFormControlElement.h +++ b/third_party/WebKit/public/web/WebFormControlElement.h @@ -36,7 +36,7 @@ #include "WebFormElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLFormControlElement; } +namespace blink { class HTMLFormControlElement; } #endif namespace blink { @@ -116,9 +116,9 @@ public: BLINK_EXPORT WebFormElement form() const; #if BLINK_IMPLEMENTATION - WebFormControlElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLFormControlElement>&); - WebFormControlElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLFormControlElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLFormControlElement>() const; + WebFormControlElement(const PassRefPtrWillBeRawPtr<blink::HTMLFormControlElement>&); + WebFormControlElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLFormControlElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLFormControlElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebFormElement.h b/third_party/WebKit/public/web/WebFormElement.h index 3181e82..a3b126c 100644 --- a/third_party/WebKit/public/web/WebFormElement.h +++ b/third_party/WebKit/public/web/WebFormElement.h @@ -35,7 +35,7 @@ #include "WebElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLFormElement; } +namespace blink { class HTMLFormElement; } #endif namespace blink { @@ -81,9 +81,9 @@ namespace blink { BLINK_EXPORT void finishRequestAutocomplete(WebFormElement::AutocompleteResult); #if BLINK_IMPLEMENTATION - WebFormElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLFormElement>&); - WebFormElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLFormElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLFormElement>() const; + WebFormElement(const PassRefPtrWillBeRawPtr<blink::HTMLFormElement>&); + WebFormElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLFormElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLFormElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebFrame.h b/third_party/WebKit/public/web/WebFrame.h index 669b865..e6a61f4 100644 --- a/third_party/WebKit/public/web/WebFrame.h +++ b/third_party/WebKit/public/web/WebFrame.h @@ -46,7 +46,7 @@ struct NPObject; #if BLINK_IMPLEMENTATION -namespace WebCore { class Frame; } +namespace blink { class Frame; } #endif namespace v8 { @@ -674,7 +674,7 @@ public: virtual WebString layerTreeAsText(bool showDebugInfo = false) const = 0; #if BLINK_IMPLEMENTATION - static WebFrame* fromFrame(WebCore::Frame*); + static WebFrame* fromFrame(blink::Frame*); #endif protected: @@ -695,7 +695,7 @@ private: }; #if BLINK_IMPLEMENTATION -WebCore::Frame* toWebCoreFrame(const WebFrame*); +blink::Frame* toWebCoreFrame(const WebFrame*); #endif } // namespace blink diff --git a/third_party/WebKit/public/web/WebGeolocationController.h b/third_party/WebKit/public/web/WebGeolocationController.h index 4a4df54..04d5be8 100644 --- a/third_party/WebKit/public/web/WebGeolocationController.h +++ b/third_party/WebKit/public/web/WebGeolocationController.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebNonCopyable.h" -namespace WebCore { class GeolocationController; } +namespace blink { class GeolocationController; } namespace blink { @@ -44,12 +44,12 @@ public: BLINK_EXPORT void errorOccurred(const WebGeolocationError&); #if BLINK_IMPLEMENTATION - WebGeolocationController(WebCore::GeolocationController* c) + WebGeolocationController(blink::GeolocationController* c) : m_private(c) { } - WebCore::GeolocationController* controller() const { return m_private; } + blink::GeolocationController* controller() const { return m_private; } #endif private: @@ -57,7 +57,7 @@ private: // can be created by the consumers of Chromium WebKit. WebGeolocationController(); - WebCore::GeolocationController* m_private; + blink::GeolocationController* m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebGeolocationError.h b/third_party/WebKit/public/web/WebGeolocationError.h index 6e25662..f765a52 100644 --- a/third_party/WebKit/public/web/WebGeolocationError.h +++ b/third_party/WebKit/public/web/WebGeolocationError.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { class GeolocationError; } +namespace blink { class GeolocationError; } namespace blink { @@ -51,13 +51,13 @@ public: BLINK_EXPORT void reset(); #if BLINK_IMPLEMENTATION - WebGeolocationError(WebCore::GeolocationError*); - WebGeolocationError& operator=(WebCore::GeolocationError*); - operator WebCore::GeolocationError*() const; + WebGeolocationError(blink::GeolocationError*); + WebGeolocationError& operator=(blink::GeolocationError*); + operator blink::GeolocationError*() const; #endif private: - WebPrivatePtr<WebCore::GeolocationError> m_private; + WebPrivatePtr<blink::GeolocationError> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h index 38ed97a..da3e02d 100644 --- a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h +++ b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { +namespace blink { class Geolocation; } @@ -48,14 +48,14 @@ public: BLINK_EXPORT void setIsAllowed(bool); #if BLINK_IMPLEMENTATION - WebGeolocationPermissionRequest(WebCore::Geolocation*); - WebCore::Geolocation* geolocation() const { return m_private.get(); } + WebGeolocationPermissionRequest(blink::Geolocation*); + blink::Geolocation* geolocation() const { return m_private.get(); } #endif private: BLINK_EXPORT void reset(); - WebPrivatePtr<WebCore::Geolocation> m_private; + WebPrivatePtr<blink::Geolocation> m_private; }; } diff --git a/third_party/WebKit/public/web/WebGeolocationPosition.h b/third_party/WebKit/public/web/WebGeolocationPosition.h index 43ad42a..b2ef457 100644 --- a/third_party/WebKit/public/web/WebGeolocationPosition.h +++ b/third_party/WebKit/public/web/WebGeolocationPosition.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { class GeolocationPosition; } +namespace blink { class GeolocationPosition; } namespace blink { @@ -48,13 +48,13 @@ public: BLINK_EXPORT void reset(); #if BLINK_IMPLEMENTATION - WebGeolocationPosition(WebCore::GeolocationPosition*); - WebGeolocationPosition& operator=(WebCore::GeolocationPosition*); - operator WebCore::GeolocationPosition*() const; + WebGeolocationPosition(blink::GeolocationPosition*); + WebGeolocationPosition& operator=(blink::GeolocationPosition*); + operator blink::GeolocationPosition*() const; #endif private: - WebPrivatePtr<WebCore::GeolocationPosition> m_private; + WebPrivatePtr<blink::GeolocationPosition> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebHistoryItem.h b/third_party/WebKit/public/web/WebHistoryItem.h index a35f6eb..3ad3300 100644 --- a/third_party/WebKit/public/web/WebHistoryItem.h +++ b/third_party/WebKit/public/web/WebHistoryItem.h @@ -35,7 +35,7 @@ #include "../platform/WebPrivatePtr.h" #include "../platform/WebReferrerPolicy.h" -namespace WebCore { class HistoryItem; } +namespace blink { class HistoryItem; } namespace blink { class WebHTTPBody; @@ -113,13 +113,13 @@ public: BLINK_EXPORT WebVector<WebString> getReferencedFilePaths() const; #if BLINK_IMPLEMENTATION - WebHistoryItem(const WTF::PassRefPtr<WebCore::HistoryItem>&); - WebHistoryItem& operator=(const WTF::PassRefPtr<WebCore::HistoryItem>&); - operator WTF::PassRefPtr<WebCore::HistoryItem>() const; + WebHistoryItem(const WTF::PassRefPtr<blink::HistoryItem>&); + WebHistoryItem& operator=(const WTF::PassRefPtr<blink::HistoryItem>&); + operator WTF::PassRefPtr<blink::HistoryItem>() const; #endif private: - WebPrivatePtr<WebCore::HistoryItem> m_private; + WebPrivatePtr<blink::HistoryItem> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebHitTestResult.h b/third_party/WebKit/public/web/WebHitTestResult.h index 878d71b..b34e270 100644 --- a/third_party/WebKit/public/web/WebHitTestResult.h +++ b/third_party/WebKit/public/web/WebHitTestResult.h @@ -28,7 +28,7 @@ #include "../platform/WebPrivateOwnPtr.h" -namespace WebCore { +namespace blink { class HitTestResult; } @@ -73,8 +73,8 @@ public: BLINK_EXPORT bool isContentEditable() const; #if BLINK_IMPLEMENTATION - WebHitTestResult(const WebCore::HitTestResult&); - WebHitTestResult& operator=(const WebCore::HitTestResult&); + WebHitTestResult(const blink::HitTestResult&); + WebHitTestResult& operator=(const blink::HitTestResult&); #endif protected: diff --git a/third_party/WebKit/public/web/WebIconURL.h b/third_party/WebKit/public/web/WebIconURL.h index 98450d9..9e04e62 100644 --- a/third_party/WebKit/public/web/WebIconURL.h +++ b/third_party/WebKit/public/web/WebIconURL.h @@ -76,7 +76,7 @@ public: } #if BLINK_IMPLEMENTATION - WebIconURL(const WebCore::IconURL& iconURL) + WebIconURL(const blink::IconURL& iconURL) : m_iconType(static_cast<Type>(iconURL.m_iconType)) , m_iconURL(iconURL.m_iconURL) , m_sizes(iconURL.m_sizes) diff --git a/third_party/WebKit/public/web/WebImageDecoder.h b/third_party/WebKit/public/web/WebImageDecoder.h index 724ba85..d668e4a 100644 --- a/third_party/WebKit/public/web/WebImageDecoder.h +++ b/third_party/WebKit/public/web/WebImageDecoder.h @@ -35,11 +35,11 @@ #include "../platform/WebImage.h" #include "../platform/WebNonCopyable.h" -namespace WebCore { class ImageDecoder; } +namespace blink { class ImageDecoder; } namespace blink { -typedef WebCore::ImageDecoder WebImageDecoderPrivate; +typedef blink::ImageDecoder WebImageDecoderPrivate; class WebData; class WebImageDecoder : public WebNonCopyable { diff --git a/third_party/WebKit/public/web/WebInputElement.h b/third_party/WebKit/public/web/WebInputElement.h index da5c169..ff0d813 100644 --- a/third_party/WebKit/public/web/WebInputElement.h +++ b/third_party/WebKit/public/web/WebInputElement.h @@ -34,7 +34,7 @@ #include "WebFormControlElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLInputElement; } +namespace blink { class HTMLInputElement; } #endif namespace blink { @@ -88,9 +88,9 @@ namespace blink { BLINK_EXPORT void setShouldRevealPassword(bool value); #if BLINK_IMPLEMENTATION - WebInputElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLInputElement>&); - WebInputElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLInputElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLInputElement>() const; + WebInputElement(const PassRefPtrWillBeRawPtr<blink::HTMLInputElement>&); + WebInputElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLInputElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLInputElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebLabelElement.h b/third_party/WebKit/public/web/WebLabelElement.h index 8efa52d..975d3e1 100644 --- a/third_party/WebKit/public/web/WebLabelElement.h +++ b/third_party/WebKit/public/web/WebLabelElement.h @@ -34,7 +34,7 @@ #include "WebElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLLabelElement; } +namespace blink { class HTMLLabelElement; } namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -57,9 +57,9 @@ public: BLINK_EXPORT WebElement correspondingControl(); #if BLINK_IMPLEMENTATION - WebLabelElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLLabelElement>&); - WebLabelElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLLabelElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLLabelElement>() const; + WebLabelElement(const PassRefPtrWillBeRawPtr<blink::HTMLLabelElement>&); + WebLabelElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLLabelElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLLabelElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebMIDIClientMock.h b/third_party/WebKit/public/web/WebMIDIClientMock.h index 0ed5833..34b62a8 100644 --- a/third_party/WebKit/public/web/WebMIDIClientMock.h +++ b/third_party/WebKit/public/web/WebMIDIClientMock.h @@ -35,7 +35,7 @@ #include "../platform/WebPrivateOwnPtr.h" #include "WebMIDIClient.h" -namespace WebCore { +namespace blink { class MIDIClientMock; } @@ -56,7 +56,7 @@ public: private: BLINK_EXPORT void reset(); - WebPrivateOwnPtr<WebCore::MIDIClientMock> m_clientMock; + WebPrivateOwnPtr<blink::MIDIClientMock> m_clientMock; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h index b863fe3..7d37cc8 100644 --- a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h +++ b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebCore { +namespace blink { class MIDIAccessInitializer; } @@ -56,13 +56,13 @@ public: BLINK_EXPORT bool equals(const WebMIDIPermissionRequest&) const; #if BLINK_IMPLEMENTATION - explicit WebMIDIPermissionRequest(WebCore::MIDIAccessInitializer*); + explicit WebMIDIPermissionRequest(blink::MIDIAccessInitializer*); - WebCore::MIDIAccessInitializer* midiAccessInitializer() const { return m_initializer; } + blink::MIDIAccessInitializer* midiAccessInitializer() const { return m_initializer; } #endif private: - WebCore::MIDIAccessInitializer* m_initializer; + blink::MIDIAccessInitializer* m_initializer; }; inline bool operator==(const WebMIDIPermissionRequest& a, const WebMIDIPermissionRequest& b) diff --git a/third_party/WebKit/public/web/WebMediaDevicesRequest.h b/third_party/WebKit/public/web/WebMediaDevicesRequest.h index ddcf4cf..7dc5781 100644 --- a/third_party/WebKit/public/web/WebMediaDevicesRequest.h +++ b/third_party/WebKit/public/web/WebMediaDevicesRequest.h @@ -31,7 +31,7 @@ #include "public/platform/WebPrivatePtr.h" #include "public/platform/WebString.h" -namespace WebCore { +namespace blink { class MediaDevicesRequest; } @@ -63,12 +63,12 @@ public: BLINK_EXPORT void requestSucceeded(WebVector<WebMediaDeviceInfo>); #if BLINK_IMPLEMENTATION - WebMediaDevicesRequest(WebCore::MediaDevicesRequest*); - operator WebCore::MediaDevicesRequest*() const; + WebMediaDevicesRequest(blink::MediaDevicesRequest*); + operator blink::MediaDevicesRequest*() const; #endif private: - WebPrivatePtr<WebCore::MediaDevicesRequest> m_private; + WebPrivatePtr<blink::MediaDevicesRequest> m_private; }; inline bool operator==(const WebMediaDevicesRequest& a, const WebMediaDevicesRequest& b) diff --git a/third_party/WebKit/public/web/WebNode.h b/third_party/WebKit/public/web/WebNode.h index 35b42e8..f449867 100644 --- a/third_party/WebKit/public/web/WebNode.h +++ b/third_party/WebKit/public/web/WebNode.h @@ -36,7 +36,7 @@ #include "../platform/WebString.h" #include "WebExceptionCode.h" -namespace WebCore { class Node; } +namespace blink { class Node; } namespace blink { class WebDOMEvent; @@ -51,7 +51,7 @@ class WebPluginContainer; // Provides access to some properties of a DOM node. // Note that the class design requires that neither this class nor any of its subclasses have any virtual // methods (other than the destructor), so that it is possible to safely static_cast an instance of one -// class to the appropriate subclass based on the actual type of the wrapped WebCore::Node. For the same +// class to the appropriate subclass based on the actual type of the wrapped blink::Node. For the same // reason, subclasses must not add any additional data members. class WebNode { public: @@ -142,9 +142,9 @@ public: } #if BLINK_IMPLEMENTATION - WebNode(const PassRefPtrWillBeRawPtr<WebCore::Node>&); - WebNode& operator=(const PassRefPtrWillBeRawPtr<WebCore::Node>&); - operator PassRefPtrWillBeRawPtr<WebCore::Node>() const; + WebNode(const PassRefPtrWillBeRawPtr<blink::Node>&); + WebNode& operator=(const PassRefPtrWillBeRawPtr<blink::Node>&); + operator PassRefPtrWillBeRawPtr<blink::Node>() const; #endif #if BLINK_IMPLEMENTATION @@ -160,7 +160,7 @@ public: #endif protected: - WebPrivatePtr<WebCore::Node> m_private; + WebPrivatePtr<blink::Node> m_private; }; inline bool operator==(const WebNode& a, const WebNode& b) diff --git a/third_party/WebKit/public/web/WebNodeList.h b/third_party/WebKit/public/web/WebNodeList.h index 96ad0ad..4d8131c 100644 --- a/third_party/WebKit/public/web/WebNodeList.h +++ b/third_party/WebKit/public/web/WebNodeList.h @@ -34,7 +34,7 @@ #include "public/platform/WebCommon.h" #include "public/platform/WebPrivatePtr.h" -namespace WebCore { class NodeList; } +namespace blink { class NodeList; } #if BLINK_IMPLEMENTATION #include "platform/heap/Handle.h" namespace WTF { template <typename T> class PassRefPtr; } @@ -63,12 +63,12 @@ public: BLINK_EXPORT WebNode item(size_t) const; #if BLINK_IMPLEMENTATION - WebNodeList(const PassRefPtrWillBeRawPtr<WebCore::NodeList>&); - WebNodeList& operator=(const PassRefPtrWillBeRawPtr<WebCore::NodeList>&); + WebNodeList(const PassRefPtrWillBeRawPtr<blink::NodeList>&); + WebNodeList& operator=(const PassRefPtrWillBeRawPtr<blink::NodeList>&); #endif private: - WebPrivatePtr<WebCore::NodeList> m_private; + WebPrivatePtr<blink::NodeList> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebNotification.h b/third_party/WebKit/public/web/WebNotification.h index 1b9587a..d2b804e 100644 --- a/third_party/WebKit/public/web/WebNotification.h +++ b/third_party/WebKit/public/web/WebNotification.h @@ -36,7 +36,7 @@ #include "../platform/WebString.h" #include "WebTextDirection.h" -namespace WebCore { class Notification; } +namespace blink { class Notification; } #if BLINK_IMPLEMENTATION namespace WTF { template <typename T> class PassRefPtr; } @@ -93,12 +93,12 @@ public: void dispatchDisplayEvent() { dispatchShowEvent(); } #if BLINK_IMPLEMENTATION - WebNotification(WebCore::Notification*); - WebNotification& operator=(WebCore::Notification*); + WebNotification(blink::Notification*); + WebNotification& operator=(blink::Notification*); #endif private: - WebPrivatePtr<WebCore::Notification> m_private; + WebPrivatePtr<blink::Notification> m_private; }; inline bool operator==(const WebNotification& a, const WebNotification& b) diff --git a/third_party/WebKit/public/web/WebOptionElement.h b/third_party/WebKit/public/web/WebOptionElement.h index ec3bf76..7a336ae 100644 --- a/third_party/WebKit/public/web/WebOptionElement.h +++ b/third_party/WebKit/public/web/WebOptionElement.h @@ -35,7 +35,7 @@ #include "WebElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLOptionElement; } +namespace blink { class HTMLOptionElement; } #endif namespace blink { @@ -62,9 +62,9 @@ public: BLINK_EXPORT bool isEnabled() const; #if BLINK_IMPLEMENTATION - WebOptionElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLOptionElement>&); - WebOptionElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLOptionElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLOptionElement>() const; + WebOptionElement(const PassRefPtrWillBeRawPtr<blink::HTMLOptionElement>&); + WebOptionElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLOptionElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLOptionElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebPerformance.h b/third_party/WebKit/public/web/WebPerformance.h index a858f35..48d1712 100644 --- a/third_party/WebKit/public/web/WebPerformance.h +++ b/third_party/WebKit/public/web/WebPerformance.h @@ -39,7 +39,7 @@ #include "platform/heap/Handle.h" #endif -namespace WebCore { class Performance; } +namespace blink { class Performance; } namespace blink { @@ -86,12 +86,12 @@ public: BLINK_EXPORT double loadEventEnd() const; #if BLINK_IMPLEMENTATION - WebPerformance(const PassRefPtrWillBeRawPtr<WebCore::Performance>&); - WebPerformance& operator=(const PassRefPtrWillBeRawPtr<WebCore::Performance>&); + WebPerformance(const PassRefPtrWillBeRawPtr<blink::Performance>&); + WebPerformance& operator=(const PassRefPtrWillBeRawPtr<blink::Performance>&); #endif private: - WebPrivatePtr<WebCore::Performance> m_private; + WebPrivatePtr<blink::Performance> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebPluginDocument.h b/third_party/WebKit/public/web/WebPluginDocument.h index 27eb142..5954b12 100644 --- a/third_party/WebKit/public/web/WebPluginDocument.h +++ b/third_party/WebKit/public/web/WebPluginDocument.h @@ -34,7 +34,7 @@ #include "WebDocument.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class PluginDocument; } +namespace blink { class PluginDocument; } #endif namespace blink { @@ -56,9 +56,9 @@ public: BLINK_EXPORT WebPlugin* plugin(); #if BLINK_IMPLEMENTATION - WebPluginDocument(const PassRefPtrWillBeRawPtr<WebCore::PluginDocument>&); - WebPluginDocument& operator=(const PassRefPtrWillBeRawPtr<WebCore::PluginDocument>&); - operator PassRefPtrWillBeRawPtr<WebCore::PluginDocument>() const; + WebPluginDocument(const PassRefPtrWillBeRawPtr<blink::PluginDocument>&); + WebPluginDocument& operator=(const PassRefPtrWillBeRawPtr<blink::PluginDocument>&); + operator PassRefPtrWillBeRawPtr<blink::PluginDocument>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebRange.h b/third_party/WebKit/public/web/WebRange.h index cd318a1..cef7123 100644 --- a/third_party/WebKit/public/web/WebRange.h +++ b/third_party/WebKit/public/web/WebRange.h @@ -36,7 +36,7 @@ #include "public/platform/WebPrivatePtr.h" #include "public/platform/WebVector.h" -namespace WebCore { class Range; } +namespace blink { class Range; } namespace blink { @@ -77,12 +77,12 @@ public: BLINK_EXPORT WebVector<WebFloatQuad> textQuads() const; #if BLINK_IMPLEMENTATION - WebRange(const PassRefPtrWillBeRawPtr<WebCore::Range>&); - operator PassRefPtrWillBeRawPtr<WebCore::Range>() const; + WebRange(const PassRefPtrWillBeRawPtr<blink::Range>&); + operator PassRefPtrWillBeRawPtr<blink::Range>() const; #endif private: - WebPrivatePtr<WebCore::Range> m_private; + WebPrivatePtr<blink::Range> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebScopedUserGesture.h b/third_party/WebKit/public/web/WebScopedUserGesture.h index f829834..d27374a 100644 --- a/third_party/WebKit/public/web/WebScopedUserGesture.h +++ b/third_party/WebKit/public/web/WebScopedUserGesture.h @@ -33,7 +33,7 @@ #include "../platform/WebPrivateOwnPtr.h" -namespace WebCore { +namespace blink { class UserGestureIndicator; } @@ -65,7 +65,7 @@ private: BLINK_EXPORT void initializeWithToken(const WebUserGestureToken&); BLINK_EXPORT void reset(); - WebPrivateOwnPtr<WebCore::UserGestureIndicator> m_indicator; + WebPrivateOwnPtr<blink::UserGestureIndicator> m_indicator; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h b/third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h index f3f07b9..f3cc4af 100644 --- a/third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h +++ b/third_party/WebKit/public/web/WebScopedWindowFocusAllowedIndicator.h @@ -33,7 +33,7 @@ #include "public/platform/WebPrivateOwnPtr.h" -namespace WebCore { +namespace blink { class WindowFocusAllowedIndicator; } @@ -48,7 +48,7 @@ private: BLINK_EXPORT void initialize(); BLINK_EXPORT void reset(); - WebPrivateOwnPtr<WebCore::WindowFocusAllowedIndicator> m_indicator; + WebPrivateOwnPtr<blink::WindowFocusAllowedIndicator> m_indicator; }; } diff --git a/third_party/WebKit/public/web/WebSecurityOrigin.h b/third_party/WebKit/public/web/WebSecurityOrigin.h index b33f09d..c4c0c05 100644 --- a/third_party/WebKit/public/web/WebSecurityOrigin.h +++ b/third_party/WebKit/public/web/WebSecurityOrigin.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class SecurityOrigin; } +namespace blink { class SecurityOrigin; } namespace WTF { template <typename T> class PassRefPtr; } #endif @@ -100,10 +100,10 @@ public: BLINK_EXPORT void grantLoadLocalResources() const; #if BLINK_IMPLEMENTATION - WebSecurityOrigin(const WTF::PassRefPtr<WebCore::SecurityOrigin>&); - WebSecurityOrigin& operator=(const WTF::PassRefPtr<WebCore::SecurityOrigin>&); - operator WTF::PassRefPtr<WebCore::SecurityOrigin>() const; - WebCore::SecurityOrigin* get() const; + WebSecurityOrigin(const WTF::PassRefPtr<blink::SecurityOrigin>&); + WebSecurityOrigin& operator=(const WTF::PassRefPtr<blink::SecurityOrigin>&); + operator WTF::PassRefPtr<blink::SecurityOrigin>() const; + blink::SecurityOrigin* get() const; #endif private: diff --git a/third_party/WebKit/public/web/WebSelectElement.h b/third_party/WebKit/public/web/WebSelectElement.h index 6fbe0c2..05651d1 100644 --- a/third_party/WebKit/public/web/WebSelectElement.h +++ b/third_party/WebKit/public/web/WebSelectElement.h @@ -36,7 +36,7 @@ #include "WebOptionElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLSelectElement; } +namespace blink { class HTMLSelectElement; } #endif namespace blink { @@ -57,9 +57,9 @@ public: BLINK_EXPORT WebVector<WebElement> listItems() const; #if BLINK_IMPLEMENTATION - WebSelectElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLSelectElement>&); - WebSelectElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLSelectElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLSelectElement>() const; + WebSelectElement(const PassRefPtrWillBeRawPtr<blink::HTMLSelectElement>&); + WebSelectElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLSelectElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLSelectElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebSerializedScriptValue.h b/third_party/WebKit/public/web/WebSerializedScriptValue.h index b111ef0..68ecb8a 100644 --- a/third_party/WebKit/public/web/WebSerializedScriptValue.h +++ b/third_party/WebKit/public/web/WebSerializedScriptValue.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { class SerializedScriptValue; } +namespace blink { class SerializedScriptValue; } namespace v8 { class Value; @@ -76,13 +76,13 @@ public: BLINK_EXPORT v8::Handle<v8::Value> deserialize(); #if BLINK_IMPLEMENTATION - WebSerializedScriptValue(const WTF::PassRefPtr<WebCore::SerializedScriptValue>&); - WebSerializedScriptValue& operator=(const WTF::PassRefPtr<WebCore::SerializedScriptValue>&); - operator WTF::PassRefPtr<WebCore::SerializedScriptValue>() const; + WebSerializedScriptValue(const WTF::PassRefPtr<blink::SerializedScriptValue>&); + WebSerializedScriptValue& operator=(const WTF::PassRefPtr<blink::SerializedScriptValue>&); + operator WTF::PassRefPtr<blink::SerializedScriptValue>() const; #endif private: - WebPrivatePtr<WebCore::SerializedScriptValue> m_private; + WebPrivatePtr<blink::SerializedScriptValue> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebSharedWorker.h b/third_party/WebKit/public/web/WebSharedWorker.h index 27365ad..8014fda 100644 --- a/third_party/WebKit/public/web/WebSharedWorker.h +++ b/third_party/WebKit/public/web/WebSharedWorker.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebContentSecurityPolicy.h" -namespace WebCore { +namespace blink { class ScriptExecutionContext; } diff --git a/third_party/WebKit/public/web/WebSocket.h b/third_party/WebKit/public/web/WebSocket.h index 01755bf..efa9a35 100644 --- a/third_party/WebKit/public/web/WebSocket.h +++ b/third_party/WebKit/public/web/WebSocket.h @@ -35,7 +35,7 @@ #include "../platform/WebPrivatePtr.h" #include "../platform/WebString.h" -namespace WebCore { class WebSocketChannel; } +namespace blink { class WebSocketChannel; } namespace blink { diff --git a/third_party/WebKit/public/web/WebSpeechGrammar.h b/third_party/WebKit/public/web/WebSpeechGrammar.h index f0c4cd2..e492f8a 100644 --- a/third_party/WebKit/public/web/WebSpeechGrammar.h +++ b/third_party/WebKit/public/web/WebSpeechGrammar.h @@ -30,7 +30,7 @@ #include "../platform/WebPrivatePtr.h" #include "../platform/WebURL.h" -namespace WebCore { +namespace blink { class SpeechGrammar; } @@ -49,12 +49,12 @@ public: BLINK_EXPORT void assign(const WebSpeechGrammar&); #if BLINK_IMPLEMENTATION - explicit WebSpeechGrammar(WebCore::SpeechGrammar*); - WebSpeechGrammar& operator=(WebCore::SpeechGrammar*); + explicit WebSpeechGrammar(blink::SpeechGrammar*); + WebSpeechGrammar& operator=(blink::SpeechGrammar*); #endif private: - WebPrivatePtr<WebCore::SpeechGrammar> m_private; + WebPrivatePtr<blink::SpeechGrammar> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h index c56a1be..40503c0 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h +++ b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPrivatePtr.h" -namespace WebCore { +namespace blink { class SpeechRecognition; } @@ -62,13 +62,13 @@ public: BLINK_EXPORT bool lessThan(const WebSpeechRecognitionHandle&) const; #if BLINK_IMPLEMENTATION - explicit WebSpeechRecognitionHandle(WebCore::SpeechRecognition*); - WebSpeechRecognitionHandle& operator=(WebCore::SpeechRecognition*); - operator WebCore::SpeechRecognition*() const; + explicit WebSpeechRecognitionHandle(blink::SpeechRecognition*); + WebSpeechRecognitionHandle& operator=(blink::SpeechRecognition*); + operator blink::SpeechRecognition*() const; #endif private: - WebPrivatePtr<WebCore::SpeechRecognition> m_private; + WebPrivatePtr<blink::SpeechRecognition> m_private; }; inline bool operator==(const WebSpeechRecognitionHandle& a, const WebSpeechRecognitionHandle& b) diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h index d34e00b..683f71d 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h +++ b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h @@ -31,7 +31,7 @@ #include "../platform/WebString.h" #include "../platform/WebVector.h" -namespace WebCore { +namespace blink { class SpeechRecognitionResult; } @@ -48,11 +48,11 @@ public: BLINK_EXPORT void reset(); #if BLINK_IMPLEMENTATION - operator WebCore::SpeechRecognitionResult*() const; + operator blink::SpeechRecognitionResult*() const; #endif private: - WebPrivatePtr<WebCore::SpeechRecognitionResult> m_private; + WebPrivatePtr<blink::SpeechRecognitionResult> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebSurroundingText.h b/third_party/WebKit/public/web/WebSurroundingText.h index b5abbc8..fa894e3 100644 --- a/third_party/WebKit/public/web/WebSurroundingText.h +++ b/third_party/WebKit/public/web/WebSurroundingText.h @@ -30,7 +30,7 @@ #include "WebNode.h" #include "WebRange.h" -namespace WebCore { +namespace blink { class SurroundingText; } @@ -82,7 +82,7 @@ public: BLINK_EXPORT WebRange rangeFromContentOffsets(size_t startOffsetInContent, size_t endOffsetInContent); protected: - WebPrivateOwnPtr<WebCore::SurroundingText> m_private; + WebPrivateOwnPtr<blink::SurroundingText> m_private; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebTextAreaElement.h b/third_party/WebKit/public/web/WebTextAreaElement.h index 489a308..ed324f7 100644 --- a/third_party/WebKit/public/web/WebTextAreaElement.h +++ b/third_party/WebKit/public/web/WebTextAreaElement.h @@ -34,7 +34,7 @@ #include "WebFormControlElement.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class HTMLTextAreaElement; } +namespace blink { class HTMLTextAreaElement; } #endif namespace blink { @@ -53,9 +53,9 @@ public: void assign(const WebTextAreaElement& element) { WebFormControlElement::assign(element); } #if BLINK_IMPLEMENTATION - WebTextAreaElement(const PassRefPtrWillBeRawPtr<WebCore::HTMLTextAreaElement>&); - WebTextAreaElement& operator=(const PassRefPtrWillBeRawPtr<WebCore::HTMLTextAreaElement>&); - operator PassRefPtrWillBeRawPtr<WebCore::HTMLTextAreaElement>() const; + WebTextAreaElement(const PassRefPtrWillBeRawPtr<blink::HTMLTextAreaElement>&); + WebTextAreaElement& operator=(const PassRefPtrWillBeRawPtr<blink::HTMLTextAreaElement>&); + operator PassRefPtrWillBeRawPtr<blink::HTMLTextAreaElement>() const; #endif }; diff --git a/third_party/WebKit/public/web/WebTextCheckingResult.h b/third_party/WebKit/public/web/WebTextCheckingResult.h index 088ab74..f1f6c86 100644 --- a/third_party/WebKit/public/web/WebTextCheckingResult.h +++ b/third_party/WebKit/public/web/WebTextCheckingResult.h @@ -35,7 +35,7 @@ #include "../platform/WebString.h" #include "WebTextDecorationType.h" -namespace WebCore { +namespace blink { struct TextCheckingResult; } @@ -61,7 +61,7 @@ struct WebTextCheckingResult { } #if BLINK_IMPLEMENTATION - operator WebCore::TextCheckingResult() const; + operator blink::TextCheckingResult() const; #endif WebTextDecorationType decoration; diff --git a/third_party/WebKit/public/web/WebTextRun.h b/third_party/WebKit/public/web/WebTextRun.h index 64504ef..ca5d6a8 100644 --- a/third_party/WebKit/public/web/WebTextRun.h +++ b/third_party/WebKit/public/web/WebTextRun.h @@ -34,7 +34,7 @@ #include "../platform/WebString.h" #if BLINK_IMPLEMENTATION -namespace WebCore { class TextRun; } +namespace blink { class TextRun; } #endif namespace blink { @@ -57,9 +57,9 @@ struct WebTextRun { bool directionalOverride; #if BLINK_IMPLEMENTATION - // The resulting WebCore::TextRun will refer to the text in this + // The resulting blink::TextRun will refer to the text in this // struct, so "this" must outlive the WebCore text run. - operator WebCore::TextRun() const; + operator blink::TextRun() const; #endif }; diff --git a/third_party/WebKit/public/web/WebUserGestureToken.h b/third_party/WebKit/public/web/WebUserGestureToken.h index 4251dcd..909dace 100644 --- a/third_party/WebKit/public/web/WebUserGestureToken.h +++ b/third_party/WebKit/public/web/WebUserGestureToken.h @@ -33,7 +33,7 @@ #include "../platform/WebPrivatePtr.h" -namespace WebCore { +namespace blink { class UserGestureToken; } @@ -59,15 +59,15 @@ public: bool isNull() const { return m_token.isNull(); } #if BLINK_IMPLEMENTATION - explicit WebUserGestureToken(PassRefPtr<WebCore::UserGestureToken>); - operator PassRefPtr<WebCore::UserGestureToken>() const; + explicit WebUserGestureToken(PassRefPtr<blink::UserGestureToken>); + operator PassRefPtr<blink::UserGestureToken>() const; #endif private: BLINK_EXPORT void assign(const WebUserGestureToken&); BLINK_EXPORT void reset(); - WebPrivatePtr<WebCore::UserGestureToken> m_token; + WebPrivatePtr<blink::UserGestureToken> m_token; }; } // namespace blink diff --git a/third_party/WebKit/public/web/WebUserMediaRequest.h b/third_party/WebKit/public/web/WebUserMediaRequest.h index 2256119..1fa355b 100644 --- a/third_party/WebKit/public/web/WebUserMediaRequest.h +++ b/third_party/WebKit/public/web/WebUserMediaRequest.h @@ -36,7 +36,7 @@ #include "public/platform/WebPrivatePtr.h" #include "public/platform/WebString.h" -namespace WebCore { +namespace blink { class UserMediaRequest; } @@ -82,12 +82,12 @@ public: BLINK_EXPORT void requestFailed(const WebString& description = WebString()) { requestDenied(description); } #if BLINK_IMPLEMENTATION - WebUserMediaRequest(WebCore::UserMediaRequest*); - operator WebCore::UserMediaRequest*() const; + WebUserMediaRequest(blink::UserMediaRequest*); + operator blink::UserMediaRequest*() const; #endif private: - WebPrivatePtr<WebCore::UserMediaRequest> m_private; + WebPrivatePtr<blink::UserMediaRequest> m_private; }; inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& b) diff --git a/third_party/WebKit/public/web/WebWindowFeatures.h b/third_party/WebKit/public/web/WebWindowFeatures.h index 6490b3f..7a67a6b 100644 --- a/third_party/WebKit/public/web/WebWindowFeatures.h +++ b/third_party/WebKit/public/web/WebWindowFeatures.h @@ -84,7 +84,7 @@ struct WebWindowFeatures { #if BLINK_IMPLEMENTATION - WebWindowFeatures(const WebCore::WindowFeatures& f) + WebWindowFeatures(const blink::WindowFeatures& f) : x(f.x) , xSet(f.xSet) , y(f.y) @@ -105,9 +105,9 @@ struct WebWindowFeatures { { } - operator WebCore::WindowFeatures() const + operator blink::WindowFeatures() const { - WebCore::WindowFeatures result; + blink::WindowFeatures result; result.x = x; result.xSet = xSet; result.y = y; |
