diff options
1096 files changed, 3204 insertions, 3204 deletions
diff --git a/third_party/WebKit/Source/bindings/v8/CallbackPromiseAdapter.h b/third_party/WebKit/Source/bindings/v8/CallbackPromiseAdapter.h index d094b1e..19b5a54 100644 --- a/third_party/WebKit/Source/bindings/v8/CallbackPromiseAdapter.h +++ b/third_party/WebKit/Source/bindings/v8/CallbackPromiseAdapter.h @@ -46,13 +46,13 @@ namespace WebCore { // To use: // // class MyClass ... { -// typedef WebKit::WebMyClass WebType; -// static PassRefPtr<MyClass> from(WebKit::WebMyClass* webInstance) { +// typedef blink::WebMyClass WebType; +// static PassRefPtr<MyClass> from(blink::WebMyClass* webInstance) { // // convert/create as appropriate, but often it's just: // return MyClass::create(adoptPtr(webInstance)); // } // -// Now when calling into a WebKit API that requires a WebCallbacks<WebKit::WebMyClass, WebKit::WebMyClass>*: +// Now when calling into a WebKit API that requires a WebCallbacks<blink::WebMyClass, blink::WebMyClass>*: // // // call signature: callSomeMethod(WebCallbacks<MyClass, MyClass>* callbacks) // webObject->callSomeMethod(new CallbackPromiseAdapter<MyClass, MyClass>(resolver, scriptExecutionContext)); @@ -61,7 +61,7 @@ namespace WebCore { // example that ownership of the WebCallbacks instance is being passed // in and it is up to the callee to free the WebCallbacks instace. template<typename S, typename T> -class CallbackPromiseAdapter : public WebKit::WebCallbacks<typename S::WebType, typename T::WebType> { +class CallbackPromiseAdapter : public blink::WebCallbacks<typename S::WebType, typename T::WebType> { public: explicit CallbackPromiseAdapter(PassRefPtr<ScriptPromiseResolver> resolver, ExecutionContext* context) : m_resolver(resolver) diff --git a/third_party/WebKit/Source/bindings/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/v8/ScriptController.cpp index 622d59a..fb3635c 100644 --- a/third_party/WebKit/Source/bindings/v8/ScriptController.cpp +++ b/third_party/WebKit/Source/bindings/v8/ScriptController.cpp @@ -138,7 +138,7 @@ void ScriptController::clearForClose() { double start = currentTime(); clearForClose(false); - WebKit::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearForClose", (currentTime() - start) * 1000, 0, 10000, 50); + blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearForClose", (currentTime() - start) * 1000, 0, 10000, 50); } void ScriptController::updateSecurityOrigin() @@ -491,7 +491,7 @@ void ScriptController::clearWindowShell() for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin(); iter != m_isolatedWorlds.end(); ++iter) iter->value->clearForNavigation(); V8GCController::hintForCollectGarbage(); - WebKit::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowShell", (currentTime() - start) * 1000, 0, 10000, 50); + blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowShell", (currentTime() - start) * 1000, 0, 10000, 50); } void ScriptController::setCaptureCallStackForUncaughtExceptions(bool value) diff --git a/third_party/WebKit/Source/bindings/v8/V8Binding.h b/third_party/WebKit/Source/bindings/v8/V8Binding.h index f33245b..d834b10 100644 --- a/third_party/WebKit/Source/bindings/v8/V8Binding.h +++ b/third_party/WebKit/Source/bindings/v8/V8Binding.h @@ -715,7 +715,7 @@ namespace WebCore { v8::Isolate* toIsolate(ExecutionContext*); v8::Isolate* toIsolate(Frame*); - // Can only be called by WebKit::initialize + // Can only be called by blink::initialize void setMainThreadIsolate(v8::Isolate*); } // namespace WebCore diff --git a/third_party/WebKit/Source/bindings/v8/V8Initializer.cpp b/third_party/WebKit/Source/bindings/v8/V8Initializer.cpp index 44d1fbf..73283dba 100644 --- a/third_party/WebKit/Source/bindings/v8/V8Initializer.cpp +++ b/third_party/WebKit/Source/bindings/v8/V8Initializer.cpp @@ -78,7 +78,7 @@ static Frame* findFrame(v8::Local<v8::Object> host, v8::Local<v8::Value> data, v static void reportFatalErrorInMainThread(const char* location, const char* message) { - int memoryUsageMB = WebKit::Platform::current()->actualMemoryUsageMB(); + int memoryUsageMB = blink::Platform::current()->actualMemoryUsageMB(); printf("V8 error: %s (%s). Current memory usage: %d MB\n", message, location, memoryUsageMB); CRASH(); } diff --git a/third_party/WebKit/Source/bindings/v8/V8WindowShell.cpp b/third_party/WebKit/Source/bindings/v8/V8WindowShell.cpp index c114d2d..59f12217 100644 --- a/third_party/WebKit/Source/bindings/v8/V8WindowShell.cpp +++ b/third_party/WebKit/Source/bindings/v8/V8WindowShell.cpp @@ -289,7 +289,7 @@ void V8WindowShell::createContext() const char* histogramName = "WebCore.V8WindowShell.createContext.MainWorld"; if (!m_world->isMainWorld()) histogramName = "WebCore.V8WindowShell.createContext.IsolatedWorld"; - WebKit::Platform::current()->histogramCustomCounts(histogramName, contextCreationDurationInMilliseconds, 0, 10000, 50); + blink::Platform::current()->histogramCustomCounts(histogramName, contextCreationDurationInMilliseconds, 0, 10000, 50); } bool V8WindowShell::installDOMWindow() diff --git a/third_party/WebKit/Source/bindings/v8/WorkerScriptController.cpp b/third_party/WebKit/Source/bindings/v8/WorkerScriptController.cpp index 0eb4950..bee83c3 100644 --- a/third_party/WebKit/Source/bindings/v8/WorkerScriptController.cpp +++ b/third_party/WebKit/Source/bindings/v8/WorkerScriptController.cpp @@ -79,7 +79,7 @@ WorkerScriptController::~WorkerScriptController() // The corresponding call to didStartWorkerRunLoop is in // WorkerThread::workerThread(). // See http://webkit.org/b/83104#c14 for why this is here. - WebKit::Platform::current()->didStopWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_workerGlobalScope.thread()->runLoop())); + blink::Platform::current()->didStopWorkerRunLoop(blink::WebWorkerRunLoop(&m_workerGlobalScope.thread()->runLoop())); disposeContext(); V8PerIsolateData::dispose(m_isolate); diff --git a/third_party/WebKit/Source/bindings/v8/custom/V8AlgorithmCustom.cpp b/third_party/WebKit/Source/bindings/v8/custom/V8AlgorithmCustom.cpp index 9c50137..11d9395 100644 --- a/third_party/WebKit/Source/bindings/v8/custom/V8AlgorithmCustom.cpp +++ b/third_party/WebKit/Source/bindings/v8/custom/V8AlgorithmCustom.cpp @@ -47,22 +47,22 @@ v8::Handle<v8::Object> wrap(Algorithm* impl, v8::Handle<v8::Object> creationCont // Wrap as the more derived type. switch (impl->type()) { - case WebKit::WebCryptoAlgorithmParamsTypeNone: + case blink::WebCryptoAlgorithmParamsTypeNone: return V8Algorithm::createWrapper(impl, creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams: + case blink::WebCryptoAlgorithmParamsTypeAesCbcParams: return wrap(static_cast<AesCbcParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams: return wrap(static_cast<AesKeyGenParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeHmacParams: + case blink::WebCryptoAlgorithmParamsTypeHmacParams: return wrap(static_cast<HmacParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeHmacKeyParams: + case blink::WebCryptoAlgorithmParamsTypeHmacKeyParams: return wrap(static_cast<HmacKeyParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeRsaSsaParams: + case blink::WebCryptoAlgorithmParamsTypeRsaSsaParams: return wrap(static_cast<RsaSsaParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: return wrap(static_cast<RsaKeyGenParams*>(impl), creationContext, isolate); - case WebKit::WebCryptoAlgorithmParamsTypeAesGcmParams: - case WebKit::WebCryptoAlgorithmParamsTypeRsaOaepParams: + case blink::WebCryptoAlgorithmParamsTypeAesGcmParams: + case blink::WebCryptoAlgorithmParamsTypeRsaOaepParams: // TODO notImplemented(); break; diff --git a/third_party/WebKit/Source/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp b/third_party/WebKit/Source/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp index c653395..8e487b8 100644 --- a/third_party/WebKit/Source/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp +++ b/third_party/WebKit/Source/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp @@ -124,7 +124,7 @@ static void histogramEnumeration(const char* name, const v8::FunctionCallbackInf int sample = info[0]->ToInt32()->Value(); if (sample < boundaryValue) - WebKit::Platform::current()->histogramEnumeration(name, sample, boundaryValue); + blink::Platform::current()->histogramEnumeration(name, sample, boundaryValue); } void V8InspectorFrontendHost::recordActionTakenMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) diff --git a/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp b/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp index 1e12617..5f42630 100644 --- a/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp +++ b/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp @@ -34,7 +34,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; diff --git a/third_party/WebKit/Source/core/accessibility/AXObject.cpp b/third_party/WebKit/Source/core/accessibility/AXObject.cpp index 8957167..645d886 100644 --- a/third_party/WebKit/Source/core/accessibility/AXObject.cpp +++ b/third_party/WebKit/Source/core/accessibility/AXObject.cpp @@ -42,7 +42,7 @@ #include "wtf/StdLibExtras.h" #include "wtf/text/WTFString.h" -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace std; namespace WebCore { diff --git a/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp b/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp index c65147e..ed9cb16 100644 --- a/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp +++ b/third_party/WebKit/Source/core/accessibility/AXRenderObject.cpp @@ -72,7 +72,7 @@ #include "platform/text/PlatformLocale.h" #include "wtf/StdLibExtras.h" -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace std; namespace WebCore { diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp index 2a06229..ee9c288 100644 --- a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp +++ b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp @@ -291,7 +291,7 @@ void CSSFontFaceSource::FontLoadHistograms::loadStarted() void CSSFontFaceSource::FontLoadHistograms::recordLocalFont(bool loadSuccess) { if (!m_loadStartTime) { - WebKit::Platform::current()->histogramEnumeration("WebFont.LocalFontUsed", loadSuccess ? 1 : 0, 2); + blink::Platform::current()->histogramEnumeration("WebFont.LocalFontUsed", loadSuccess ? 1 : 0, 2); m_loadStartTime = -1; // Do not count this font again. } } @@ -300,14 +300,14 @@ void CSSFontFaceSource::FontLoadHistograms::recordRemoteFont(const FontResource* { if (m_loadStartTime > 0 && font && !font->isLoading()) { int duration = static_cast<int>(currentTimeMS() - m_loadStartTime); - WebKit::Platform::current()->histogramCustomCounts(histogramName(font), duration, 0, 10000, 50); + blink::Platform::current()->histogramCustomCounts(histogramName(font), duration, 0, 10000, 50); m_loadStartTime = -1; enum { Miss, Hit, DataUrl, CacheHitEnumMax }; int histogramValue = font->url().protocolIsData() ? DataUrl : font->response().wasCached() ? Hit : Miss; - WebKit::Platform::current()->histogramEnumeration("WebFont.CacheHit", histogramValue, CacheHitEnumMax); + blink::Platform::current()->histogramEnumeration("WebFont.CacheHit", histogramValue, CacheHitEnumMax); } } diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp index 13f182c..93ea4db 100644 --- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp +++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp @@ -435,7 +435,7 @@ void FontFaceSet::FontLoadHistogram::record() if (m_recorded) return; m_recorded = true; - WebKit::Platform::current()->histogramCustomCounts("WebFont.WebFontsInPage", m_count, 1, 100, 50); + blink::Platform::current()->histogramCustomCounts("WebFont.WebFontsInPage", m_count, 1, 100, 50); } static const char* supplementName() diff --git a/third_party/WebKit/Source/core/dom/MessagePortChannel.cpp b/third_party/WebKit/Source/core/dom/MessagePortChannel.cpp index 8f5cee3..34f3fd1 100644 --- a/third_party/WebKit/Source/core/dom/MessagePortChannel.cpp +++ b/third_party/WebKit/Source/core/dom/MessagePortChannel.cpp @@ -39,7 +39,7 @@ namespace WebCore { -PassOwnPtr<MessagePortChannel> MessagePortChannel::create(WebKit::WebMessagePortChannel* channel) +PassOwnPtr<MessagePortChannel> MessagePortChannel::create(blink::WebMessagePortChannel* channel) { return adoptPtr(new MessagePortChannel(channel)); } @@ -47,8 +47,8 @@ PassOwnPtr<MessagePortChannel> MessagePortChannel::create(WebKit::WebMessagePort void MessagePortChannel::createChannel(MessagePort* port1, MessagePort* port2) { // Create proxies for each endpoint. - OwnPtr<MessagePortChannel> channel1 = create(WebKit::Platform::current()->createMessagePortChannel()); - OwnPtr<MessagePortChannel> channel2 = create(WebKit::Platform::current()->createMessagePortChannel()); + OwnPtr<MessagePortChannel> channel1 = create(blink::Platform::current()->createMessagePortChannel()); + OwnPtr<MessagePortChannel> channel2 = create(blink::Platform::current()->createMessagePortChannel()); // Entangle the two endpoints. channel1->m_webChannel->entangle(channel2->m_webChannel); @@ -59,7 +59,7 @@ void MessagePortChannel::createChannel(MessagePort* port1, MessagePort* port2) port2->entangle(channel1.release()); } -MessagePortChannel::MessagePortChannel(WebKit::WebMessagePortChannel* channel) +MessagePortChannel::MessagePortChannel(blink::WebMessagePortChannel* channel) : m_localPort(0) , m_webChannel(channel) { @@ -90,10 +90,10 @@ void MessagePortChannel::postMessageToRemote(PassRefPtr<SerializedScriptValue> m if (!m_localPort || !m_webChannel) return; - WebKit::WebString messageString = message->toWireString(); - WebKit::WebMessagePortChannelArray* webChannels = 0; + blink::WebString messageString = message->toWireString(); + blink::WebMessagePortChannelArray* webChannels = 0; if (channels && channels->size()) { - webChannels = new WebKit::WebMessagePortChannelArray(channels->size()); + webChannels = new blink::WebMessagePortChannelArray(channels->size()); for (size_t i = 0; i < channels->size(); ++i) (*webChannels)[i] = (*channels)[i]->webChannelRelease(); } @@ -105,8 +105,8 @@ bool MessagePortChannel::tryGetMessageFromRemote(RefPtr<SerializedScriptValue>& if (!m_webChannel) return false; - WebKit::WebString message; - WebKit::WebMessagePortChannelArray webChannels; + blink::WebString message; + blink::WebMessagePortChannelArray webChannels; bool rv = m_webChannel->tryGetMessage(&message, webChannels); if (rv) { if (webChannels.size()) { @@ -141,10 +141,10 @@ void MessagePortChannel::messageAvailable() m_localPort->messageAvailable(); } -WebKit::WebMessagePortChannel* MessagePortChannel::webChannelRelease() +blink::WebMessagePortChannel* MessagePortChannel::webChannelRelease() { ASSERT(m_webChannel); - WebKit::WebMessagePortChannel* webChannel = m_webChannel; + blink::WebMessagePortChannel* webChannel = m_webChannel; m_webChannel = 0; webChannel->setClient(0); return webChannel; diff --git a/third_party/WebKit/Source/core/dom/MessagePortChannel.h b/third_party/WebKit/Source/core/dom/MessagePortChannel.h index 799a6b6..c4f21b7 100644 --- a/third_party/WebKit/Source/core/dom/MessagePortChannel.h +++ b/third_party/WebKit/Source/core/dom/MessagePortChannel.h @@ -39,7 +39,7 @@ #include "wtf/ThreadSafeRefCounted.h" #include "wtf/ThreadingPrimitives.h" -namespace WebKit { +namespace blink { class WebMessagePortChannel; } @@ -54,11 +54,11 @@ class SerializedScriptValue; typedef Vector<OwnPtr<MessagePortChannel>, 1> MessagePortChannelArray; // MessagePortChannel is a platform-independent interface to the remote side of a message channel. -class MessagePortChannel : public WebKit::WebMessagePortChannelClient { +class MessagePortChannel : public blink::WebMessagePortChannelClient { WTF_MAKE_NONCOPYABLE(MessagePortChannel); public: static void createChannel(MessagePort*, MessagePort*); - static PassOwnPtr<MessagePortChannel> create(WebKit::WebMessagePortChannel*); + static PassOwnPtr<MessagePortChannel> create(blink::WebMessagePortChannel*); virtual ~MessagePortChannel(); @@ -81,12 +81,12 @@ public: bool tryGetMessageFromRemote(RefPtr<SerializedScriptValue>&, OwnPtr<MessagePortChannelArray>&); // Releases ownership of the contained web channel. - WebKit::WebMessagePortChannel* webChannelRelease(); + blink::WebMessagePortChannel* webChannelRelease(); private: - explicit MessagePortChannel(WebKit::WebMessagePortChannel*); + explicit MessagePortChannel(blink::WebMessagePortChannel*); - // WebKit::WebMessagePortChannelClient implementation + // blink::WebMessagePortChannelClient implementation virtual void messageAvailable() OVERRIDE; // Mutex used to ensure exclusive access to the object internals. @@ -95,7 +95,7 @@ private: // The port we are connected to - this is the port that is notified when new messages arrive. MessagePort* m_localPort; - WebKit::WebMessagePortChannel* m_webChannel; + blink::WebMessagePortChannel* m_webChannel; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp b/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp index 521d0ab..b72f4ff 100644 --- a/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp +++ b/third_party/WebKit/Source/core/dom/VisitedLinkState.cpp @@ -99,7 +99,7 @@ EInsideLink VisitedLinkState::determineLinkStateSlowCase(const Element& element) if (LinkHash hash = linkHashForElement(element, attribute)) { m_linksCheckedForVisitedState.add(hash); - if (WebKit::Platform::current()->isLinkVisited(hash)) + if (blink::Platform::current()->isLinkVisited(hash)) return InsideVisitedLink; } diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp index dbd4c5c..d7e6c41 100644 --- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp +++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp @@ -72,7 +72,7 @@ ShadowRoot::ShadowRoot(Document* document, ShadowRootType type) if (type == ShadowRoot::AuthorShadowRoot) { ShadowRootUsageOriginType usageType = document->url().protocolIsInHTTPFamily() ? ShadowRootUsageOriginWeb : ShadowRootUsageOriginNotWeb; - WebKit::Platform::current()->histogramEnumeration("WebCore.ShadowRoot.constructor", usageType, ShadowRootUsageOriginMax); + blink::Platform::current()->histogramEnumeration("WebCore.ShadowRoot.constructor", usageType, ShadowRootUsageOriginMax); } } diff --git a/third_party/WebKit/Source/core/fetch/FontResource.cpp b/third_party/WebKit/Source/core/fetch/FontResource.cpp index 8e4cf13..de1688b 100644 --- a/third_party/WebKit/Source/core/fetch/FontResource.cpp +++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp @@ -174,7 +174,7 @@ void FontResource::willUseFontData() FontResource::FontResourceHistograms::~FontResourceHistograms() { if (m_styledTime > 0) - WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", StyledButNotUsed, UsageTypeMax); + blink::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", StyledButNotUsed, UsageTypeMax); } void FontResource::FontResourceHistograms::willUseFontData() @@ -188,11 +188,11 @@ void FontResource::FontResourceHistograms::loadStarted() if (m_styledTime < 0) return; if (!m_styledTime) { - WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", NotStyledButUsed, UsageTypeMax); + blink::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", NotStyledButUsed, UsageTypeMax); } else { int duration = static_cast<int>(currentTimeMS() - m_styledTime); - WebKit::Platform::current()->histogramCustomCounts("WebFont.Resource.StyleRecalcToDownloadLatency", duration, 0, 10000, 50); - WebKit::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", StyledAndUsed, UsageTypeMax); + blink::Platform::current()->histogramCustomCounts("WebFont.Resource.StyleRecalcToDownloadLatency", duration, 0, 10000, 50); + blink::Platform::current()->histogramEnumeration("WebFont.Resource.UsageType", StyledAndUsed, UsageTypeMax); } m_styledTime = -1; } diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp index 2949e32..c152add 100644 --- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp +++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp @@ -52,18 +52,18 @@ using namespace WebCore; namespace { -class QuitTask : public WebKit::WebThread::Task { +class QuitTask : public blink::WebThread::Task { public: virtual void run() { - WebKit::Platform::current()->currentThread()->exitRunLoop(); + blink::Platform::current()->currentThread()->exitRunLoop(); } }; void runPendingTasks() { - WebKit::Platform::current()->currentThread()->postTask(new QuitTask); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new QuitTask); + blink::Platform::current()->currentThread()->enterRunLoop(); } TEST(ImageResourceTest, MultipartImage) @@ -114,12 +114,12 @@ TEST(ImageResourceTest, CancelOnDetach) { KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html"); - WebKit::WebURLResponse response; + blink::WebURLResponse response; response.initialize(); response.setMIMEType("text/html"); - WTF::String localPath = WebKit::Platform::current()->unitTestSupport()->webKitRootDir(); + WTF::String localPath = blink::Platform::current()->unitTestSupport()->webKitRootDir(); localPath.append("/Source/web/tests/data/cancelTest.html"); - WebKit::Platform::current()->unitTestSupport()->registerMockedURL(testURL, response, localPath); + blink::Platform::current()->unitTestSupport()->registerMockedURL(testURL, response, localPath); // Create enough of a mocked world to get a functioning ResourceLoader. Page::PageClients pageClients; @@ -151,7 +151,7 @@ TEST(ImageResourceTest, CancelOnDetach) EXPECT_EQ(Resource::LoadError, cachedImage->status()); EXPECT_EQ(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL)); - WebKit::Platform::current()->unitTestSupport()->unregisterMockedURL(testURL); + blink::Platform::current()->unitTestSupport()->unregisterMockedURL(testURL); } } // namespace diff --git a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp index 22ce954b..9d87d47 100644 --- a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp +++ b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp @@ -92,7 +92,7 @@ MemoryCache::MemoryCache() MemoryCache::~MemoryCache() { if (m_prunePending) - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); } KURL MemoryCache::removeFragmentIdentifierIfNeeded(const KURL& originalURL) @@ -595,7 +595,7 @@ void MemoryCache::prune(Resource* justReleasedResource) pruneNow(currentTime); // Delay exceeded, prune now. } else { // Defer. - WebKit::Platform::current()->currentThread()->addTaskObserver(this); + blink::Platform::current()->currentThread()->addTaskObserver(this); m_prunePending = true; } } @@ -630,7 +630,7 @@ void MemoryCache::pruneNow(double currentTime) { if (m_prunePending) { m_prunePending = false; - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); } TemporaryChange<bool> reentrancyProtector(m_inPruneResources, true); diff --git a/third_party/WebKit/Source/core/fetch/MemoryCache.h b/third_party/WebKit/Source/core/fetch/MemoryCache.h index ba1d2ca..178680c 100644 --- a/third_party/WebKit/Source/core/fetch/MemoryCache.h +++ b/third_party/WebKit/Source/core/fetch/MemoryCache.h @@ -59,7 +59,7 @@ struct SecurityOriginHash; // Enable this macro to periodically log information about the memory cache. #undef MEMORY_CACHE_STATS -class MemoryCache : public WebKit::WebThread::TaskObserver { +class MemoryCache : public blink::WebThread::TaskObserver { WTF_MAKE_NONCOPYABLE(MemoryCache); WTF_MAKE_FAST_ALLOCATED; public: MemoryCache(); diff --git a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp index 9432f9e..21962b1 100644 --- a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp +++ b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp @@ -149,7 +149,7 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask) cachedLiveResource->addClient(&client); cachedLiveResource->appendData(data, 4); - class Task1 : public WebKit::WebThread::Task { + class Task1 : public blink::WebThread::Task { public: Task1(const ResourcePtr<Resource>& live, const ResourcePtr<Resource>& dead) : m_live(live) @@ -183,7 +183,7 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask) ResourcePtr<Resource> m_live, m_dead; }; - class Task2 : public WebKit::WebThread::Task { + class Task2 : public blink::WebThread::Task { public: Task2(unsigned liveSizeWithoutDecode) : m_liveSizeWithoutDecode(liveSizeWithoutDecode) { } @@ -193,7 +193,7 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask) // Next task: now, the live resource was evicted. ASSERT_EQ(0u, memoryCache()->deadSize()); ASSERT_EQ(m_liveSizeWithoutDecode, memoryCache()->liveSize()); - WebKit::Platform::current()->currentThread()->exitRunLoop(); + blink::Platform::current()->currentThread()->exitRunLoop(); } private: @@ -201,9 +201,9 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask) }; - WebKit::Platform::current()->currentThread()->postTask(new Task1(cachedLiveResource, cachedDeadResource)); - WebKit::Platform::current()->currentThread()->postTask(new Task2(cachedLiveResource->encodedSize() + cachedLiveResource->overheadSize())); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new Task1(cachedLiveResource, cachedDeadResource)); + blink::Platform::current()->currentThread()->postTask(new Task2(cachedLiveResource->encodedSize() + cachedLiveResource->overheadSize())); + blink::Platform::current()->currentThread()->enterRunLoop(); cachedLiveResource->removeClient(&client); } diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp index 878e2ef..6d153d5 100644 --- a/third_party/WebKit/Source/core/fetch/Resource.cpp +++ b/third_party/WebKit/Source/core/fetch/Resource.cpp @@ -351,7 +351,7 @@ void Resource::setCachedMetadata(unsigned dataTypeID, const char* data, size_t s m_cachedMetadata = CachedMetadata::create(dataTypeID, data, size); const Vector<char>& serializedData = m_cachedMetadata->serialize(); - WebKit::Platform::current()->cacheMetadata(m_response.url(), m_response.responseTime(), serializedData.data(), serializedData.size()); + blink::Platform::current()->cacheMetadata(m_response.url(), m_response.responseTime(), serializedData.data(), serializedData.size()); } CachedMetadata* Resource::cachedMetadata(unsigned dataTypeID) const diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp index 651050f..ed9f52f 100644 --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp @@ -146,9 +146,9 @@ static Resource* resourceFromDataURIRequest(const ResourceRequest& request, cons const KURL& url = request.url(); ASSERT(url.protocolIsData()); - WebKit::WebString mimetype; - WebKit::WebString charset; - RefPtr<SharedBuffer> data = PassRefPtr<SharedBuffer>(WebKit::Platform::current()->parseDataURL(url, mimetype, charset)); + blink::WebString mimetype; + blink::WebString charset; + RefPtr<SharedBuffer> data = PassRefPtr<SharedBuffer>(blink::Platform::current()->parseDataURL(url, mimetype, charset)); if (!data) return 0; ResourceResponse response(url, mimetype, data->size(), charset, String()); diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp index 6071005..2ecf81d 100644 --- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp +++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp @@ -148,9 +148,9 @@ void ResourceLoader::start() RELEASE_ASSERT(m_connectionState == ConnectionStateNew); m_connectionState = ConnectionStateStarted; - m_loader = adoptPtr(WebKit::Platform::current()->createURLLoader()); + m_loader = adoptPtr(blink::Platform::current()->createURLLoader()); ASSERT(m_loader); - WebKit::WrappedResourceRequest wrappedRequest(m_request); + blink::WrappedResourceRequest wrappedRequest(m_request); wrappedRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials); m_loader->loadAsynchronously(wrappedRequest, this); } @@ -178,7 +178,7 @@ void ResourceLoader::setDefersLoading(bool defers) } } -void ResourceLoader::didDownloadData(WebKit::WebURLLoader*, int length, int encodedDataLength) +void ResourceLoader::didDownloadData(blink::WebURLLoader*, int length, int encodedDataLength) { RefPtr<ResourceLoader> protect(this); RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse); @@ -202,7 +202,7 @@ void ResourceLoader::didChangePriority(ResourceLoadPriority loadPriority) { if (m_loader) { m_host->didChangeLoadingPriority(m_resource, loadPriority); - m_loader->didChangePriority(static_cast<WebKit::WebURLRequest::Priority>(loadPriority)); + m_loader->didChangePriority(static_cast<blink::WebURLRequest::Priority>(loadPriority)); } } @@ -253,7 +253,7 @@ void ResourceLoader::cancel(const ResourceError& error) releaseResources(); } -void ResourceLoader::willSendRequest(WebKit::WebURLLoader*, WebKit::WebURLRequest& passedRequest, const WebKit::WebURLResponse& passedRedirectResponse) +void ResourceLoader::willSendRequest(blink::WebURLLoader*, blink::WebURLRequest& passedRequest, const blink::WebURLResponse& passedRedirectResponse) { RefPtr<ResourceLoader> protect(this); @@ -276,21 +276,21 @@ void ResourceLoader::willSendRequest(WebKit::WebURLLoader*, WebKit::WebURLReques m_request = request; } -void ResourceLoader::didReceiveCachedMetadata(WebKit::WebURLLoader*, const char* data, int length) +void ResourceLoader::didReceiveCachedMetadata(blink::WebURLLoader*, const char* data, int length) { RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse || m_connectionState == ConnectionStateReceivingData); ASSERT(m_state == Initialized); m_resource->setSerializedCachedMetadata(data, length); } -void ResourceLoader::didSendData(WebKit::WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) +void ResourceLoader::didSendData(blink::WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) { ASSERT(m_state == Initialized); RefPtr<ResourceLoader> protect(this); m_resource->didSendData(bytesSent, totalBytesToBeSent); } -void ResourceLoader::didReceiveResponse(WebKit::WebURLLoader*, const WebKit::WebURLResponse& response) +void ResourceLoader::didReceiveResponse(blink::WebURLLoader*, const blink::WebURLResponse& response) { ASSERT(!response.isNull()); ASSERT(m_state == Initialized); @@ -331,7 +331,7 @@ void ResourceLoader::didReceiveResponse(WebKit::WebURLLoader*, const WebKit::Web cancel(); } -void ResourceLoader::didReceiveData(WebKit::WebURLLoader*, const char* data, int length, int encodedDataLength) +void ResourceLoader::didReceiveData(blink::WebURLLoader*, const char* data, int length, int encodedDataLength) { RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse || m_connectionState == ConnectionStateReceivingData); m_connectionState = ConnectionStateReceivingData; @@ -353,7 +353,7 @@ void ResourceLoader::didReceiveData(WebKit::WebURLLoader*, const char* data, int m_resource->appendData(data, length); } -void ResourceLoader::didFinishLoading(WebKit::WebURLLoader*, double finishTime) +void ResourceLoader::didFinishLoading(blink::WebURLLoader*, double finishTime) { RELEASE_ASSERT(m_connectionState == ConnectionStateReceivedResponse || m_connectionState == ConnectionStateReceivingData); m_connectionState = ConnectionStateFinishedLoading; @@ -375,7 +375,7 @@ void ResourceLoader::didFinishLoading(WebKit::WebURLLoader*, double finishTime) releaseResources(); } -void ResourceLoader::didFail(WebKit::WebURLLoader*, const WebKit::WebURLError& error) +void ResourceLoader::didFail(blink::WebURLLoader*, const blink::WebURLError& error) { m_connectionState = ConnectionStateFailed; ASSERT(m_state != Terminated); @@ -406,7 +406,7 @@ bool ResourceLoader::isLoadedBy(ResourceLoaderHost* loader) const void ResourceLoader::requestSynchronously() { - OwnPtr<WebKit::WebURLLoader> loader = adoptPtr(WebKit::Platform::current()->createURLLoader()); + OwnPtr<blink::WebURLLoader> loader = adoptPtr(blink::Platform::current()->createURLLoader()); ASSERT(loader); RefPtr<ResourceLoader> protect(this); @@ -416,12 +416,12 @@ void ResourceLoader::requestSynchronously() RELEASE_ASSERT(m_connectionState == ConnectionStateNew); m_connectionState = ConnectionStateStarted; - WebKit::WrappedResourceRequest requestIn(m_request); + blink::WrappedResourceRequest requestIn(m_request); requestIn.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredCredentials); - WebKit::WebURLResponse responseOut; + blink::WebURLResponse responseOut; responseOut.initialize(); - WebKit::WebURLError errorOut; - WebKit::WebData dataOut; + blink::WebURLError errorOut; + blink::WebData dataOut; loader->loadSynchronously(requestIn, responseOut, errorOut, dataOut); if (errorOut.reason) { didFail(0, errorOut); diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.h b/third_party/WebKit/Source/core/fetch/ResourceLoader.h index d7c90a5..814cecf 100644 --- a/third_party/WebKit/Source/core/fetch/ResourceLoader.h +++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.h @@ -44,7 +44,7 @@ class ResourceError; class ResourceResponse; class ResourceLoaderHost; -class ResourceLoader : public RefCounted<ResourceLoader>, protected WebKit::WebURLLoaderClient { +class ResourceLoader : public RefCounted<ResourceLoader>, protected blink::WebURLLoaderClient { public: static PassRefPtr<ResourceLoader> create(ResourceLoaderHost*, Resource*, const ResourceRequest&, const ResourceLoaderOptions&); virtual ~ResourceLoader(); @@ -67,14 +67,14 @@ public: void didChangePriority(ResourceLoadPriority); // WebURLLoaderClient - virtual void willSendRequest(WebKit::WebURLLoader*, WebKit::WebURLRequest&, const WebKit::WebURLResponse& redirectResponse) OVERRIDE; - virtual void didSendData(WebKit::WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE; - virtual void didReceiveResponse(WebKit::WebURLLoader*, const WebKit::WebURLResponse&) OVERRIDE; - virtual void didReceiveData(WebKit::WebURLLoader*, const char*, int, int encodedDataLength) OVERRIDE; - virtual void didReceiveCachedMetadata(WebKit::WebURLLoader*, const char* data, int length) OVERRIDE; - virtual void didFinishLoading(WebKit::WebURLLoader*, double finishTime) OVERRIDE; - virtual void didFail(WebKit::WebURLLoader*, const WebKit::WebURLError&) OVERRIDE; - virtual void didDownloadData(WebKit::WebURLLoader*, int, int) OVERRIDE; + virtual void willSendRequest(blink::WebURLLoader*, blink::WebURLRequest&, const blink::WebURLResponse& redirectResponse) OVERRIDE; + virtual void didSendData(blink::WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE; + virtual void didReceiveResponse(blink::WebURLLoader*, const blink::WebURLResponse&) OVERRIDE; + virtual void didReceiveData(blink::WebURLLoader*, const char*, int, int encodedDataLength) OVERRIDE; + virtual void didReceiveCachedMetadata(blink::WebURLLoader*, const char* data, int length) OVERRIDE; + virtual void didFinishLoading(blink::WebURLLoader*, double finishTime) OVERRIDE; + virtual void didFail(blink::WebURLLoader*, const blink::WebURLError&) OVERRIDE; + virtual void didDownloadData(blink::WebURLLoader*, int, int) OVERRIDE; const KURL& url() const { return m_request.url(); } bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; } @@ -92,7 +92,7 @@ private: void didFinishLoadingOnePart(double finishTime); - OwnPtr<WebKit::WebURLLoader> m_loader; + OwnPtr<blink::WebURLLoader> m_loader; RefPtr<ResourceLoaderHost> m_host; ResourceRequest m_request; diff --git a/third_party/WebKit/Source/core/fileapi/File.cpp b/third_party/WebKit/Source/core/fileapi/File.cpp index 6ae199d..02d9700 100644 --- a/third_party/WebKit/Source/core/fileapi/File.cpp +++ b/third_party/WebKit/Source/core/fileapi/File.cpp @@ -95,7 +95,7 @@ PassRefPtr<File> File::createWithRelativePath(const String& path, const String& File::File(const String& path, ContentTypeLookupPolicy policy) : Blob(BlobDataHandle::create(createBlobDataForFile(path, policy), -1)) , m_path(path) - , m_name(WebKit::Platform::current()->fileUtilities()->baseName(path)) + , m_name(blink::Platform::current()->fileUtilities()->baseName(path)) , m_snapshotSize(-1) , m_snapshotModificationTime(invalidFileTime()) { @@ -115,7 +115,7 @@ File::File(const String& path, const String& name, ContentTypeLookupPolicy polic File::File(const String& path, PassRefPtr<BlobDataHandle> blobDataHandle) : Blob(blobDataHandle) , m_path(path) - , m_name(WebKit::Platform::current()->fileUtilities()->baseName(path)) + , m_name(blink::Platform::current()->fileUtilities()->baseName(path)) , m_snapshotSize(-1) , m_snapshotModificationTime(invalidFileTime()) { diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp index 9ceda31..bc1b048 100644 --- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp +++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp @@ -149,12 +149,12 @@ private: static void disableSuddenTermination() { - WebKit::Platform::current()->suddenTerminationChanged(false); + blink::Platform::current()->suddenTerminationChanged(false); } static void enableSuddenTermination() { - WebKit::Platform::current()->suddenTerminationChanged(true); + blink::Platform::current()->suddenTerminationChanged(true); } typedef HashCountedSet<DOMWindow*> DOMWindowSet; diff --git a/third_party/WebKit/Source/core/frame/UseCounter.cpp b/third_party/WebKit/Source/core/frame/UseCounter.cpp index 037ee5f..d334edf 100644 --- a/third_party/WebKit/Source/core/frame/UseCounter.cpp +++ b/third_party/WebKit/Source/core/frame/UseCounter.cpp @@ -527,19 +527,19 @@ UseCounter::UseCounter() UseCounter::~UseCounter() { // We always log PageDestruction so that we have a scale for the rest of the features. - WebKit::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures); + blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures); updateMeasurements(); } void UseCounter::updateMeasurements() { - WebKit::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures); + blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures); if (m_countBits) { for (unsigned i = 0; i < NumberOfFeatures; ++i) { if (m_countBits->quickGet(i)) - WebKit::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures); + blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures); } // Clearing count bits is timing sensitive. m_countBits->clearAll(); @@ -552,13 +552,13 @@ void UseCounter::updateMeasurements() for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) { if (m_CSSFeatureBits.quickGet(i)) { int cssSampleId = mapCSSPropertyIdToCSSSampleIdForHistogram(i); - WebKit::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", cssSampleId, maximumCSSSampleId()); + blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", cssSampleId, maximumCSSSampleId()); needsPagesMeasuredUpdate = true; } } if (needsPagesMeasuredUpdate) - WebKit::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", totalPagesMeasuredCSSSampleId(), maximumCSSSampleId()); + blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", totalPagesMeasuredCSSSampleId(), maximumCSSSampleId()); m_CSSFeatureBits.clearAll(); } diff --git a/third_party/WebKit/Source/core/frame/animation/ImplicitAnimation.cpp b/third_party/WebKit/Source/core/frame/animation/ImplicitAnimation.cpp index b6d0467..7aabcac 100644 --- a/third_party/WebKit/Source/core/frame/animation/ImplicitAnimation.cpp +++ b/third_party/WebKit/Source/core/frame/animation/ImplicitAnimation.cpp @@ -49,7 +49,7 @@ ImplicitAnimation::ImplicitAnimation(const CSSAnimationData* transition, CSSProp , m_fromStyle(fromStyle) { ASSERT(animatingProperty != CSSPropertyInvalid); - WebKit::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty)); + blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(m_animatingProperty)); } ImplicitAnimation::~ImplicitAnimation() diff --git a/third_party/WebKit/Source/core/frame/animation/KeyframeAnimation.cpp b/third_party/WebKit/Source/core/frame/animation/KeyframeAnimation.cpp index e6a195a..473903e 100644 --- a/third_party/WebKit/Source/core/frame/animation/KeyframeAnimation.cpp +++ b/third_party/WebKit/Source/core/frame/animation/KeyframeAnimation.cpp @@ -60,7 +60,7 @@ KeyframeAnimation::KeyframeAnimation(const CSSAnimationData* animation, RenderOb checkForMatchingFilterFunctionLists(); HashSet<CSSPropertyID>::const_iterator endProperties = m_keyframes.endProperties(); for (HashSet<CSSPropertyID>::const_iterator it = m_keyframes.beginProperties(); it != endProperties; ++it) - WebKit::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(*it)); + blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(*it)); } KeyframeAnimation::~KeyframeAnimation() diff --git a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp index 5c6b6c7..888eb3a 100644 --- a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp @@ -60,9 +60,9 @@ namespace WebCore { namespace { -void preconnectToURL(const KURL& url, WebKit::WebPreconnectMotivation motivation) +void preconnectToURL(const KURL& url, blink::WebPreconnectMotivation motivation) { - WebKit::WebPrescientNetworking* prescientNetworking = WebKit::Platform::current()->prescientNetworking(); + blink::WebPrescientNetworking* prescientNetworking = blink::Platform::current()->prescientNetworking(); if (!prescientNetworking) return; @@ -95,7 +95,7 @@ private: void handleClick(Event* event); bool shouldPrefetch(const KURL&); - void prefetch(WebKit::WebPreconnectMotivation); + void prefetch(blink::WebPreconnectMotivation); HTMLAnchorElement* m_anchorElement; double m_mouseOverTimestamp; @@ -577,9 +577,9 @@ void HTMLAnchorElement::PrefetchEventHandler::handleMouseOver(Event* event) if (m_mouseOverTimestamp == 0.0) { m_mouseOverTimestamp = event->timeStamp(); - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseOvers", 0, 2); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseOvers", 0, 2); - prefetch(WebKit::WebPreconnectMotivationLinkMouseOver); + prefetch(blink::WebPreconnectMotivationLinkMouseOver); } } @@ -587,7 +587,7 @@ void HTMLAnchorElement::PrefetchEventHandler::handleMouseOut(Event* event) { if (m_mouseOverTimestamp > 0.0) { double mouseOverDuration = convertDOMTimeStampToSeconds(event->timeStamp() - m_mouseOverTimestamp); - WebKit::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseOverDuration_NoClick", mouseOverDuration * 1000, 0, 10000, 100); + blink::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseOverDuration_NoClick", mouseOverDuration * 1000, 0, 10000, 100); m_mouseOverTimestamp = 0.0; } @@ -597,27 +597,27 @@ void HTMLAnchorElement::PrefetchEventHandler::handleLeftMouseDown(Event* event) { m_mouseDownTimestamp = event->timeStamp(); - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseDowns", 0, 2); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseDowns", 0, 2); - prefetch(WebKit::WebPreconnectMotivationLinkMouseDown); + prefetch(blink::WebPreconnectMotivationLinkMouseDown); } void HTMLAnchorElement::PrefetchEventHandler::handleGestureTapUnconfirmed(Event* event) { m_hadTapUnconfirmed = true; - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.TapUnconfirmeds", 0, 2); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.TapUnconfirmeds", 0, 2); - prefetch(WebKit::WebPreconnectMotivationLinkTapUnconfirmed); + prefetch(blink::WebPreconnectMotivationLinkTapUnconfirmed); } void HTMLAnchorElement::PrefetchEventHandler::handleGestureShowPress(Event* event) { m_tapDownTimestamp = event->timeStamp(); - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.TapDowns", 0, 2); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.TapDowns", 0, 2); - prefetch(WebKit::WebPreconnectMotivationLinkTapDown); + prefetch(blink::WebPreconnectMotivationLinkTapDown); } void HTMLAnchorElement::PrefetchEventHandler::handleClick(Event* event) @@ -626,27 +626,27 @@ void HTMLAnchorElement::PrefetchEventHandler::handleClick(Event* event) if (capturedMouseOver) { double mouseOverDuration = convertDOMTimeStampToSeconds(event->timeStamp() - m_mouseOverTimestamp); - WebKit::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseOverDuration_Click", mouseOverDuration * 1000, 0, 10000, 100); + blink::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseOverDuration_Click", mouseOverDuration * 1000, 0, 10000, 100); } bool capturedMouseDown = (m_mouseDownTimestamp > 0.0); - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseDownFollowedByClick", capturedMouseDown, 2); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.MouseDownFollowedByClick", capturedMouseDown, 2); if (capturedMouseDown) { double mouseDownDuration = convertDOMTimeStampToSeconds(event->timeStamp() - m_mouseDownTimestamp); - WebKit::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseDownDuration_Click", mouseDownDuration * 1000, 0, 10000, 100); + blink::Platform::current()->histogramCustomCounts("MouseEventPrefetch.MouseDownDuration_Click", mouseDownDuration * 1000, 0, 10000, 100); } bool capturedTapDown = (m_tapDownTimestamp > 0.0); if (capturedTapDown) { double tapDownDuration = convertDOMTimeStampToSeconds(event->timeStamp() - m_tapDownTimestamp); - WebKit::Platform::current()->histogramCustomCounts("MouseEventPrefetch.TapDownDuration_Click", tapDownDuration * 1000, 0, 10000, 100); + blink::Platform::current()->histogramCustomCounts("MouseEventPrefetch.TapDownDuration_Click", tapDownDuration * 1000, 0, 10000, 100); } int flags = (m_hadTapUnconfirmed ? 2 : 0) | (capturedTapDown ? 1 : 0); - WebKit::Platform::current()->histogramEnumeration("MouseEventPrefetch.PreTapEventsFollowedByClick", flags, 4); + blink::Platform::current()->histogramEnumeration("MouseEventPrefetch.PreTapEventsFollowedByClick", flags, 4); } bool HTMLAnchorElement::PrefetchEventHandler::shouldPrefetch(const KURL& url) @@ -679,7 +679,7 @@ bool HTMLAnchorElement::PrefetchEventHandler::shouldPrefetch(const KURL& url) return true; } -void HTMLAnchorElement::PrefetchEventHandler::prefetch(WebKit::WebPreconnectMotivation motivation) +void HTMLAnchorElement::PrefetchEventHandler::prefetch(blink::WebPreconnectMotivation motivation) { const KURL& url = m_anchorElement->href(); @@ -687,7 +687,7 @@ void HTMLAnchorElement::PrefetchEventHandler::prefetch(WebKit::WebPreconnectMoti return; // The precision of current MouseOver trigger is too low to actually trigger preconnects. - if (motivation == WebKit::WebPreconnectMotivationLinkMouseOver) + if (motivation == blink::WebPreconnectMotivationLinkMouseOver) return; preconnectToURL(url, motivation); diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp index 96b82f5..5fa11ea 100644 --- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp @@ -168,7 +168,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas if (m_context && !m_context->is2d()) return 0; if (!m_context) { - WebKit::Platform::current()->histogramEnumeration("Canvas.ContextType", Context2d, ContextTypeCount); + blink::Platform::current()->histogramEnumeration("Canvas.ContextType", Context2d, ContextTypeCount); m_context = CanvasRenderingContext2D::create(this, static_cast<Canvas2DContextAttributes*>(attrs), document().inQuirksMode()); if (m_context) scheduleLayerUpdate(); @@ -195,7 +195,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas if (m_context && !m_context->is3d()) return 0; if (!m_context) { - WebKit::Platform::current()->histogramEnumeration("Canvas.ContextType", contextType, ContextTypeCount); + blink::Platform::current()->histogramEnumeration("Canvas.ContextType", contextType, ContextTypeCount); m_context = WebGLRenderingContext::create(this, static_cast<WebGLContextAttributes*>(attrs)); if (m_context) scheduleLayerUpdate(); @@ -443,7 +443,7 @@ bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const if (size.width() * size.height() < settings->minimumAccelerated2dCanvasSize()) return false; - if (!WebKit::Platform::current()->canAccelerate2dCanvas()) + if (!blink::Platform::current()->canAccelerate2dCanvas()) return false; return true; diff --git a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp index b0ee16b..58043e3 100644 --- a/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLDetailsElement.cpp @@ -59,7 +59,7 @@ void HTMLDetailsElement::didAddUserAgentShadowRoot(ShadowRoot* root) DEFINE_STATIC_LOCAL(AtomicString, summarySelector, ("summary:first-of-type", AtomicString::ConstructFromLiteral)); RefPtr<HTMLSummaryElement> defaultSummary = HTMLSummaryElement::create(summaryTag, document()); - defaultSummary->appendChild(Text::create(document(), locale().queryString(WebKit::WebLocalizedString::DetailsLabel))); + defaultSummary->appendChild(Text::create(document(), locale().queryString(blink::WebLocalizedString::DetailsLabel))); RefPtr<HTMLContentElement> content = HTMLContentElement::create(document()); content->setAttribute(selectAttr, summarySelector); diff --git a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp index a4ceaef..b6b46f7 100644 --- a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp @@ -803,7 +803,7 @@ String HTMLInputElement::altText() const if (alt.isNull()) alt = getAttribute(valueAttr); if (alt.isEmpty()) - alt = locale().queryString(WebKit::WebLocalizedString::InputElementAltText); + alt = locale().queryString(blink::WebLocalizedString::InputElementAltText); return alt; } diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp index 4fd63b5..8402ac9 100644 --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp @@ -92,7 +92,7 @@ #endif using namespace std; -using WebKit::WebMimeRegistry; +using blink::WebMimeRegistry; namespace WebCore { @@ -209,7 +209,7 @@ static bool canLoadURL(const KURL& url, const ContentType& contentType, const St // when used with parameters, e.g. "application/octet-stream;codecs=theora", is a type that the user agent knows // it cannot render. if (contentMIMEType != "application/octet-stream" || contentTypeCodecs.isEmpty()) { - WebMimeRegistry::SupportsType supported = WebKit::Platform::current()->mimeRegistry()->supportsMediaMIMEType(contentMIMEType, contentTypeCodecs, keySystem.lower()); + WebMimeRegistry::SupportsType supported = blink::Platform::current()->mimeRegistry()->supportsMediaMIMEType(contentMIMEType, contentTypeCodecs, keySystem.lower()); return supported > WebMimeRegistry::IsNotSupported; } @@ -237,7 +237,7 @@ WebMimeRegistry::SupportsType HTMLMediaElement::supportsType(const ContentType& if (type == "application/octet-stream") return WebMimeRegistry::IsNotSupported; - return WebKit::Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, typeCodecs, system); + return blink::Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, typeCodecs, system); } HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser) @@ -3477,7 +3477,7 @@ void HTMLMediaElement::willStopBeingFullscreenElement() document().renderView()->compositor()->setCompositingLayersNeedRebuild(true); } -WebKit::WebLayer* HTMLMediaElement::platformLayer() const +blink::WebLayer* HTMLMediaElement::platformLayer() const { return m_player ? m_player->platformLayer() : 0; } diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h index 3d24a88..6fa04cb 100644 --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h @@ -36,7 +36,7 @@ #include "platform/graphics/media/MediaPlayer.h" #include "public/platform/WebMimeRegistry.h" -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -74,7 +74,7 @@ class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, public Ac , private TextTrackClient { public: - static WebKit::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); + static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); MediaPlayer* player() const { return m_player.get(); } @@ -87,7 +87,7 @@ public: bool supportsSave() const; - WebKit::WebLayer* platformLayer() const; + blink::WebLayer* platformLayer() const; enum DelayedActionType { LoadMediaResource = 1 << 0, diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp index 327da68..08a3bc7 100644 --- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp @@ -157,7 +157,7 @@ String HTMLSelectElement::validationMessage() const if (customError()) return customValidationMessage(); if (valueMissing()) - return locale().queryString(WebKit::WebLocalizedString::ValidationValueMissingForSelect); + return locale().queryString(blink::WebLocalizedString::ValidationValueMissingForSelect); return String(); } diff --git a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp index 51cd2be..9c55a78 100644 --- a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp @@ -451,7 +451,7 @@ String HTMLTextAreaElement::validationMessage() const return customValidationMessage(); if (valueMissing()) - return locale().queryString(WebKit::WebLocalizedString::ValidationValueMissing); + return locale().queryString(blink::WebLocalizedString::ValidationValueMissing); if (tooLong()) return locale().validationMessageTooLongText(computeLengthForSubmission(value()), maxLength()); diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h index a7cefa3..2f5cd63 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h +++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h @@ -32,7 +32,7 @@ #include "wtf/Noncopyable.h" #include "wtf/text/StringHash.h" -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -59,7 +59,7 @@ public: virtual void paintRenderingResultsToCanvas() {} - virtual WebKit::WebLayer* platformLayer() const { return 0; } + virtual blink::WebLayer* platformLayer() const { return 0; } protected: CanvasRenderingContext(HTMLCanvasElement*); diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp index 065f8ea..48ecc6a8d 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp +++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp @@ -2310,7 +2310,7 @@ const Font& CanvasRenderingContext2D::accessFont() return state().m_font; } -WebKit::WebLayer* CanvasRenderingContext2D::platformLayer() const +blink::WebLayer* CanvasRenderingContext2D::platformLayer() const { return canvas()->buffer() ? canvas()->buffer()->platformLayer() : 0; } diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h index 31f474e..880127b 100644 --- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h +++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h @@ -41,7 +41,7 @@ #include "wtf/Vector.h" #include "wtf/text/WTFString.h" -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -330,7 +330,7 @@ private: virtual bool isTransformInvertible() const { return state().m_invertibleCTM; } - virtual WebKit::WebLayer* platformLayer() const OVERRIDE; + virtual blink::WebLayer* platformLayer() const OVERRIDE; Vector<State, 1> m_stateStack; unsigned m_unrealizedSaveCount; diff --git a/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.cpp index fc00cb2..229e2dd 100644 --- a/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.cpp +++ b/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.cpp @@ -4231,7 +4231,7 @@ void WebGLRenderingContext::forceRestoreContext() m_restoreTimer.startOneShot(0); } -WebKit::WebLayer* WebGLRenderingContext::platformLayer() const +blink::WebLayer* WebGLRenderingContext::platformLayer() const { return m_drawingBuffer->platformLayer(); } diff --git a/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h b/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h index c55146f..233270b 100644 --- a/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h +++ b/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h @@ -39,7 +39,7 @@ #include "wtf/OwnPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -315,7 +315,7 @@ public: GraphicsContext3D* graphicsContext3D() const { return m_context.get(); } WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); } - virtual WebKit::WebLayer* platformLayer() const; + virtual blink::WebLayer* platformLayer() const; void reshape(int width, int height); diff --git a/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp index 05f27a3..bf87e94 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseDateAndTimeInputType.cpp @@ -41,7 +41,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; using namespace std; diff --git a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp index e595534..ae9a7fe 100644 --- a/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/BaseMultipleFieldsDateAndTimeInputType.cpp @@ -289,7 +289,7 @@ BaseMultipleFieldsDateAndTimeInputType::~BaseMultipleFieldsDateAndTimeInputType( String BaseMultipleFieldsDateAndTimeInputType::badInputText() const { - return locale().queryString(WebKit::WebLocalizedString::ValidationBadInputForDateTime); + return locale().queryString(blink::WebLocalizedString::ValidationBadInputForDateTime); } void BaseMultipleFieldsDateAndTimeInputType::blur() diff --git a/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp b/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp index 19df75f..526c9ae 100644 --- a/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/CheckboxInputType.cpp @@ -57,7 +57,7 @@ bool CheckboxInputType::valueMissing(const String&) const String CheckboxInputType::valueMissingText() const { - return locale().queryString(WebKit::WebLocalizedString::ValidationValueMissingForCheckbox); + return locale().queryString(blink::WebLocalizedString::ValidationValueMissingForCheckbox); } void CheckboxInputType::handleKeyupEvent(KeyboardEvent* event) diff --git a/third_party/WebKit/Source/core/html/forms/DateInputType.cpp b/third_party/WebKit/Source/core/html/forms/DateInputType.cpp index b37f0d8..c75b4f3 100644 --- a/third_party/WebKit/Source/core/html/forms/DateInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateInputType.cpp @@ -41,7 +41,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; static const int dateDefaultStep = 1; diff --git a/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp b/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp index 1f3317d..8b1297b 100644 --- a/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/DateTimeLocalInputType.cpp @@ -43,7 +43,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; static const int dateTimeLocalDefaultStep = 60; diff --git a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp index 7259900..91f7bf8 100644 --- a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp @@ -38,7 +38,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; // http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address static const char localPartCharacters[] = "abcdefghijklmnopqrstuvwxyz0123456789!#$%&'*+/=?^_`{|}~.-"; @@ -88,7 +88,7 @@ String EmailInputType::convertEmailAddressToUnicode(const String& address) const return address; String languages = chrome()->client().acceptLanguages(); - String unicodeHost = WebKit::Platform::current()->convertIDNToUnicode(address.substring(atPosition + 1), languages); + String unicodeHost = blink::Platform::current()->convertIDNToUnicode(address.substring(atPosition + 1), languages); StringBuilder builder; builder.append(address, 0, atPosition + 1); builder.append(unicodeHost); diff --git a/third_party/WebKit/Source/core/html/forms/FileInputType.cpp b/third_party/WebKit/Source/core/html/forms/FileInputType.cpp index 2a2be02..f4d549d 100644 --- a/third_party/WebKit/Source/core/html/forms/FileInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/FileInputType.cpp @@ -45,7 +45,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; inline FileInputType::FileInputType(HTMLInputElement& element) diff --git a/third_party/WebKit/Source/core/html/forms/InputType.cpp b/third_party/WebKit/Source/core/html/forms/InputType.cpp index ff98bc8..5f0a221 100644 --- a/third_party/WebKit/Source/core/html/forms/InputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/InputType.cpp @@ -70,7 +70,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; using namespace std; diff --git a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp index a91d21a..010e253 100644 --- a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp @@ -47,7 +47,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; using namespace HTMLNames; using namespace std; diff --git a/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp b/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp index f851b6d..cf5b3378 100644 --- a/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/RadioInputType.cpp @@ -53,7 +53,7 @@ bool RadioInputType::valueMissing(const String&) const String RadioInputType::valueMissingText() const { - return locale().queryString(WebKit::WebLocalizedString::ValidationValueMissingForRadio); + return locale().queryString(blink::WebLocalizedString::ValidationValueMissingForRadio); } void RadioInputType::handleClickEvent(MouseEvent* event) diff --git a/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp b/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp index d1e07e5..c29546b 100644 --- a/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/ResetInputType.cpp @@ -66,7 +66,7 @@ void ResetInputType::handleDOMActivateEvent(Event* event) String ResetInputType::defaultValue() const { - return locale().queryString(WebKit::WebLocalizedString::ResetButtonDefaultLabel); + return locale().queryString(blink::WebLocalizedString::ResetButtonDefaultLabel); } bool ResetInputType::isTextButton() const diff --git a/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp b/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp index cda83bf..231f603 100644 --- a/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/SubmitInputType.cpp @@ -83,7 +83,7 @@ bool SubmitInputType::canBeSuccessfulSubmitButton() String SubmitInputType::defaultValue() const { - return locale().queryString(WebKit::WebLocalizedString::SubmitButtonDefaultLabel); + return locale().queryString(blink::WebLocalizedString::SubmitButtonDefaultLabel); } bool SubmitInputType::isSubmitButton() const diff --git a/third_party/WebKit/Source/core/html/forms/URLInputType.cpp b/third_party/WebKit/Source/core/html/forms/URLInputType.cpp index 404906a..0de752b 100644 --- a/third_party/WebKit/Source/core/html/forms/URLInputType.cpp +++ b/third_party/WebKit/Source/core/html/forms/URLInputType.cpp @@ -65,7 +65,7 @@ bool URLInputType::typeMismatch() const String URLInputType::typeMismatchText() const { - return locale().queryString(WebKit::WebLocalizedString::ValidationTypeMismatchForURL); + return locale().queryString(blink::WebLocalizedString::ValidationTypeMismatchForURL); } bool URLInputType::isURLField() const diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp index 182d2a7..5a0e30c 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp @@ -38,7 +38,7 @@ namespace WebCore { HTMLParserThread::HTMLParserThread() - : m_thread(adoptPtr(WebKit::Platform::current()->createThread("HTMLParserThread"))) + : m_thread(adoptPtr(blink::Platform::current()->createThread("HTMLParserThread"))) { } diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.h b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.h index 9e687de..e0b85f9 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.h +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.h @@ -46,7 +46,7 @@ private: HTMLParserThread(); ~HTMLParserThread(); - OwnPtr<WebKit::WebThread> m_thread; + OwnPtr<blink::WebThread> m_thread; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp index 95f3f14..6adba83 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLResourcePreloader.cpp @@ -93,7 +93,7 @@ void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) return; FetchRequest request = preload->resourceRequest(m_document); - WebKit::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20); + blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20); loadingDocument->fetcher()->preload(preload->resourceType(), request, preload->charset()); } diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp index f419b65..1c91015 100644 --- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp +++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp @@ -504,7 +504,7 @@ void HTMLTreeBuilder::processIsindexStartTagForInBody(AtomicHTMLToken* token) if (promptAttribute) processFakeCharacters(promptAttribute->value()); else - processFakeCharacters(Locale::defaultLocale().queryString(WebKit::WebLocalizedString::SearchableIndexIntroduction)); + processFakeCharacters(Locale::defaultLocale().queryString(blink::WebLocalizedString::SearchableIndexIntroduction)); processFakeStartTag(inputTag, attributesForIsindexInput(token)); notImplemented(); // This second set of characters may be needed by non-english locales. processFakeEndTag(labelTag); diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp index dc8c3b4..818089b 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElement.cpp @@ -39,7 +39,7 @@ using namespace HTMLNames; static String emptyValueAXText() { - return Locale::defaultLocale().queryString(WebKit::WebLocalizedString::AXDateTimeFieldEmptyValueText); + return Locale::defaultLocale().queryString(blink::WebLocalizedString::AXDateTimeFieldEmptyValueText); } DateTimeFieldElement::FieldOwner::~FieldOwner() diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp index 7949218..5353c04 100644 --- a/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp +++ b/third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp @@ -35,7 +35,7 @@ namespace WebCore { -using WebKit::WebLocalizedString; +using blink::WebLocalizedString; static String queryString(WebLocalizedString::Name name) { diff --git a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp index 5f4df0d..1d56a28 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp @@ -291,7 +291,7 @@ void InspectorLayerTreeAgent::compositingReasons(ErrorString* errorString, const const GraphicsLayer* graphicsLayer = layerById(errorString, layerId); if (!graphicsLayer) return; - WebKit::WebCompositingReasons reasonsBitmask = graphicsLayer->compositingReasons(); + blink::WebCompositingReasons reasonsBitmask = graphicsLayer->compositingReasons(); reasonStrings = TypeBuilder::Array<String>::create(); for (size_t i = 0; i < WTF_ARRAY_LENGTH(compositingReasonNames); ++i) { if (!(reasonsBitmask & compositingReasonNames[i].mask)) diff --git a/third_party/WebKit/Source/core/loader/CookieJar.cpp b/third_party/WebKit/Source/core/loader/CookieJar.cpp index df33648..8616606 100644 --- a/third_party/WebKit/Source/core/loader/CookieJar.cpp +++ b/third_party/WebKit/Source/core/loader/CookieJar.cpp @@ -43,21 +43,21 @@ namespace WebCore { -static WebKit::WebCookieJar* toCookieJar(const Document* document) +static blink::WebCookieJar* toCookieJar(const Document* document) { if (!document || !document->frame()) return 0; - WebKit::WebCookieJar* cookieJar = document->frame()->loader().client()->cookieJar(); + blink::WebCookieJar* cookieJar = document->frame()->loader().client()->cookieJar(); // FIXME: DRT depends on being able to get a cookie jar from Platform rather than // FrameLoaderClient. Delete this when DRT is deleted. if (!cookieJar) - cookieJar = WebKit::Platform::current()->cookieJar(); + cookieJar = blink::Platform::current()->cookieJar(); return cookieJar; } String cookies(const Document* document, const KURL& url) { - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return String(); return cookieJar->cookies(url, document->firstPartyForCookies()); @@ -65,7 +65,7 @@ String cookies(const Document* document, const KURL& url) void setCookies(Document* document, const KURL& url, const String& cookieString) { - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return; cookieJar->setCookie(url, document->firstPartyForCookies(), cookieString); @@ -73,7 +73,7 @@ void setCookies(Document* document, const KURL& url, const String& cookieString) bool cookiesEnabled(const Document* document) { - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return false; return cookieJar->cookiesEnabled(document->cookieURL(), document->firstPartyForCookies()); @@ -81,7 +81,7 @@ bool cookiesEnabled(const Document* document) String cookieRequestHeaderFieldValue(const Document* document, const KURL& url) { - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return String(); return cookieJar->cookieRequestHeaderFieldValue(url, document->firstPartyForCookies()); @@ -90,13 +90,13 @@ String cookieRequestHeaderFieldValue(const Document* document, const KURL& url) bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& cookies) { cookies.clear(); - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return false; - WebKit::WebVector<WebKit::WebCookie> webCookies; + blink::WebVector<blink::WebCookie> webCookies; cookieJar->rawCookies(url, document->firstPartyForCookies(), webCookies); for (unsigned i = 0; i < webCookies.size(); ++i) { - const WebKit::WebCookie& webCookie = webCookies[i]; + const blink::WebCookie& webCookie = webCookies[i]; cookies.append(Cookie(webCookie.name, webCookie.value, webCookie.domain, webCookie.path, webCookie.expires, webCookie.httpOnly, webCookie.secure, webCookie.session)); } @@ -105,7 +105,7 @@ bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& co void deleteCookie(const Document* document, const KURL& url, const String& cookieName) { - WebKit::WebCookieJar* cookieJar = toCookieJar(document); + blink::WebCookieJar* cookieJar = toCookieJar(document); if (!cookieJar) return; cookieJar->deleteCookie(url, cookieName); diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp index e0b54ac..7e8d4aa 100644 --- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp +++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp @@ -458,7 +458,7 @@ void DocumentLoader::willSendRequest(ResourceRequest& newRequest, const Resource static bool canShowMIMEType(const String& mimeType, Page* page) { - if (WebKit::Platform::current()->mimeRegistry()->supportsMIMEType(mimeType) == WebKit::WebMimeRegistry::IsSupported) + if (blink::Platform::current()->mimeRegistry()->supportsMIMEType(mimeType) == blink::WebMimeRegistry::IsSupported) return true; PluginData* pluginData = page->pluginData(); return !mimeType.isEmpty() && pluginData && pluginData->supportsMimeType(mimeType); diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.cpp b/third_party/WebKit/Source/core/loader/EmptyClients.cpp index 53c7ae2..5a7e2ca 100644 --- a/third_party/WebKit/Source/core/loader/EmptyClients.cpp +++ b/third_party/WebKit/Source/core/loader/EmptyClients.cpp @@ -142,7 +142,7 @@ void EmptyFrameLoaderClient::didRequestAutocomplete(PassRefPtr<FormState>) { } -PassOwnPtr<WebKit::WebServiceWorkerProvider> EmptyFrameLoaderClient::createServiceWorkerProvider(PassOwnPtr<WebKit::WebServiceWorkerProviderClient>) +PassOwnPtr<blink::WebServiceWorkerProvider> EmptyFrameLoaderClient::createServiceWorkerProvider(PassOwnPtr<blink::WebServiceWorkerProviderClient>) { return nullptr; } diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h index 2c171fb..48c24ae 100644 --- a/third_party/WebKit/Source/core/loader/EmptyClients.h +++ b/third_party/WebKit/Source/core/loader/EmptyClients.h @@ -135,7 +135,7 @@ public: virtual IntPoint screenToRootView(const IntPoint& p) const OVERRIDE { return p; } virtual IntRect rootViewToScreen(const IntRect& r) const OVERRIDE { return r; } - virtual WebKit::WebScreenInfo screenInfo() const OVERRIDE { return WebKit::WebScreenInfo(); } + virtual blink::WebScreenInfo screenInfo() const OVERRIDE { return blink::WebScreenInfo(); } virtual void contentsSizeChanged(Frame*, const IntSize&) const OVERRIDE { } virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned) OVERRIDE { } @@ -245,10 +245,10 @@ public: virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) OVERRIDE { } virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) OVERRIDE { return false; } - virtual WebKit::WebCookieJar* cookieJar() const { return 0; } + virtual blink::WebCookieJar* cookieJar() const { return 0; } virtual void didRequestAutocomplete(PassRefPtr<FormState>) OVERRIDE; - virtual PassOwnPtr<WebKit::WebServiceWorkerProvider> createServiceWorkerProvider(PassOwnPtr<WebKit::WebServiceWorkerProviderClient>) OVERRIDE; + virtual PassOwnPtr<blink::WebServiceWorkerProvider> createServiceWorkerProvider(PassOwnPtr<blink::WebServiceWorkerProviderClient>) OVERRIDE; }; class EmptyTextCheckerClient : public TextCheckerClient { diff --git a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h index 6069b0c..6321b68 100644 --- a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h +++ b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h @@ -44,7 +44,7 @@ class Context; template<class T> class Handle; } -namespace WebKit { +namespace blink { class WebCookieJar; class WebServiceWorkerProvider; class WebServiceWorkerProviderClient; @@ -201,7 +201,7 @@ class FetchRequest; // This callback is similar, but for plugins. virtual void didNotAllowPlugins() { } - virtual WebKit::WebCookieJar* cookieJar() const = 0; + virtual blink::WebCookieJar* cookieJar() const = 0; // Returns true if the embedder intercepted the postMessage call virtual bool willCheckAndDispatchMessageEvent(SecurityOrigin* /*target*/, MessageEvent*) const { return false; } @@ -227,7 +227,7 @@ class FetchRequest; virtual void dispatchDidChangeResourcePriority(unsigned long /*identifier*/, ResourceLoadPriority) { } - virtual PassOwnPtr<WebKit::WebServiceWorkerProvider> createServiceWorkerProvider(PassOwnPtr<WebKit::WebServiceWorkerProviderClient>) = 0; + virtual PassOwnPtr<blink::WebServiceWorkerProvider> createServiceWorkerProvider(PassOwnPtr<blink::WebServiceWorkerProviderClient>) = 0; virtual void didStopAllLoaders() { } diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp index ff4bbd2..c421759 100644 --- a/third_party/WebKit/Source/core/loader/PingLoader.cpp +++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp @@ -127,9 +127,9 @@ PingLoader::PingLoader(Frame* frame, ResourceRequest& request, StoredCredentials frame->loader().client()->didDispatchPingLoader(request.url()); unsigned long identifier = createUniqueIdentifier(); - m_loader = adoptPtr(WebKit::Platform::current()->createURLLoader()); + m_loader = adoptPtr(blink::Platform::current()->createURLLoader()); ASSERT(m_loader); - WebKit::WrappedResourceRequest wrappedRequest(request); + blink::WrappedResourceRequest wrappedRequest(request); wrappedRequest.setAllowStoredCredentials(credentialsAllowed == AllowStoredCredentials); m_loader->loadAsynchronously(wrappedRequest, this); diff --git a/third_party/WebKit/Source/core/loader/PingLoader.h b/third_party/WebKit/Source/core/loader/PingLoader.h index 45ef227..e22f84c 100644 --- a/third_party/WebKit/Source/core/loader/PingLoader.h +++ b/third_party/WebKit/Source/core/loader/PingLoader.h @@ -53,7 +53,7 @@ class ResourceResponse; // to allow the load to live long enough to ensure the message was actually sent. // Therefore, as soon as a callback is received from the ResourceHandle, this class // will cancel the load and delete itself. -class PingLoader : private WebKit::WebURLLoaderClient { +class PingLoader : private blink::WebURLLoaderClient { WTF_MAKE_NONCOPYABLE(PingLoader); WTF_MAKE_FAST_ALLOCATED; public: enum ViolationReportType { @@ -70,13 +70,13 @@ public: private: PingLoader(Frame*, ResourceRequest&, StoredCredentials = AllowStoredCredentials); - virtual void didReceiveResponse(WebKit::WebURLLoader*, const WebKit::WebURLResponse&) OVERRIDE { delete this; } - virtual void didReceiveData(WebKit::WebURLLoader*, const char*, int, int) OVERRIDE { delete this; } - virtual void didFinishLoading(WebKit::WebURLLoader*, double) OVERRIDE { delete this; } - virtual void didFail(WebKit::WebURLLoader*, const WebKit::WebURLError&) OVERRIDE { delete this; } + virtual void didReceiveResponse(blink::WebURLLoader*, const blink::WebURLResponse&) OVERRIDE { delete this; } + virtual void didReceiveData(blink::WebURLLoader*, const char*, int, int) OVERRIDE { delete this; } + virtual void didFinishLoading(blink::WebURLLoader*, double) OVERRIDE { delete this; } + virtual void didFail(blink::WebURLLoader*, const blink::WebURLError&) OVERRIDE { delete this; } void timeout(Timer<PingLoader>*) { delete this; } - OwnPtr<WebKit::WebURLLoader> m_loader; + OwnPtr<blink::WebURLLoader> m_loader; Timer<PingLoader> m_timeout; }; diff --git a/third_party/WebKit/Source/core/page/Chrome.cpp b/third_party/WebKit/Source/core/page/Chrome.cpp index d5e8867..a7ae353 100644 --- a/third_party/WebKit/Source/core/page/Chrome.cpp +++ b/third_party/WebKit/Source/core/page/Chrome.cpp @@ -91,7 +91,7 @@ IntRect Chrome::rootViewToScreen(const IntRect& rect) const return m_client->rootViewToScreen(rect); } -WebKit::WebScreenInfo Chrome::screenInfo() const +blink::WebScreenInfo Chrome::screenInfo() const { return m_client->screenInfo(); } diff --git a/third_party/WebKit/Source/core/page/Chrome.h b/third_party/WebKit/Source/core/page/Chrome.h index 304f518..2f10b72 100644 --- a/third_party/WebKit/Source/core/page/Chrome.h +++ b/third_party/WebKit/Source/core/page/Chrome.h @@ -66,7 +66,7 @@ public: virtual void scroll(const IntSize&, const IntRect&, const IntRect&) OVERRIDE; virtual IntPoint screenToRootView(const IntPoint&) const OVERRIDE; virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE; - virtual WebKit::WebScreenInfo screenInfo() const OVERRIDE; + virtual blink::WebScreenInfo screenInfo() const OVERRIDE; virtual void scheduleAnimation() OVERRIDE; diff --git a/third_party/WebKit/Source/core/page/ChromeClient.h b/third_party/WebKit/Source/core/page/ChromeClient.h index 1d98677..46a218d 100644 --- a/third_party/WebKit/Source/core/page/ChromeClient.h +++ b/third_party/WebKit/Source/core/page/ChromeClient.h @@ -148,7 +148,7 @@ public: virtual void scroll(const IntSize&, const IntRect&, const IntRect&) = 0; virtual IntPoint screenToRootView(const IntPoint&) const = 0; virtual IntRect rootViewToScreen(const IntRect&) const = 0; - virtual WebKit::WebScreenInfo screenInfo() const = 0; + virtual blink::WebScreenInfo screenInfo() const = 0; virtual void setCursor(const Cursor&) = 0; virtual void scheduleAnimation() = 0; // End methods used by HostWindow. diff --git a/third_party/WebKit/Source/core/page/PagePopupController.cpp b/third_party/WebKit/Source/core/page/PagePopupController.cpp index f204b24..961d96e 100644 --- a/third_party/WebKit/Source/core/page/PagePopupController.cpp +++ b/third_party/WebKit/Source/core/page/PagePopupController.cpp @@ -99,7 +99,7 @@ void PagePopupController::clearPagePopupClient() void PagePopupController::histogramEnumeration(const String& name, int sample, int boundaryValue) { - WebKit::Platform::current()->histogramEnumeration(name.utf8().data(), sample, boundaryValue); + blink::Platform::current()->histogramEnumeration(name.utf8().data(), sample, boundaryValue); } } diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp index ca72786..1905e88b 100644 --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp @@ -61,11 +61,11 @@ #include "public/platform/WebScrollbarThemePainter.h" #include "wtf/text/StringBuilder.h" -using WebKit::WebLayer; -using WebKit::WebLayerPositionConstraint; -using WebKit::WebRect; -using WebKit::WebScrollbarLayer; -using WebKit::WebVector; +using blink::WebLayer; +using blink::WebLayerPositionConstraint; +using blink::WebRect; +using blink::WebScrollbarLayer; +using blink::WebVector; namespace WebCore { @@ -219,18 +219,18 @@ void ScrollingCoordinator::removeWebScrollbarLayer(ScrollableArea* scrollableAre static PassOwnPtr<WebScrollbarLayer> createScrollbarLayer(Scrollbar* scrollbar) { ScrollbarTheme* theme = scrollbar->theme(); - WebKit::WebScrollbarThemePainter painter(theme, scrollbar); - OwnPtr<WebKit::WebScrollbarThemeGeometry> geometry(WebKit::WebScrollbarThemeGeometryNative::create(theme)); + blink::WebScrollbarThemePainter painter(theme, scrollbar); + OwnPtr<blink::WebScrollbarThemeGeometry> geometry(blink::WebScrollbarThemeGeometryNative::create(theme)); - OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createScrollbarLayer(new WebKit::WebScrollbarImpl(scrollbar), painter, geometry.leakPtr())); + OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createScrollbarLayer(new blink::WebScrollbarImpl(scrollbar), painter, geometry.leakPtr())); GraphicsLayer::registerContentsLayer(scrollbarLayer->layer()); return scrollbarLayer.release(); } PassOwnPtr<WebScrollbarLayer> ScrollingCoordinator::createSolidColorScrollbarLayer(ScrollbarOrientation orientation, int thumbThickness, bool isLeftSideVerticalScrollbar) { - WebKit::WebScrollbar::Orientation webOrientation = (orientation == HorizontalScrollbar) ? WebKit::WebScrollbar::Horizontal : WebKit::WebScrollbar::Vertical; - OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(webOrientation, thumbThickness, isLeftSideVerticalScrollbar)); + blink::WebScrollbar::Orientation webOrientation = (orientation == HorizontalScrollbar) ? blink::WebScrollbar::Horizontal : blink::WebScrollbar::Vertical; + OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(webOrientation, thumbThickness, isLeftSideVerticalScrollbar)); GraphicsLayer::registerContentsLayer(scrollbarLayer->layer()); return scrollbarLayer.release(); } @@ -257,7 +257,7 @@ static void setupScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer, WebScroll scrollbarGraphicsLayer->setDrawsContent(false); } -WebScrollbarLayer* ScrollingCoordinator::addWebScrollbarLayer(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, PassOwnPtr<WebKit::WebScrollbarLayer> scrollbarLayer) +WebScrollbarLayer* ScrollingCoordinator::addWebScrollbarLayer(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, PassOwnPtr<blink::WebScrollbarLayer> scrollbarLayer) { ScrollbarMap& scrollbars = orientation == HorizontalScrollbar ? m_horizontalScrollbars : m_verticalScrollbars; return scrollbars.add(scrollableArea, scrollbarLayer).iterator->value.get(); diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h index 0c42913..e0bebd9 100644 --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h @@ -32,7 +32,7 @@ #include "platform/scroll/ScrollTypes.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebLayer; class WebScrollbarLayer; } @@ -95,7 +95,7 @@ public: MainThreadScrollingReasons mainThreadScrollingReasons() const; bool shouldUpdateScrollLayerPositionOnMainThread() const { return mainThreadScrollingReasons() != 0; } - PassOwnPtr<WebKit::WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, bool isLeftSideVerticalScrollbar); + PassOwnPtr<blink::WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, bool isLeftSideVerticalScrollbar); void willDestroyScrollableArea(ScrollableArea*); // Returns true if the coordinator handled this change. @@ -140,7 +140,7 @@ private: bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const; void updateShouldUpdateScrollLayerPositionOnMainThread(); - static WebKit::WebLayer* scrollingWebLayerForScrollableArea(ScrollableArea*); + static blink::WebLayer* scrollingWebLayerForScrollableArea(ScrollableArea*); bool touchHitTestingEnabled() const; void setShouldHandleScrollGestureOnMainThreadRegion(const Region&); @@ -148,12 +148,12 @@ private: void computeTouchEventTargetRects(LayerHitTestRects&); void setWheelEventHandlerCount(unsigned); - WebKit::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<WebKit::WebScrollbarLayer>); - WebKit::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); + blink::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<blink::WebScrollbarLayer>); + blink::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); - typedef HashMap<ScrollableArea*, OwnPtr<WebKit::WebScrollbarLayer> > ScrollbarMap; + typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > ScrollbarMap; ScrollbarMap m_horizontalScrollbars; ScrollbarMap m_verticalScrollbars; HashSet<const RenderLayer*> m_layersWithTouchRects; diff --git a/third_party/WebKit/Source/core/platform/CryptoResult.h b/third_party/WebKit/Source/core/platform/CryptoResult.h index c62768c..45aaef5 100644 --- a/third_party/WebKit/Source/core/platform/CryptoResult.h +++ b/third_party/WebKit/Source/core/platform/CryptoResult.h @@ -42,14 +42,14 @@ public: virtual ~CryptoResult() { } virtual void completeWithError() = 0; - virtual void completeWithBuffer(const WebKit::WebArrayBuffer&) = 0; + virtual void completeWithBuffer(const blink::WebArrayBuffer&) = 0; virtual void completeWithBoolean(bool) = 0; - virtual void completeWithKey(const WebKit::WebCryptoKey&) = 0; - virtual void completeWithKeyPair(const WebKit::WebCryptoKey& publicKey, const WebKit::WebCryptoKey& privateKey) = 0; + virtual void completeWithKey(const blink::WebCryptoKey&) = 0; + virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) = 0; - WebKit::WebCryptoResult result() + blink::WebCryptoResult result() { - return WebKit::WebCryptoResult(this); + return blink::WebCryptoResult(this); } }; diff --git a/third_party/WebKit/Source/core/platform/DragData.cpp b/third_party/WebKit/Source/core/platform/DragData.cpp index ccc049b..a7f7486 100644 --- a/third_party/WebKit/Source/core/platform/DragData.cpp +++ b/third_party/WebKit/Source/core/platform/DragData.cpp @@ -81,7 +81,7 @@ String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) c if (m_platformDragData->types().contains(mimeTypeTextURIList)) m_platformDragData->urlAndTitle(url, title); else if (filenamePolicy == ConvertFilenames && containsFiles()) - url = KURL(WebKit::Platform::current()->fileUtilities()->filePathToURL(m_platformDragData->filenames()[0])); + url = KURL(blink::Platform::current()->fileUtilities()->filePathToURL(m_platformDragData->filenames()[0])); return url; } diff --git a/third_party/WebKit/Source/core/platform/Pasteboard.cpp b/third_party/WebKit/Source/core/platform/Pasteboard.cpp index c34633a..5f1b81e 100644 --- a/third_party/WebKit/Source/core/platform/Pasteboard.cpp +++ b/third_party/WebKit/Source/core/platform/Pasteboard.cpp @@ -62,18 +62,18 @@ Pasteboard* Pasteboard::generalPasteboard() } Pasteboard::Pasteboard() - : m_buffer(WebKit::WebClipboard::BufferStandard) + : m_buffer(blink::WebClipboard::BufferStandard) { } bool Pasteboard::isSelectionMode() const { - return m_buffer == WebKit::WebClipboard::BufferSelection; + return m_buffer == blink::WebClipboard::BufferSelection; } void Pasteboard::setSelectionMode(bool selectionMode) { - m_buffer = selectionMode ? WebKit::WebClipboard::BufferSelection : WebKit::WebClipboard::BufferStandard; + m_buffer = selectionMode ? blink::WebClipboard::BufferSelection : blink::WebClipboard::BufferStandard; } void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, const String& text) @@ -86,7 +86,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, #endif replaceNBSPWithSpace(plainText); - WebKit::Platform::current()->clipboard()->writeHTML(html, url, plainText, canSmartCopyOrDelete); + blink::Platform::current()->clipboard()->writeHTML(html, url, plainText, canSmartCopyOrDelete); } void Pasteboard::writePlainText(const String& text, SmartReplaceOption) @@ -95,9 +95,9 @@ void Pasteboard::writePlainText(const String& text, SmartReplaceOption) #if OS(WIN) String plainText(text); replaceNewlinesWithWindowsStyleNewlines(plainText); - WebKit::Platform::current()->clipboard()->writePlainText(plainText); + blink::Platform::current()->clipboard()->writePlainText(plainText); #else - WebKit::Platform::current()->clipboard()->writePlainText(text); + blink::Platform::current()->clipboard()->writePlainText(text); #endif } @@ -129,34 +129,34 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String& title) else if (node->hasTagName(HTMLNames::embedTag) || node->hasTagName(HTMLNames::objectTag)) urlString = toElement(node)->imageSourceURL(); KURL url = urlString.isEmpty() ? KURL() : node->document().completeURL(stripLeadingAndTrailingHTMLSpaces(urlString)); - WebKit::WebImage webImage = bitmap->bitmap(); - WebKit::Platform::current()->clipboard()->writeImage(webImage, WebKit::WebURL(url), WebKit::WebString(title)); + blink::WebImage webImage = bitmap->bitmap(); + blink::Platform::current()->clipboard()->writeImage(webImage, blink::WebURL(url), blink::WebString(title)); } void Pasteboard::writeDataObject(PassRefPtr<ChromiumDataObject> dataObject) { - WebKit::Platform::current()->clipboard()->writeDataObject(dataObject); + blink::Platform::current()->clipboard()->writeDataObject(dataObject); } bool Pasteboard::canSmartReplace() { - return WebKit::Platform::current()->clipboard()->isFormatAvailable(WebKit::WebClipboard::FormatSmartPaste, m_buffer); + return blink::Platform::current()->clipboard()->isFormatAvailable(blink::WebClipboard::FormatSmartPaste, m_buffer); } bool Pasteboard::isHTMLAvailable() { - return WebKit::Platform::current()->clipboard()->isFormatAvailable(WebKit::WebClipboard::FormatHTML, m_buffer); + return blink::Platform::current()->clipboard()->isFormatAvailable(blink::WebClipboard::FormatHTML, m_buffer); } String Pasteboard::plainText() { - return WebKit::Platform::current()->clipboard()->readPlainText(m_buffer); + return blink::Platform::current()->clipboard()->readPlainText(m_buffer); } String Pasteboard::readHTML(KURL& url, unsigned& fragmentStart, unsigned& fragmentEnd) { - WebKit::WebURL webURL; - WebKit::WebString markup = WebKit::Platform::current()->clipboard()->readHTML(m_buffer, &webURL, &fragmentStart, &fragmentEnd); + blink::WebURL webURL; + blink::WebString markup = blink::Platform::current()->clipboard()->readHTML(m_buffer, &webURL, &fragmentStart, &fragmentEnd); if (!markup.isEmpty()) { url = webURL; // fragmentStart and fragmentEnd are populated by WebClipboard::readHTML. diff --git a/third_party/WebKit/Source/core/platform/Pasteboard.h b/third_party/WebKit/Source/core/platform/Pasteboard.h index 4664460..fb5b596 100644 --- a/third_party/WebKit/Source/core/platform/Pasteboard.h +++ b/third_party/WebKit/Source/core/platform/Pasteboard.h @@ -70,12 +70,12 @@ public: bool isSelectionMode() const; void setSelectionMode(bool); - WebKit::WebClipboard::Buffer buffer() const { return m_buffer; } + blink::WebClipboard::Buffer buffer() const { return m_buffer; } private: Pasteboard(); - WebKit::WebClipboard::Buffer m_buffer; + blink::WebClipboard::Buffer m_buffer; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.cpp b/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.cpp index 0744d83..60a7683 100644 --- a/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.cpp +++ b/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.cpp @@ -48,7 +48,7 @@ PlatformSpeechSynthesizer::PlatformSpeechSynthesizer(PlatformSpeechSynthesizerCl : m_speechSynthesizerClient(client) { m_webSpeechSynthesizerClient = adoptPtr(new WebSpeechSynthesizerClientImpl(this, client)); - m_webSpeechSynthesizer = adoptPtr(WebKit::Platform::current()->createSpeechSynthesizer(m_webSpeechSynthesizerClient.get())); + m_webSpeechSynthesizer = adoptPtr(blink::Platform::current()->createSpeechSynthesizer(m_webSpeechSynthesizerClient.get())); } PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer() @@ -60,7 +60,7 @@ void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtteranc if (!m_webSpeechSynthesizer || !m_webSpeechSynthesizerClient) return; - m_webSpeechSynthesizer->speak(WebKit::WebSpeechSynthesisUtterance(utterance)); + m_webSpeechSynthesizer->speak(blink::WebSpeechSynthesisUtterance(utterance)); } void PlatformSpeechSynthesizer::pause() diff --git a/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.h b/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.h index 3d1b815..ced73ff 100644 --- a/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.h +++ b/third_party/WebKit/Source/core/platform/PlatformSpeechSynthesizer.h @@ -30,7 +30,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { class WebSpeechSynthesizer; class WebSpeechSynthesizerClient; } @@ -81,8 +81,8 @@ protected: private: PlatformSpeechSynthesizerClient* m_speechSynthesizerClient; - OwnPtr<WebKit::WebSpeechSynthesizer> m_webSpeechSynthesizer; - OwnPtr<WebKit::WebSpeechSynthesizerClient> m_webSpeechSynthesizerClient; + OwnPtr<blink::WebSpeechSynthesizer> m_webSpeechSynthesizer; + OwnPtr<blink::WebSpeechSynthesizerClient> m_webSpeechSynthesizerClient; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/core/platform/ScrollbarThemeGtkOrAura.cpp b/third_party/WebKit/Source/core/platform/ScrollbarThemeGtkOrAura.cpp index da0b409..4f3f97d 100644 --- a/third_party/WebKit/Source/core/platform/ScrollbarThemeGtkOrAura.cpp +++ b/third_party/WebKit/Source/core/platform/ScrollbarThemeGtkOrAura.cpp @@ -56,70 +56,70 @@ ScrollbarTheme* ScrollbarTheme::nativeTheme() int ScrollbarThemeGtkOrAura::scrollbarThickness(ScrollbarControlSize controlSize) { // Horiz and Vert scrollbars are the same thickness. - IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalTrack); + IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarVerticalTrack); return scrollbarSize.width(); } void ScrollbarThemeGtkOrAura::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType) { - WebKit::WebThemeEngine::State state = scrollbar->hoveredPart() == partType ? WebKit::WebThemeEngine::StateHover : WebKit::WebThemeEngine::StateNormal; + blink::WebThemeEngine::State state = scrollbar->hoveredPart() == partType ? blink::WebThemeEngine::StateHover : blink::WebThemeEngine::StateNormal; IntRect alignRect = trackRect(scrollbar, false); - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = gc->canvas(); extraParams.scrollbarTrack.trackX = alignRect.x(); extraParams.scrollbarTrack.trackY = alignRect.y(); extraParams.scrollbarTrack.trackWidth = alignRect.width(); extraParams.scrollbarTrack.trackHeight = alignRect.height(); - WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalTrack : WebKit::WebThemeEngine::PartScrollbarVerticalTrack, state, WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? blink::WebThemeEngine::PartScrollbarHorizontalTrack : blink::WebThemeEngine::PartScrollbarVerticalTrack, state, blink::WebRect(rect), &extraParams); } void ScrollbarThemeGtkOrAura::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) { - WebKit::WebThemeEngine::Part paintPart; - WebKit::WebThemeEngine::State state = WebKit::WebThemeEngine::StateNormal; - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebThemeEngine::Part paintPart; + blink::WebThemeEngine::State state = blink::WebThemeEngine::StateNormal; + blink::WebCanvas* canvas = gc->canvas(); bool checkMin = false; bool checkMax = false; if (scrollbar->orientation() == HorizontalScrollbar) { if (part == BackButtonStartPart) { - paintPart = WebKit::WebThemeEngine::PartScrollbarLeftArrow; + paintPart = blink::WebThemeEngine::PartScrollbarLeftArrow; checkMin = true; } else { - paintPart = WebKit::WebThemeEngine::PartScrollbarRightArrow; + paintPart = blink::WebThemeEngine::PartScrollbarRightArrow; checkMax = true; } } else { if (part == BackButtonStartPart) { - paintPart = WebKit::WebThemeEngine::PartScrollbarUpArrow; + paintPart = blink::WebThemeEngine::PartScrollbarUpArrow; checkMin = true; } else { - paintPart = WebKit::WebThemeEngine::PartScrollbarDownArrow; + paintPart = blink::WebThemeEngine::PartScrollbarDownArrow; checkMax = true; } } if ((checkMin && (scrollbar->currentPos() <= 0)) || (checkMax && scrollbar->currentPos() == scrollbar->maximum())) { - state = WebKit::WebThemeEngine::StateDisabled; + state = blink::WebThemeEngine::StateDisabled; } else { if (part == scrollbar->pressedPart()) - state = WebKit::WebThemeEngine::StatePressed; + state = blink::WebThemeEngine::StatePressed; else if (part == scrollbar->hoveredPart()) - state = WebKit::WebThemeEngine::StateHover; + state = blink::WebThemeEngine::StateHover; } - WebKit::Platform::current()->themeEngine()->paint(canvas, paintPart, state, WebKit::WebRect(rect), 0); + blink::Platform::current()->themeEngine()->paint(canvas, paintPart, state, blink::WebRect(rect), 0); } void ScrollbarThemeGtkOrAura::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) { - WebKit::WebThemeEngine::State state; - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebThemeEngine::State state; + blink::WebCanvas* canvas = gc->canvas(); if (scrollbar->pressedPart() == ThumbPart) - state = WebKit::WebThemeEngine::StatePressed; + state = blink::WebThemeEngine::StatePressed; else if (scrollbar->hoveredPart() == ThumbPart) - state = WebKit::WebThemeEngine::StateHover; + state = blink::WebThemeEngine::StateHover; else - state = WebKit::WebThemeEngine::StateNormal; - WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalThumb : WebKit::WebThemeEngine::PartScrollbarVerticalThumb, state, WebKit::WebRect(rect), 0); + state = blink::WebThemeEngine::StateNormal; + blink::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? blink::WebThemeEngine::PartScrollbarHorizontalThumb : blink::WebThemeEngine::PartScrollbarVerticalThumb, state, blink::WebRect(rect), 0); } bool ScrollbarThemeGtkOrAura::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt) @@ -130,23 +130,23 @@ bool ScrollbarThemeGtkOrAura::shouldCenterOnThumb(ScrollbarThemeClient*, const P IntSize ScrollbarThemeGtkOrAura::buttonSize(ScrollbarThemeClient* scrollbar) { if (scrollbar->orientation() == VerticalScrollbar) { - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarUpArrow); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarUpArrow); return IntSize(size.width(), scrollbar->height() < 2 * size.height() ? scrollbar->height() / 2 : size.height()); } // HorizontalScrollbar - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarLeftArrow); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarLeftArrow); return IntSize(scrollbar->width() < 2 * size.width() ? scrollbar->width() / 2 : size.width(), size.height()); } int ScrollbarThemeGtkOrAura::minimumThumbLength(ScrollbarThemeClient* scrollbar) { if (scrollbar->orientation() == VerticalScrollbar) { - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalThumb); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarVerticalThumb); return size.height(); } - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarHorizontalThumb); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarHorizontalThumb); return size.width(); } diff --git a/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp b/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp index 78086bf..8814377 100644 --- a/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp +++ b/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp @@ -65,7 +65,7 @@ int ScrollbarThemeWin::scrollbarThickness(ScrollbarControlSize controlSize) if (!thickness) { if (isRunningLayoutTest()) return kMacScrollbarSize[controlSize]; - thickness = IntSize(WebKit::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); + thickness = IntSize(blink::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); } return thickness; } @@ -105,9 +105,9 @@ void ScrollbarThemeWin::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClien IntRect alignRect = trackRect(scrollbar, false); - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebCanvas* canvas = gc->canvas(); // Draw the track area before/after the thumb on the scroll bar. - WebKit::Platform::current()->themeEngine()->paintScrollbarTrack(canvas, partId, getThemeState(scrollbar, partType), getClassicThemeState(scrollbar, partType), WebKit::WebRect(rect), WebKit::WebRect(alignRect)); + blink::Platform::current()->themeEngine()->paintScrollbarTrack(canvas, partId, getThemeState(scrollbar, partType), getClassicThemeState(scrollbar, partType), blink::WebRect(rect), blink::WebRect(alignRect)); } void ScrollbarThemeWin::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) @@ -120,21 +120,21 @@ void ScrollbarThemeWin::paintButton(GraphicsContext* gc, ScrollbarThemeClient* s else partId = horz ? DFCS_SCROLLRIGHT : DFCS_SCROLLDOWN; - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebCanvas* canvas = gc->canvas(); // Draw the thumb (the box you drag in the scroll bar to scroll). - WebKit::Platform::current()->themeEngine()->paintScrollbarArrow(canvas, getThemeArrowState(scrollbar, part), partId | getClassicThemeState(scrollbar, part), WebKit::WebRect(rect)); + blink::Platform::current()->themeEngine()->paintScrollbarArrow(canvas, getThemeArrowState(scrollbar, part), partId | getClassicThemeState(scrollbar, part), blink::WebRect(rect)); } void ScrollbarThemeWin::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) { bool horz = scrollbar->orientation() == HorizontalScrollbar; - WebKit::WebCanvas* canvas = gc->canvas(); + blink::WebCanvas* canvas = gc->canvas(); // Draw the thumb (the box you drag in the scroll bar to scroll). - WebKit::Platform::current()->themeEngine()->paintScrollbarThumb(canvas, horz ? SBP_THUMBBTNHORZ : SBP_THUMBBTNVERT, getThemeState(scrollbar, ThumbPart), getClassicThemeState(scrollbar, ThumbPart), WebKit::WebRect(rect)); + blink::Platform::current()->themeEngine()->paintScrollbarThumb(canvas, horz ? SBP_THUMBBTNHORZ : SBP_THUMBBTNVERT, getThemeState(scrollbar, ThumbPart), getClassicThemeState(scrollbar, ThumbPart), blink::WebRect(rect)); // Draw the gripper (the three little lines on the thumb). - WebKit::Platform::current()->themeEngine()->paintScrollbarThumb(canvas, horz ? SBP_GRIPPERHORZ : SBP_GRIPPERVERT, getThemeState(scrollbar, ThumbPart), getClassicThemeState(scrollbar, ThumbPart), WebKit::WebRect(rect)); + blink::Platform::current()->themeEngine()->paintScrollbarThumb(canvas, horz ? SBP_GRIPPERHORZ : SBP_GRIPPERVERT, getThemeState(scrollbar, ThumbPart), getClassicThemeState(scrollbar, ThumbPart), blink::WebRect(rect)); } int ScrollbarThemeWin::getThemeState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const diff --git a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.cpp b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.cpp index f35df95..834c6dc 100644 --- a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.cpp +++ b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.cpp @@ -56,7 +56,7 @@ #include "wtf/text/CString.h" using namespace std; -using namespace WebKit; +using namespace blink; namespace WebCore { @@ -138,7 +138,7 @@ PassOwnPtr<WebTransformOperations> toWebTransformOperations(const TransformOpera } template <class Value, class Keyframe, class Curve> -bool appendKeyframeWithStandardTimingFunction(Curve* curve, double keyTime, const Value* value, const Value* lastValue, WebKit::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize&) +bool appendKeyframeWithStandardTimingFunction(Curve* curve, double keyTime, const Value* value, const Value* lastValue, blink::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize&) { curve->add(Keyframe(keyTime, value->value()), timingFunctionType); return true; @@ -152,7 +152,7 @@ bool appendKeyframeWithCustomBezierTimingFunction(Curve* curve, double keyTime, } template <> -bool appendKeyframeWithStandardTimingFunction<TransformAnimationValue, WebTransformKeyframe, WebTransformAnimationCurve>(WebTransformAnimationCurve* curve, double keyTime, const TransformAnimationValue* value, const TransformAnimationValue* lastValue, WebKit::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize& boxSize) +bool appendKeyframeWithStandardTimingFunction<TransformAnimationValue, WebTransformKeyframe, WebTransformAnimationCurve>(WebTransformAnimationCurve* curve, double keyTime, const TransformAnimationValue* value, const TransformAnimationValue* lastValue, blink::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize& boxSize) { bool canBlend = !lastValue; OwnPtr<WebTransformOperations> operations(toWebTransformOperations(*value->value(), boxSize)); @@ -192,7 +192,7 @@ bool appendKeyframeWithCustomBezierTimingFunction<TransformAnimationValue, WebTr } template <> -bool appendKeyframeWithStandardTimingFunction<FilterAnimationValue, WebFilterKeyframe, WebFilterAnimationCurve>(WebFilterAnimationCurve* curve, double keyTime, const FilterAnimationValue* value, const FilterAnimationValue* lastValue, WebKit::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize& boxSize) +bool appendKeyframeWithStandardTimingFunction<FilterAnimationValue, WebFilterKeyframe, WebFilterAnimationCurve>(WebFilterAnimationCurve* curve, double keyTime, const FilterAnimationValue* value, const FilterAnimationValue* lastValue, blink::WebAnimationCurve::TimingFunctionType timingFunctionType, const FloatSize& boxSize) { // FIXME(ajuma): In order to animate pixel-moving filters on the compositor thread, we need // to update overlap testing to take into account the bounds within which the animation @@ -230,7 +230,7 @@ bool appendKeyframeWithCustomBezierTimingFunction<FilterAnimationValue, WebFilte } template <class Value, class Keyframe, class Curve> -PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& valueList, const CSSAnimationData* animation, int animationId, double timeOffset, Curve* curve, WebKit::WebAnimation::TargetProperty targetProperty, const FloatSize& boxSize) +PassOwnPtr<blink::WebAnimation> createWebAnimation(const KeyframeValueList& valueList, const CSSAnimationData* animation, int animationId, double timeOffset, Curve* curve, blink::WebAnimation::TargetProperty targetProperty, const FloatSize& boxSize) { bool alternate = false; bool reverse = false; @@ -257,7 +257,7 @@ PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& val originalTimingFunction = animation->timingFunction(); // Ease is the default timing function. - WebKit::WebAnimationCurve::TimingFunctionType timingFunctionType = WebKit::WebAnimationCurve::TimingFunctionTypeEase; + blink::WebAnimationCurve::TimingFunctionType timingFunctionType = blink::WebAnimationCurve::TimingFunctionTypeEase; bool isUsingCustomBezierTimingFunction = false; double x1 = 0; @@ -271,7 +271,7 @@ PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& val // FIXME: add support for steps timing function. return nullptr; case TimingFunction::LinearFunction: - timingFunctionType = WebKit::WebAnimationCurve::TimingFunctionTypeLinear; + timingFunctionType = blink::WebAnimationCurve::TimingFunctionTypeLinear; break; case TimingFunction::CubicBezierFunction: { @@ -303,7 +303,7 @@ PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& val return nullptr; } - OwnPtr<WebKit::WebAnimation> webAnimation = adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, targetProperty, animationId)); + OwnPtr<blink::WebAnimation> webAnimation = adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, targetProperty, animationId)); int iterations = (animation && animation->isIterationCountSet()) ? animation->iterationCount() : 1; webAnimation->setIterations(iterations); @@ -315,22 +315,22 @@ PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& val return webAnimation.release(); } -PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& values, const CSSAnimationData* animation, int animationId, double timeOffset, const FloatSize& boxSize) +PassOwnPtr<blink::WebAnimation> createWebAnimation(const KeyframeValueList& values, const CSSAnimationData* animation, int animationId, double timeOffset, const FloatSize& boxSize) { switch (values.property()) { case AnimatedPropertyWebkitTransform: { OwnPtr<WebTransformAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createTransformAnimationCurve()); - return createWebAnimation<TransformAnimationValue, WebTransformKeyframe, WebTransformAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), WebKit::WebAnimation::TargetPropertyTransform, FloatSize(boxSize)); + return createWebAnimation<TransformAnimationValue, WebTransformKeyframe, WebTransformAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), blink::WebAnimation::TargetPropertyTransform, FloatSize(boxSize)); } case AnimatedPropertyOpacity: { OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createFloatAnimationCurve()); - return createWebAnimation<FloatAnimationValue, WebFloatKeyframe, WebFloatAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), WebKit::WebAnimation::TargetPropertyOpacity, FloatSize()); + return createWebAnimation<FloatAnimationValue, WebFloatKeyframe, WebFloatAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), blink::WebAnimation::TargetPropertyOpacity, FloatSize()); } case AnimatedPropertyWebkitFilter: { OwnPtr<WebFilterAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createFilterAnimationCurve()); - return createWebAnimation<FilterAnimationValue, WebFilterKeyframe, WebFilterAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), WebKit::WebAnimation::TargetPropertyFilter, FloatSize(boxSize)); + return createWebAnimation<FilterAnimationValue, WebFilterKeyframe, WebFilterAnimationCurve>(values, animation, animationId, timeOffset, curve.get(), blink::WebAnimation::TargetPropertyFilter, FloatSize(boxSize)); } case AnimatedPropertyBackgroundColor: diff --git a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.h b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.h index 95af52a..5ac2321 100644 --- a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.h +++ b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtil.h @@ -33,7 +33,7 @@ #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { class WebAnimation; } @@ -49,7 +49,7 @@ class FloatSize; // - a steps timing function is used, // - a property other than AnimatedPropertyWebkitTransform, or AnimatedPropertyOpacity is animated, or // - a transform animation involves a non-invertable transform. -PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList&, const CSSAnimationData*, int animationId, double timeOffset, const FloatSize& boxSize); +PassOwnPtr<blink::WebAnimation> createWebAnimation(const KeyframeValueList&, const CSSAnimationData*, int animationId, double timeOffset, const FloatSize& boxSize); } // namespace WebCore diff --git a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtilTest.cpp b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtilTest.cpp index edd0c71..715d2bf 100644 --- a/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtilTest.cpp +++ b/third_party/WebKit/Source/core/platform/animation/AnimationTranslationUtilTest.cpp @@ -40,7 +40,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp b/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp index f649954..ead88d8 100644 --- a/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp @@ -47,10 +47,10 @@ namespace WebCore { PassRefPtr<ChromiumDataObject> ChromiumDataObject::createFromPasteboard(PasteMode pasteMode) { RefPtr<ChromiumDataObject> dataObject = create(); - WebKit::WebClipboard::Buffer buffer = Pasteboard::generalPasteboard()->buffer(); - uint64_t sequenceNumber = WebKit::Platform::current()->clipboard()->sequenceNumber(buffer); + blink::WebClipboard::Buffer buffer = Pasteboard::generalPasteboard()->buffer(); + uint64_t sequenceNumber = blink::Platform::current()->clipboard()->sequenceNumber(buffer); bool ignored; - WebKit::WebVector<WebKit::WebString> webTypes = WebKit::Platform::current()->clipboard()->readAvailableTypes(buffer, &ignored); + blink::WebVector<blink::WebString> webTypes = blink::Platform::current()->clipboard()->readAvailableTypes(buffer, &ignored); ListHashSet<String> types; for (size_t i = 0; i < webTypes.size(); ++i) types.add(webTypes[i]); diff --git a/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.cpp b/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.cpp index 601bc60..321226c 100644 --- a/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObjectItem.cpp @@ -138,7 +138,7 @@ PassRefPtr<Blob> ChromiumDataObjectItem::getAsFile() const // method to the blob registry; that way the data is only copied over // into the renderer when it's actually read, not when the blob is // initially constructed). - RefPtr<SharedBuffer> data = static_cast<PassRefPtr<SharedBuffer> >(WebKit::Platform::current()->clipboard()->readImage(WebKit::WebClipboard::BufferStandard)); + RefPtr<SharedBuffer> data = static_cast<PassRefPtr<SharedBuffer> >(blink::Platform::current()->clipboard()->readImage(blink::WebClipboard::BufferStandard)); RefPtr<RawData> rawData = RawData::create(); rawData->mutableData()->append(data->data(), data->size()); OwnPtr<BlobData> blobData = BlobData::create(); @@ -159,19 +159,19 @@ String ChromiumDataObjectItem::internalGetAsString() const ASSERT(m_source == PasteboardSource); - WebKit::WebClipboard::Buffer buffer = Pasteboard::generalPasteboard()->buffer(); + blink::WebClipboard::Buffer buffer = Pasteboard::generalPasteboard()->buffer(); String data; // This is ugly but there's no real alternative. if (m_type == mimeTypeTextPlain) - data = WebKit::Platform::current()->clipboard()->readPlainText(buffer); + data = blink::Platform::current()->clipboard()->readPlainText(buffer); else if (m_type == mimeTypeTextHTML) { - WebKit::WebURL ignoredSourceURL; + blink::WebURL ignoredSourceURL; unsigned ignored; - data = WebKit::Platform::current()->clipboard()->readHTML(buffer, &ignoredSourceURL, &ignored, &ignored); + data = blink::Platform::current()->clipboard()->readHTML(buffer, &ignoredSourceURL, &ignored, &ignored); } else - data = WebKit::Platform::current()->clipboard()->readCustomData(buffer, m_type); + data = blink::Platform::current()->clipboard()->readCustomData(buffer, m_type); - return WebKit::Platform::current()->clipboard()->sequenceNumber(buffer) == m_sequenceNumber ? data : String(); + return blink::Platform::current()->clipboard()->sequenceNumber(buffer) == m_sequenceNumber ? data : String(); } bool ChromiumDataObjectItem::isFilename() const diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebArrayBuffer.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebArrayBuffer.cpp index 3b01f5e1..449e332 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebArrayBuffer.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebArrayBuffer.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebArrayBuffer WebArrayBuffer::create(unsigned numElements, unsigned elementByteSize) { @@ -100,4 +100,4 @@ WebArrayBuffer::operator WTF::PassRefPtr<WTF::ArrayBuffer>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebCrypto.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebCrypto.cpp index 0d58262..3fd68af 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebCrypto.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebCrypto.cpp @@ -35,7 +35,7 @@ #include "public/platform/WebArrayBuffer.h" #include <string.h> -namespace WebKit { +namespace blink { void WebCryptoResult::completeWithError() { @@ -52,7 +52,7 @@ void WebCryptoResult::completeWithBuffer(const WebArrayBuffer& buffer) void WebCryptoResult::completeWithBuffer(const void* bytes, unsigned bytesSize) { - WebArrayBuffer buffer = WebKit::WebArrayBuffer::create(bytesSize, 1); + WebArrayBuffer buffer = blink::WebArrayBuffer::create(bytesSize, 1); RELEASE_ASSERT(!buffer.isNull()); memcpy(buffer.data(), bytes, bytesSize); completeWithBuffer(buffer); @@ -95,4 +95,4 @@ void WebCryptoResult::assign(const WebCryptoResult& o) m_impl = o.m_impl; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebCursorInfo.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebCursorInfo.cpp index 0e7dfa5..e2fc7bd 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebCursorInfo.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebCursorInfo.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebCursorInfo::WebCursorInfo(const Cursor& cursor) : type(static_cast<Type>(cursor.type())) @@ -48,4 +48,4 @@ WebCursorInfo::WebCursorInfo(const Cursor& cursor) { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaConstraints.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaConstraints.cpp index 828ca30..adb872c 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaConstraints.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaConstraints.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebMediaConstraint::WebMediaConstraint(const WebCore::MediaConstraint& other) : m_name(other.m_name) @@ -104,5 +104,5 @@ bool WebMediaConstraints::getOptionalConstraintValue(const WebString& name, WebS return false; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStream.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStream.cpp index 43e7b79..20434e1 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStream.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStream.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -158,4 +158,4 @@ void WebMediaStream::assign(const WebMediaStream& other) m_private = other.m_private; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamSource.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamSource.cpp index 618ffed..ab1304d 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamSource.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamSource.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -212,7 +212,7 @@ void ConsumerWrapper::consumeAudio(AudioBus* bus, size_t numberOfFrames) // Wrap AudioBus. size_t numberOfChannels = bus->numberOfChannels(); - WebKit::WebVector<const float*> busVector(numberOfChannels); + blink::WebVector<const float*> busVector(numberOfChannels); for (size_t i = 0; i < numberOfChannels; ++i) busVector[i] = bus->channel(i)->data(); @@ -243,4 +243,4 @@ bool WebMediaStreamSource::removeAudioConsumer(WebAudioDestinationConsumer* cons return false; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp index c7e6721..f100055 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -143,4 +143,4 @@ void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) m_private = other.m_private; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescription.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescription.cpp index 6a9d860..1fc0caf 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescription.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescription.cpp @@ -36,7 +36,7 @@ #include "wtf/RefCounted.h" #include "public/platform/WebString.h" -namespace WebKit { +namespace blink { class WebRTCSessionDescriptionPrivate FINAL : public RefCounted<WebRTCSessionDescriptionPrivate> { public: @@ -105,5 +105,5 @@ void WebRTCSessionDescription::setSDP(const WebString& sdp) return m_private->setSdp(sdp); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp index 7575a51..4a1cfe3 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -94,5 +94,5 @@ void WebRTCSessionDescriptionRequest::setExtraData(ExtraData* extraData) m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData))); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsRequest.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsRequest.cpp index c5c925a..617bd56 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsRequest.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsRequest.cpp @@ -41,7 +41,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebRTCStatsRequest::WebRTCStatsRequest(const PassRefPtr<RTCStatsRequest>& request) : m_private(request) @@ -83,4 +83,4 @@ void WebRTCStatsRequest::requestSucceeded(const WebRTCStatsResponse& response) c m_private->requestSucceeded(response); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsResponse.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsResponse.cpp index 59a6191..bf6c86e 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsResponse.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCStatsResponse.cpp @@ -31,7 +31,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebRTCStatsResponse::WebRTCStatsResponse(const PassRefPtr<RTCStatsResponseBase>& request) : m_private(request) @@ -65,5 +65,5 @@ void WebRTCStatsResponse::addStatistic(size_t report, WebString name, WebString m_private->addStatistic(report, name, value); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCVoidRequest.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCVoidRequest.cpp index 0f5603b..b19097b 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebRTCVoidRequest.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebRTCVoidRequest.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -93,5 +93,5 @@ void WebRTCVoidRequest::setExtraData(ExtraData* extraData) m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData))); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.cpp index 53b0d49..b8a9106 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.cpp @@ -29,7 +29,7 @@ #include "core/platform/Scrollbar.h" #include "platform/geometry/IntRect.h" -namespace WebKit { +namespace blink { WebScrollbarImpl::WebScrollbarImpl(WebCore::Scrollbar* scrollbar) : m_scrollbar(scrollbar) @@ -138,4 +138,4 @@ void WebScrollbarImpl::setIsAlphaLocked(bool flag) m_scrollbar->setIsAlphaLocked(flag); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.h b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.h index e5459de..2be73d5 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.h +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarImpl.h @@ -31,13 +31,13 @@ namespace WebCore { class Scrollbar; } -namespace WebKit { +namespace blink { class WebScrollbarImpl : public WebScrollbar { public: explicit WebScrollbarImpl(WebCore::Scrollbar*); - // Implement WebKit::WebScrollbar methods + // Implement blink::WebScrollbar methods virtual bool isOverlay() const OVERRIDE; virtual int value() const OVERRIDE; virtual WebPoint location() const OVERRIDE; @@ -62,6 +62,6 @@ private: RefPtr<WebCore::Scrollbar> m_scrollbar; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.cpp index 333a564..f75ebe2 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.cpp @@ -28,7 +28,7 @@ #include "core/platform/chromium/support/WebScrollbarThemeClientImpl.h" #include "core/platform/ScrollbarTheme.h" -using WebKit::WebScrollbar; +using blink::WebScrollbar; namespace WebCore { @@ -117,7 +117,7 @@ WebCore::ScrollbarOverlayStyle WebScrollbarThemeClientImpl::scrollbarOverlayStyl void WebScrollbarThemeClientImpl::getTickmarks(Vector<IntRect>& tickmarks) const { - WebKit::WebVector<WebKit::WebRect> webTickmarks; + blink::WebVector<blink::WebRect> webTickmarks; m_scrollbar->getTickmarks(webTickmarks); tickmarks.resize(webTickmarks.size()); for (size_t i = 0; i < webTickmarks.size(); ++i) @@ -228,4 +228,4 @@ void WebScrollbarThemeClientImpl::setIsAlphaLocked(bool flag) m_scrollbar->setIsAlphaLocked(flag); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.h b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.h index 30e7738..976a6bd6e 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.h +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeClientImpl.h @@ -39,7 +39,7 @@ class WebScrollbarThemeClientImpl : public ScrollbarThemeClient { public: // Caller must retain ownership of this pointer and ensure that its lifetime // exceeds this instance. - WebScrollbarThemeClientImpl(WebKit::WebScrollbar*); + WebScrollbarThemeClientImpl(blink::WebScrollbar*); ~WebScrollbarThemeClientImpl(); // Implement ScrollbarThemeClient interface @@ -79,7 +79,7 @@ public: virtual void setIsAlphaLocked(bool) OVERRIDE; private: - WebKit::WebScrollbar* m_scrollbar; + blink::WebScrollbar* m_scrollbar; }; } diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.cpp index 849732a..93def68 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.cpp @@ -33,9 +33,9 @@ using namespace WebCore; -namespace WebKit { +namespace blink { -PassOwnPtr<WebKit::WebScrollbarThemeGeometryNative> WebScrollbarThemeGeometryNative::create(WebCore::ScrollbarTheme* theme) +PassOwnPtr<blink::WebScrollbarThemeGeometryNative> WebScrollbarThemeGeometryNative::create(WebCore::ScrollbarTheme* theme) { return adoptPtr(new WebScrollbarThemeGeometryNative(theme)); } @@ -154,4 +154,4 @@ void WebScrollbarThemeGeometryNative::splitTrack(WebScrollbar* scrollbar, const webEndTrack = endTrack; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.h b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.h index bd46129..d24ac7e 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.h +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebScrollbarThemeGeometryNative.h @@ -34,7 +34,7 @@ namespace WebCore { class ScrollbarTheme; } -namespace WebKit { +namespace blink { class WebScrollbar; @@ -70,6 +70,6 @@ private: WebCore::ScrollbarTheme* m_theme; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisUtterance.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisUtterance.cpp index 9a511a2..9a2cbe7 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisUtterance.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisUtterance.cpp @@ -33,7 +33,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebSpeechSynthesisUtterance::WebSpeechSynthesisUtterance(const PassRefPtr<PlatformSpeechSynthesisUtterance>& utterance) : m_private(utterance) @@ -101,4 +101,4 @@ double WebSpeechSynthesisUtterance::startTime() const return m_private->startTime(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisVoice.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisVoice.cpp index 1fcbd29..c229140 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisVoice.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesisVoice.cpp @@ -31,7 +31,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { WebSpeechSynthesisVoice::WebSpeechSynthesisVoice() : m_private(WebCore::PlatformSpeechSynthesisVoice::create()) @@ -78,4 +78,4 @@ WebSpeechSynthesisVoice::operator PassRefPtr<WebCore::PlatformSpeechSynthesisVoi return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.cpp b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.cpp index 0b49a2f..d8e2a27 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.cpp +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.cpp @@ -40,7 +40,7 @@ WebSpeechSynthesizerClientImpl::~WebSpeechSynthesizerClientImpl() { } -void WebSpeechSynthesizerClientImpl::setVoiceList(const WebKit::WebVector<WebKit::WebSpeechSynthesisVoice>& voices) +void WebSpeechSynthesizerClientImpl::setVoiceList(const blink::WebVector<blink::WebSpeechSynthesisVoice>& voices) { Vector<RefPtr<PlatformSpeechSynthesisVoice> > outVoices; for (size_t i = 0; i < voices.size(); i++) @@ -49,37 +49,37 @@ void WebSpeechSynthesizerClientImpl::setVoiceList(const WebKit::WebVector<WebKit m_client->voicesDidChange(); } -void WebSpeechSynthesizerClientImpl::didStartSpeaking(const WebKit::WebSpeechSynthesisUtterance& utterance) +void WebSpeechSynthesizerClientImpl::didStartSpeaking(const blink::WebSpeechSynthesisUtterance& utterance) { m_client->didStartSpeaking(utterance); } -void WebSpeechSynthesizerClientImpl::didFinishSpeaking(const WebKit::WebSpeechSynthesisUtterance& utterance) +void WebSpeechSynthesizerClientImpl::didFinishSpeaking(const blink::WebSpeechSynthesisUtterance& utterance) { m_client->didFinishSpeaking(utterance); } -void WebSpeechSynthesizerClientImpl::didPauseSpeaking(const WebKit::WebSpeechSynthesisUtterance& utterance) +void WebSpeechSynthesizerClientImpl::didPauseSpeaking(const blink::WebSpeechSynthesisUtterance& utterance) { m_client->didPauseSpeaking(utterance); } -void WebSpeechSynthesizerClientImpl::didResumeSpeaking(const WebKit::WebSpeechSynthesisUtterance& utterance) +void WebSpeechSynthesizerClientImpl::didResumeSpeaking(const blink::WebSpeechSynthesisUtterance& utterance) { m_client->didResumeSpeaking(utterance); } -void WebSpeechSynthesizerClientImpl::speakingErrorOccurred(const WebKit::WebSpeechSynthesisUtterance& utterance) +void WebSpeechSynthesizerClientImpl::speakingErrorOccurred(const blink::WebSpeechSynthesisUtterance& utterance) { m_client->speakingErrorOccurred(utterance); } -void WebSpeechSynthesizerClientImpl::wordBoundaryEventOccurred(const WebKit::WebSpeechSynthesisUtterance& utterance, unsigned charIndex) +void WebSpeechSynthesizerClientImpl::wordBoundaryEventOccurred(const blink::WebSpeechSynthesisUtterance& utterance, unsigned charIndex) { m_client->boundaryEventOccurred(utterance, SpeechWordBoundary, charIndex); } -void WebSpeechSynthesizerClientImpl::sentenceBoundaryEventOccurred(const WebKit::WebSpeechSynthesisUtterance& utterance, unsigned charIndex) +void WebSpeechSynthesizerClientImpl::sentenceBoundaryEventOccurred(const blink::WebSpeechSynthesisUtterance& utterance, unsigned charIndex) { m_client->boundaryEventOccurred(utterance, SpeechSentenceBoundary, charIndex); } diff --git a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h index 91681a1..f70c2d2 100644 --- a/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h +++ b/third_party/WebKit/Source/core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h @@ -38,19 +38,19 @@ namespace WebCore { class PlatformSpeechSynthesizer; class PlatformSpeechSynthesizerClient; -class WebSpeechSynthesizerClientImpl : public WebKit::WebSpeechSynthesizerClient { +class WebSpeechSynthesizerClientImpl : public blink::WebSpeechSynthesizerClient { public: explicit WebSpeechSynthesizerClientImpl(PlatformSpeechSynthesizer*, PlatformSpeechSynthesizerClient*); virtual ~WebSpeechSynthesizerClientImpl(); - virtual void setVoiceList(const WebKit::WebVector<WebKit::WebSpeechSynthesisVoice>& voices); - virtual void didStartSpeaking(const WebKit::WebSpeechSynthesisUtterance&); - virtual void didFinishSpeaking(const WebKit::WebSpeechSynthesisUtterance&); - virtual void didPauseSpeaking(const WebKit::WebSpeechSynthesisUtterance&); - virtual void didResumeSpeaking(const WebKit::WebSpeechSynthesisUtterance&); - virtual void speakingErrorOccurred(const WebKit::WebSpeechSynthesisUtterance&); - virtual void wordBoundaryEventOccurred(const WebKit::WebSpeechSynthesisUtterance&, unsigned charIndex); - virtual void sentenceBoundaryEventOccurred(const WebKit::WebSpeechSynthesisUtterance&, unsigned charIndex); + virtual void setVoiceList(const blink::WebVector<blink::WebSpeechSynthesisVoice>& voices); + virtual void didStartSpeaking(const blink::WebSpeechSynthesisUtterance&); + virtual void didFinishSpeaking(const blink::WebSpeechSynthesisUtterance&); + virtual void didPauseSpeaking(const blink::WebSpeechSynthesisUtterance&); + virtual void didResumeSpeaking(const blink::WebSpeechSynthesisUtterance&); + virtual void speakingErrorOccurred(const blink::WebSpeechSynthesisUtterance&); + virtual void wordBoundaryEventOccurred(const blink::WebSpeechSynthesisUtterance&, unsigned charIndex); + virtual void sentenceBoundaryEventOccurred(const blink::WebSpeechSynthesisUtterance&, unsigned charIndex); private: PlatformSpeechSynthesizer* m_synthesizer; diff --git a/third_party/WebKit/Source/core/platform/graphics/BitmapImageTest.cpp b/third_party/WebKit/Source/core/platform/graphics/BitmapImageTest.cpp index 2a5c7ef..402554d 100644 --- a/third_party/WebKit/Source/core/platform/graphics/BitmapImageTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/BitmapImageTest.cpp @@ -60,9 +60,9 @@ public: static PassRefPtr<SharedBuffer> readFile(const char* fileName) { - String filePath = WebKit::Platform::current()->unitTestSupport()->webKitRootDir(); + String filePath = blink::Platform::current()->unitTestSupport()->webKitRootDir(); filePath.append(fileName); - return WebKit::Platform::current()->unitTestSupport()->readFromFile(filePath); + return blink::Platform::current()->unitTestSupport()->readFromFile(filePath); } // Accessors to BitmapImage's protected methods. diff --git a/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.cpp b/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.cpp index b493025..b446463 100644 --- a/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.cpp @@ -54,7 +54,7 @@ namespace WebCore { namespace { -void getDrawingParameters(DrawingBuffer* drawingBuffer, WebKit::WebGraphicsContext3D* graphicsContext3D, +void getDrawingParameters(DrawingBuffer* drawingBuffer, blink::WebGraphicsContext3D* graphicsContext3D, Platform3DObject* frameBufferId, int* width, int* height) { ASSERT(drawingBuffer); @@ -65,7 +65,7 @@ void getDrawingParameters(DrawingBuffer* drawingBuffer, WebKit::WebGraphicsConte } // anonymous namespace -GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer) +GraphicsContext3D::GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer) : m_impl(webContext.get()) , m_ownedWebContext(webContext) , m_initializedAvailableExtensions(false) @@ -77,7 +77,7 @@ GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D> we { } -GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer) +GraphicsContext3D::GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer) : m_provider(provider) , m_impl(m_provider->context3d()) , m_initializedAvailableExtensions(false) @@ -206,7 +206,7 @@ rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a return m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \ } -class GraphicsContext3DContextLostCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback { +class GraphicsContext3DContextLostCallbackAdapter : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback { public: GraphicsContext3DContextLostCallbackAdapter(PassOwnPtr<GraphicsContext3D::ContextLostCallback> callback) : m_contextLostCallback(callback) { } @@ -221,13 +221,13 @@ private: OwnPtr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback; }; -class GraphicsContext3DErrorMessageCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsErrorMessageCallback { +class GraphicsContext3DErrorMessageCallbackAdapter : public blink::WebGraphicsContext3D::WebGraphicsErrorMessageCallback { public: GraphicsContext3DErrorMessageCallbackAdapter(PassOwnPtr<GraphicsContext3D::ErrorMessageCallback> callback) : m_errorMessageCallback(callback) { } virtual ~GraphicsContext3DErrorMessageCallbackAdapter() { } - virtual void onErrorMessage(const WebKit::WebString& message, WebKit::WGC3Dint id) + virtual void onErrorMessage(const blink::WebString& message, blink::WGC3Dint id) { if (m_errorMessageCallback) m_errorMessageCallback->onErrorMessage(message, id); @@ -254,7 +254,7 @@ void GraphicsContext3D::setErrorMessageCallback(PassOwnPtr<GraphicsContext3D::Er PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs) { - WebKit::WebGraphicsContext3D::Attributes webAttributes; + blink::WebGraphicsContext3D::Attributes webAttributes; webAttributes.alpha = attrs.alpha; webAttributes.depth = attrs.depth; webAttributes.stencil = attrs.stencil; @@ -265,20 +265,20 @@ PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attri webAttributes.preferDiscreteGPU = attrs.preferDiscreteGPU; webAttributes.topDocumentURL = attrs.topDocumentURL.string(); - OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::Platform::current()->createOffscreenGraphicsContext3D(webAttributes)); + OwnPtr<blink::WebGraphicsContext3D> webContext = adoptPtr(blink::Platform::current()->createOffscreenGraphicsContext3D(webAttributes)); if (!webContext) return 0; return GraphicsContext3D::createGraphicsContextFromWebContext(webContext.release(), attrs.preserveDrawingBuffer); } -PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromProvider(PassOwnPtr<WebKit::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer) +PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromProvider(PassOwnPtr<blink::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer) { RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(provider, preserveDrawingBuffer)); return context.release(); } -PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromWebContext(PassOwnPtr<WebKit::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer) +PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromWebContext(PassOwnPtr<blink::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer) { RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(webContext, preserveDrawingBuffer)); return context.release(); @@ -351,7 +351,7 @@ DELEGATE_TO_WEBCONTEXT_1(generateMipmap, GC3Denum) bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info) { - WebKit::WebGraphicsContext3D::ActiveInfo webInfo; + blink::WebGraphicsContext3D::ActiveInfo webInfo; if (!m_impl->getActiveAttrib(program, index, webInfo)) return false; info.name = webInfo.name; @@ -362,7 +362,7 @@ bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index bool GraphicsContext3D::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info) { - WebKit::WebGraphicsContext3D::ActiveInfo webInfo; + blink::WebGraphicsContext3D::ActiveInfo webInfo; if (!m_impl->getActiveUniform(program, index, webInfo)) return false; info.name = webInfo.name; @@ -383,7 +383,7 @@ DELEGATE_TO_WEBCONTEXT_3(getBufferParameteriv, GC3Denum, GC3Denum, GC3Dint*) GraphicsContext3D::Attributes GraphicsContext3D::getContextAttributes() { - WebKit::WebGraphicsContext3D::Attributes webAttributes = m_impl->getContextAttributes(); + blink::WebGraphicsContext3D::Attributes webAttributes = m_impl->getContextAttributes(); GraphicsContext3D::Attributes attributes; attributes.alpha = webAttributes.alpha; attributes.depth = webAttributes.depth; diff --git a/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.h b/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.h index 1328341..f470e97 100644 --- a/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.h +++ b/third_party/WebKit/Source/core/platform/graphics/GraphicsContext3D.h @@ -48,7 +48,7 @@ class GrContext; -namespace WebKit { +namespace blink { class WebGraphicsContext3D; class WebGraphicsContext3DProvider; } @@ -432,13 +432,13 @@ public: // Callers must make the context current before using it AND check that the context was created successfully // via ContextLost before using the context in any way. Once made current on a thread, the context cannot // be used on any other thread. - static PassRefPtr<GraphicsContext3D> createGraphicsContextFromWebContext(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer = false); - static PassRefPtr<GraphicsContext3D> createGraphicsContextFromProvider(PassOwnPtr<WebKit::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer = false); + static PassRefPtr<GraphicsContext3D> createGraphicsContextFromWebContext(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer = false); + static PassRefPtr<GraphicsContext3D> createGraphicsContextFromProvider(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer = false); ~GraphicsContext3D(); GrContext* grContext(); - WebKit::WebGraphicsContext3D* webContext() const { return m_impl; } + blink::WebGraphicsContext3D* webContext() const { return m_impl; } bool makeContextCurrent(); @@ -798,8 +798,8 @@ public: private: friend class Extensions3D; - GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer); - GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer); + GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer); + GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer); // Helper for packImageData/extractImageData/extractTextureData which implement packing of pixel // data into the specified OpenGL destination format and type. @@ -822,11 +822,11 @@ private: bool preserveDrawingBuffer() const { return m_preserveDrawingBuffer; } - OwnPtr<WebKit::WebGraphicsContext3DProvider> m_provider; - WebKit::WebGraphicsContext3D* m_impl; + OwnPtr<blink::WebGraphicsContext3DProvider> m_provider; + blink::WebGraphicsContext3D* m_impl; OwnPtr<GraphicsContext3DContextLostCallbackAdapter> m_contextLostCallbackAdapter; OwnPtr<GraphicsContext3DErrorMessageCallbackAdapter> m_errorMessageCallbackAdapter; - OwnPtr<WebKit::WebGraphicsContext3D> m_ownedWebContext; + OwnPtr<blink::WebGraphicsContext3D> m_ownedWebContext; OwnPtr<Extensions3D> m_extensions; bool m_initializedAvailableExtensions; HashSet<String> m_enabledExtensions; diff --git a/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.cpp index 238bac8..1960fec 100644 --- a/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.cpp @@ -58,11 +58,11 @@ #include <stdio.h> #endif -using WebKit::Platform; -using WebKit::WebAnimation; -using WebKit::WebFilterOperations; -using WebKit::WebLayer; -using WebKit::WebPoint; +using blink::Platform; +using blink::WebAnimation; +using blink::WebFilterOperations; +using blink::WebLayer; +using blink::WebPoint; namespace WebCore { @@ -103,7 +103,7 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client) , m_contentsLayerId(0) , m_contentsLayerPurpose(NoContentsLayer) , m_scrollableArea(0) - , m_compositingReasons(WebKit::CompositingReasonUnknown) + , m_compositingReasons(blink::CompositingReasonUnknown) { #ifndef NDEBUG if (m_client) @@ -756,7 +756,7 @@ String GraphicsLayer::layerTreeAsText(LayerTreeFlags flags) const return ts.release(); } -WebKit::WebString GraphicsLayer::debugName(WebKit::WebLayer* webLayer) +blink::WebString GraphicsLayer::debugName(blink::WebLayer* webLayer) { String name; if (!m_client) @@ -782,7 +782,7 @@ WebKit::WebString GraphicsLayer::debugName(WebKit::WebLayer* webLayer) return name; } -void GraphicsLayer::setCompositingReasons(WebKit::WebCompositingReasons reasons) +void GraphicsLayer::setCompositingReasons(blink::WebCompositingReasons reasons) { m_compositingReasons = reasons; m_layer->layer()->setCompositingReasons(reasons); @@ -868,13 +868,13 @@ void GraphicsLayer::setContentsVisible(bool contentsVisible) updateLayerIsDrawable(); } -void GraphicsLayer::setClipParent(WebKit::WebLayer* parent) +void GraphicsLayer::setClipParent(blink::WebLayer* parent) { m_hasClipParent = !!parent; m_layer->layer()->setClipParent(parent); } -void GraphicsLayer::setScrollParent(WebKit::WebLayer* parent) +void GraphicsLayer::setScrollParent(blink::WebLayer* parent) { m_hasScrollParent = !!parent; m_layer->layer()->setScrollParent(parent); diff --git a/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h index 3f3d29f..57fcbee 100644 --- a/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h +++ b/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h @@ -49,7 +49,7 @@ #include "public/platform/WebNinePatchLayer.h" #include "public/platform/WebSolidColorLayer.h" -namespace WebKit { +namespace blink { class GraphicsLayerFactoryChromium; class WebAnimation; class WebLayer; @@ -69,7 +69,7 @@ class LinkHighlightClient { public: virtual void invalidate() = 0; virtual void clearCurrentGraphicsLayer() = 0; - virtual WebKit::WebLayer* layer() = 0; + virtual blink::WebLayer* layer() = 0; protected: virtual ~LinkHighlightClient() { } @@ -78,7 +78,7 @@ protected: // GraphicsLayer is an abstraction for a rendering surface with backing store, // which may have associated transformation and animations. -class GraphicsLayer : public GraphicsContextPainter, public WebKit::WebAnimationDelegate, public WebKit::WebLayerScrollClient, public WebKit::WebLayerClient { +class GraphicsLayer : public GraphicsContextPainter, public blink::WebAnimationDelegate, public blink::WebLayerScrollClient, public blink::WebLayerClient { WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED; public: enum ContentsLayerPurpose { @@ -95,11 +95,11 @@ public: GraphicsLayerClient* client() const { return m_client; } - // WebKit::WebLayerClient implementation. - virtual WebKit::WebString debugName(WebKit::WebLayer*) OVERRIDE; + // blink::WebLayerClient implementation. + virtual blink::WebString debugName(blink::WebLayer*) OVERRIDE; - void setCompositingReasons(WebKit::WebCompositingReasons); - WebKit::WebCompositingReasons compositingReasons() const { return m_compositingReasons; } + void setCompositingReasons(blink::WebCompositingReasons); + blink::WebCompositingReasons compositingReasons() const { return m_compositingReasons; } GraphicsLayer* parent() const { return m_parent; }; void setParent(GraphicsLayer*); // Internal use only. @@ -183,8 +183,8 @@ public: bool contentsAreVisible() const { return m_contentsVisible; } void setContentsVisible(bool); - void setScrollParent(WebKit::WebLayer*); - void setClipParent(WebKit::WebLayer*); + void setScrollParent(blink::WebLayer*); + void setClipParent(blink::WebLayer*); // For special cases, e.g. drawing missing tiles on Android. // The compositor should never paint this color in normal cases because the RenderLayer @@ -225,7 +225,7 @@ public: // Return true if the animation is handled by the compositing system. If this returns // false, the animation will be run by AnimationController. // These methods handle both transitions and keyframe animations. - bool addAnimation(PassOwnPtr<WebKit::WebAnimation>); + bool addAnimation(PassOwnPtr<blink::WebAnimation>); void pauseAnimation(int animationId, double /*timeOffset*/); void removeAnimation(int animationId); @@ -233,22 +233,22 @@ public: void setContentsToImage(Image*); void setContentsToNinePatch(Image*, const IntRect& aperture); bool shouldDirectlyCompositeImage(Image*) const { return true; } - void setContentsToMedia(WebKit::WebLayer*); // video or plug-in + void setContentsToMedia(blink::WebLayer*); // video or plug-in // Pass an invalid color to remove the contents layer. void setContentsToSolidColor(const Color&) { } - void setContentsToCanvas(WebKit::WebLayer*); + void setContentsToCanvas(blink::WebLayer*); // FIXME: webkit.org/b/109658 // Should unify setContentsToMedia and setContentsToCanvas - void setContentsToPlatformLayer(WebKit::WebLayer* layer) { setContentsToMedia(layer); } + void setContentsToPlatformLayer(blink::WebLayer* layer) { setContentsToMedia(layer); } bool hasContentsLayer() const { return m_contentsLayer; } // Callback from the underlying graphics system to draw layer contents. void paintGraphicsLayerContents(GraphicsContext&, const IntRect& clip); // Callback from the underlying graphics system when the layer has been displayed - void layerDidDisplay(WebKit::WebLayer*) { } + void layerDidDisplay(blink::WebLayer*) { } // For hosting this GraphicsLayer in a native layer hierarchy. - WebKit::WebLayer* platformLayer() const; + blink::WebLayer* platformLayer() const; enum CompositingCoordinatesOrientation { CompositingCoordinatesTopDown, CompositingCoordinatesBottomUp }; @@ -297,13 +297,13 @@ public: void setScrollableArea(ScrollableArea*, bool isMainFrame); ScrollableArea* scrollableArea() const { return m_scrollableArea; } - WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); } + blink::WebContentLayer* contentLayer() const { return m_layer.get(); } // Exposed for tests. FIXME - name is too similar to contentLayer(), very error prone. - WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; } + blink::WebLayer* contentsLayer() const { return m_contentsLayer; } - static void registerContentsLayer(WebKit::WebLayer*); - static void unregisterContentsLayer(WebKit::WebLayer*); + static void registerContentsLayer(blink::WebLayer*); + static void unregisterContentsLayer(blink::WebLayer*); // GraphicsContextPainter implementation. virtual void paint(GraphicsContext&, const IntRect& clip) OVERRIDE; @@ -318,7 +318,7 @@ public: protected: explicit GraphicsLayer(GraphicsLayerClient*); // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. - friend class WebKit::GraphicsLayerFactoryChromium; + friend class blink::GraphicsLayerFactoryChromium; private: // Adds a child without calling updateChildList(), so that adding children @@ -342,10 +342,10 @@ private: void updateLayerIsDrawable(); void updateContentsRect(); - void setContentsTo(ContentsLayerPurpose, WebKit::WebLayer*); - void setupContentsLayer(WebKit::WebLayer*); + void setContentsTo(ContentsLayerPurpose, blink::WebLayer*); + void setupContentsLayer(blink::WebLayer*); void clearContentsLayerIfUnregistered(); - WebKit::WebLayer* contentsLayerIfRegistered(); + blink::WebLayer* contentsLayerIfRegistered(); GraphicsLayerClient* m_client; @@ -395,10 +395,10 @@ private: int m_paintCount; - OwnPtr<WebKit::WebContentLayer> m_layer; - OwnPtr<WebKit::WebImageLayer> m_imageLayer; - OwnPtr<WebKit::WebNinePatchLayer> m_ninePatchLayer; - WebKit::WebLayer* m_contentsLayer; + OwnPtr<blink::WebContentLayer> m_layer; + OwnPtr<blink::WebImageLayer> m_imageLayer; + OwnPtr<blink::WebNinePatchLayer> m_ninePatchLayer; + blink::WebLayer* m_contentsLayer; // We don't have ownership of m_contentsLayer, but we do want to know if a given layer is the // same as our current layer in setContentsTo(). Since m_contentsLayer may be deleted at this point, // we stash an ID away when we know m_contentsLayer is alive and use that for comparisons from that point @@ -412,7 +412,7 @@ private: ContentsLayerPurpose m_contentsLayerPurpose; ScrollableArea* m_scrollableArea; - WebKit::WebCompositingReasons m_compositingReasons; + blink::WebCompositingReasons m_compositingReasons; }; diff --git a/third_party/WebKit/Source/core/platform/graphics/Image.cpp b/third_party/WebKit/Source/core/platform/graphics/Image.cpp index 86b9ad2..a7628d4 100644 --- a/third_party/WebKit/Source/core/platform/graphics/Image.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/Image.cpp @@ -66,7 +66,7 @@ Image* Image::nullImage() PassRefPtr<Image> Image::loadPlatformResource(const char *name) { - const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name); + const blink::WebData& resource = blink::Platform::current()->loadResource(name); if (resource.isEmpty()) return Image::nullImage(); diff --git a/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.cpp index c53b749..a599686 100644 --- a/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.cpp @@ -205,7 +205,7 @@ BackingStoreCopy ImageBuffer::fastCopyImageMode() return DontCopyBackingStore; } -WebKit::WebLayer* ImageBuffer::platformLayer() const +blink::WebLayer* ImageBuffer::platformLayer() const { return m_layerBridge ? m_layerBridge->layer() : 0; } diff --git a/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.h b/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.h index 3be9600..52da4fb 100644 --- a/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.h +++ b/third_party/WebKit/Source/core/platform/graphics/ImageBuffer.h @@ -45,7 +45,7 @@ class SkCanvas; -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -118,7 +118,7 @@ public: String toDataURL(const String& mimeType, const double* quality = 0, CoordinateSystem = LogicalCoordinateSystem) const; AffineTransform baseTransform() const { return AffineTransform(); } void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace); - WebKit::WebLayer* platformLayer() const; + blink::WebLayer* platformLayer() const; // FIXME: current implementations of this method have the restriction that they only work // with textures that are RGB or RGBA format, UNSIGNED_BYTE type and level 0, as specified in diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp index a388ac3..a79d3eb 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp @@ -39,8 +39,8 @@ #include "public/platform/WebCompositorSupport.h" #include "public/platform/WebGraphicsContext3D.h" -using WebKit::WebExternalTextureLayer; -using WebKit::WebGraphicsContext3D; +using blink::WebExternalTextureLayer; +using blink::WebGraphicsContext3D; namespace WebCore { @@ -103,7 +103,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, ASSERT(m_canvas); // Used by browser tests to detect the use of a Canvas2DLayerBridge. TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation"); - m_layer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createExternalTextureLayer(this)); + m_layer = adoptPtr(blink::Platform::current()->compositorSupport()->createExternalTextureLayer(this)); m_layer->setOpaque(opacityMode == Opaque); m_layer->setBlendBackgroundColor(opacityMode != Opaque); GraphicsLayer::registerContentsLayer(m_layer->layer()); @@ -275,7 +275,7 @@ bool Canvas2DLayerBridge::isValid() return m_surfaceIsValid; } -bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox, WebKit::WebExternalBitmap* bitmap) +bool Canvas2DLayerBridge::prepareMailbox(blink::WebExternalTextureMailbox* outMailbox, blink::WebExternalBitmap* bitmap) { if (bitmap) { // Using accelerated 2d canvas with software renderer, which @@ -368,7 +368,7 @@ Canvas2DLayerBridge::MailboxInfo* Canvas2DLayerBridge::createMailboxInfo() { return mailboxInfo; } -void Canvas2DLayerBridge::mailboxReleased(const WebKit::WebExternalTextureMailbox& mailbox) +void Canvas2DLayerBridge::mailboxReleased(const blink::WebExternalTextureMailbox& mailbox) { Vector<MailboxInfo>::iterator mailboxInfo; for (mailboxInfo = m_mailboxes.begin(); mailboxInfo < m_mailboxes.end(); mailboxInfo++) { @@ -386,7 +386,7 @@ void Canvas2DLayerBridge::mailboxReleased(const WebKit::WebExternalTextureMailbo } } -WebKit::WebLayer* Canvas2DLayerBridge::layer() +blink::WebLayer* Canvas2DLayerBridge::layer() { ASSERT(m_layer); return m_layer->layer(); diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.h b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.h index 47cd689..9cc2664 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.h +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridge.h @@ -37,7 +37,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -61,7 +61,7 @@ private: RefPtr<Canvas2DLayerBridge> m_ptr; }; -class Canvas2DLayerBridge : public WebKit::WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient, public DoublyLinkedListNode<Canvas2DLayerBridge>, public RefCounted<Canvas2DLayerBridge> { +class Canvas2DLayerBridge : public blink::WebExternalTextureLayerClient, public SkDeferredCanvas::NotificationClient, public DoublyLinkedListNode<Canvas2DLayerBridge>, public RefCounted<Canvas2DLayerBridge> { WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge); public: enum OpacityMode { @@ -73,10 +73,10 @@ public: virtual ~Canvas2DLayerBridge(); - // WebKit::WebExternalTextureLayerClient implementation. - virtual WebKit::WebGraphicsContext3D* context() OVERRIDE; - virtual bool prepareMailbox(WebKit::WebExternalTextureMailbox*, WebKit::WebExternalBitmap*) OVERRIDE; - virtual void mailboxReleased(const WebKit::WebExternalTextureMailbox&) OVERRIDE; + // blink::WebExternalTextureLayerClient implementation. + virtual blink::WebGraphicsContext3D* context() OVERRIDE; + virtual bool prepareMailbox(blink::WebExternalTextureMailbox*, blink::WebExternalBitmap*) OVERRIDE; + virtual void mailboxReleased(const blink::WebExternalTextureMailbox&) OVERRIDE; // SkDeferredCanvas::NotificationClient implementation virtual void prepareForDraw() OVERRIDE; @@ -91,7 +91,7 @@ public: size_t bytesAllocated() const {return m_bytesAllocated;} void limitPendingFrames(); - WebKit::WebLayer* layer(); + blink::WebLayer* layer(); void contextAcquired(); PassRefPtr<SkCanvas> getCanvas() { return PassRefPtr<SkCanvas>(m_canvas); } @@ -106,7 +106,7 @@ protected: void setRateLimitingEnabled(bool); RefPtr<SkDeferredCanvas> m_canvas; - OwnPtr<WebKit::WebExternalTextureLayer> m_layer; + OwnPtr<blink::WebExternalTextureLayer> m_layer; RefPtr<GraphicsContext3D> m_context; int m_msaaSampleCount; size_t m_bytesAllocated; @@ -127,7 +127,7 @@ protected: }; struct MailboxInfo { - WebKit::WebExternalTextureMailbox m_mailbox; + blink::WebExternalTextureMailbox m_mailbox; SkAutoTUnref<SkImage> m_image; MailboxStatus m_status; RefPtr<Canvas2DLayerBridge> m_parentLayerBridge; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridgeTest.cpp index 6692672..7cc29d7 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridgeTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerBridgeTest.cpp @@ -39,7 +39,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; using testing::InSequence; using testing::Return; using testing::Test; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.cpp index ed38bd3..d462247 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.cpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "public/platform/Platform.h" #include "wtf/StdLibExtras.h" -using WebKit::WebThread; +using blink::WebThread; namespace { enum { @@ -60,7 +60,7 @@ void Canvas2DLayerManager::init(size_t maxBytesAllocated, size_t targetBytesAllo m_maxBytesAllocated = maxBytesAllocated; m_targetBytesAllocated = targetBytesAllocated; if (m_taskObserverActive) { - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); m_taskObserverActive = false; } } @@ -79,7 +79,7 @@ void Canvas2DLayerManager::didProcessTask() { // Called after the script action for the current frame has been processed. ASSERT(m_taskObserverActive); - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); m_taskObserverActive = false; for (Canvas2DLayerBridge* layer = m_layerList.head(); layer; layer = layer->next()) layer->limitPendingFrames(); @@ -98,7 +98,7 @@ void Canvas2DLayerManager::layerDidDraw(Canvas2DLayerBridge* layer) if (!m_taskObserverActive) { m_taskObserverActive = true; // Schedule a call to didProcessTask() after completion of the current script task. - WebKit::Platform::current()->currentThread()->addTaskObserver(this); + blink::Platform::current()->currentThread()->addTaskObserver(this); } } diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.h b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.h index 3379cec..4f2ab00 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.h +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManager.h @@ -32,7 +32,7 @@ class Canvas2DLayerManagerTest; namespace WebCore { -class Canvas2DLayerManager : public WebKit::WebThread::TaskObserver { +class Canvas2DLayerManager : public blink::WebThread::TaskObserver { public: static Canvas2DLayerManager& get(); void init(size_t maxBytesAllocated, size_t targetBytesAllocated); diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp index c6d7398..c027a92 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/Canvas2DLayerManagerTest.cpp @@ -106,7 +106,7 @@ protected: Canvas2DLayerManager& manager = Canvas2DLayerManager::get(); manager.init(10, 10); { - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D)); + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D)); RefPtr<SkDeferredCanvas> canvas1(createCanvas(context.get())); Canvas2DLayerBridgePtr layer1(adoptRef(new FakeCanvas2DLayerBridge(context, canvas1.release()))); EXPECT_EQ((size_t)0, manager.m_bytesAllocated); @@ -133,7 +133,7 @@ protected: void evictionTest() { - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D)); + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D)); Canvas2DLayerManager& manager = Canvas2DLayerManager::get(); manager.init(10, 5); RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get())); @@ -150,7 +150,7 @@ protected: void flushEvictionTest() { - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D)); + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D)); Canvas2DLayerManager& manager = Canvas2DLayerManager::get(); manager.init(10, 5); RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get())); @@ -177,10 +177,10 @@ protected: layer->storageAllocatedForRecordingChanged(0); layer->skippedPendingDrawCommands(); } - WebKit::Platform::current()->currentThread()->exitRunLoop(); + blink::Platform::current()->currentThread()->exitRunLoop(); } - class DeferredFrameTestTask : public WebKit::WebThread::Task { + class DeferredFrameTestTask : public blink::WebThread::Task { public: DeferredFrameTestTask(Canvas2DLayerManagerTest* test, FakeCanvas2DLayerBridge* layer, bool skipCommands) { @@ -201,36 +201,36 @@ protected: void deferredFrameTest() { - RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new WebKit::FakeWebGraphicsContext3D)); + RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new blink::FakeWebGraphicsContext3D)); Canvas2DLayerManager::get().init(10, 10); RefPtr<SkDeferredCanvas> canvas(createCanvas(context.get())); Canvas2DLayerBridgePtr layer(adoptRef(new FakeCanvas2DLayerBridge(context, canvas.release()))); - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); + blink::Platform::current()->currentThread()->enterRunLoop(); // Verify that didProcessTask was called upon completion EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive); // Verify that no flush was performed because frame is fresh EXPECT_EQ(0, fake(layer)->m_flushCount); // Verify that no flushes are triggered as long as frame are fresh - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); + blink::Platform::current()->currentThread()->enterRunLoop(); EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive); EXPECT_EQ(0, fake(layer)->m_flushCount); - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), true)); + blink::Platform::current()->currentThread()->enterRunLoop(); EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive); EXPECT_EQ(0, fake(layer)->m_flushCount); // Verify that a flush is triggered when queue is accumulating a multi-frame backlog. - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false)); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false)); + blink::Platform::current()->currentThread()->enterRunLoop(); EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive); EXPECT_EQ(1, fake(layer)->m_flushCount); - WebKit::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false)); - WebKit::Platform::current()->currentThread()->enterRunLoop(); + blink::Platform::current()->currentThread()->postTask(new DeferredFrameTestTask(this, fake(layer), false)); + blink::Platform::current()->currentThread()->enterRunLoop(); EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive); EXPECT_EQ(2, fake(layer)->m_flushCount); } diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/DeferredImageDecoderTest.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/DeferredImageDecoderTest.cpp index 0bd09eb..a71e27d 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/DeferredImageDecoderTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/DeferredImageDecoderTest.cpp @@ -223,7 +223,7 @@ TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) EXPECT_EQ(0, m_frameBufferRequestCount); // Create a thread to rasterize SkPicture. - OwnPtr<WebKit::WebThread> thread = adoptPtr(WebKit::Platform::current()->createThread("RasterThread")); + OwnPtr<blink::WebThread> thread = adoptPtr(blink::Platform::current()->createThread("RasterThread")); thread->postTask(new Task(WTF::bind(&rasterizeMain, m_canvas.get(), &m_picture))); thread.clear(); EXPECT_EQ(0, m_frameBufferRequestCount); diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.cpp index eb1fd65..6950daf 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.cpp @@ -77,7 +77,7 @@ DiscardablePixelRef::~DiscardablePixelRef() bool DiscardablePixelRef::allocAndLockDiscardableMemory(size_t bytes) { - m_discardable = adoptPtr(WebKit::Platform::current()->allocateAndLockDiscardableMemory(bytes)); + m_discardable = adoptPtr(blink::Platform::current()->allocateAndLockDiscardableMemory(bytes)); if (m_discardable) { m_lockedMemory = m_discardable->data(); return true; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.h b/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.h index 28449b3..0c6a639 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.h +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/DiscardablePixelRef.h @@ -61,7 +61,7 @@ protected: private: void* m_lockedMemory; - OwnPtr<WebKit::WebDiscardableMemory> m_discardable; + OwnPtr<blink::WebDiscardableMemory> m_discardable; OwnPtr<SkMutex> m_mutex; }; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/FontCacheChromiumLinux.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/FontCacheChromiumLinux.cpp index 17d9af5..5e39f46 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/FontCacheChromiumLinux.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/FontCacheChromiumLinux.cpp @@ -36,11 +36,11 @@ namespace WebCore { void FontCache::getFontFamilyForCharacter(UChar32 c, const char* preferredLocale, FontCache::SimpleFontFamily* family) { - WebKit::WebFontFamily webFamily; - if (WebKit::Platform::current()->sandboxSupport()) - WebKit::Platform::current()->sandboxSupport()->getFontFamilyForCharacter(c, preferredLocale, &webFamily); + blink::WebFontFamily webFamily; + if (blink::Platform::current()->sandboxSupport()) + blink::Platform::current()->sandboxSupport()->getFontFamilyForCharacter(c, preferredLocale, &webFamily); else - WebKit::WebFontInfo::familyForChar(c, preferredLocale, &webFamily); + blink::WebFontInfo::familyForChar(c, preferredLocale, &webFamily); family->name = String::fromUTF8(CString(webFamily.name)); family->isBold = webFamily.isBold; family->isItalic = webFamily.isItalic; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp index 0f4133a..33083a7 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp @@ -411,7 +411,7 @@ SCRIPT_FONTPROPERTIES* FontPlatformData::scriptFontProperties() const bool FontPlatformData::ensureFontLoaded(HFONT font) { - WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport(); + blink::WebSandboxSupport* sandboxSupport = blink::Platform::current()->sandboxSupport(); // if there is no sandbox, then we can assume the font // was able to be loaded successfully already return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp index c5e9f6c..a8ba03eb 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp @@ -327,7 +327,7 @@ TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesCompleteMultiThreaded) // Frame can now be decoded completely. setFrameStatus(ImageFrame::FrameComplete); addNewData(); - OwnPtr<WebKit::WebThread> thread = adoptPtr(WebKit::Platform::current()->createThread("DecodeThread")); + OwnPtr<blink::WebThread> thread = adoptPtr(blink::Platform::current()->createThread("DecodeThread")); thread->postTask(new Task(WTF::bind(&decodeThreadMain, m_generator.get()))); thread.clear(); diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.cpp index 26cfa18..e35c29b 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/LazyDecodingPixelRef.cpp @@ -128,4 +128,4 @@ void LazyDecodingPixelRef::Decode() } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp index fc0f0cf..71c885c 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp @@ -33,8 +33,8 @@ #include "public/platform/WebFloatRect.h" #include "public/platform/WebRect.h" -using WebKit::WebFloatRect; -using WebKit::WebRect; +using blink::WebFloatRect; +using blink::WebRect; namespace WebCore { diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h b/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h index e83ce93..8aece87 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h @@ -44,7 +44,7 @@ protected: virtual ~GraphicsContextPainter() { } }; -class OpaqueRectTrackingContentLayerDelegate : public WebKit::WebContentLayerClient { +class OpaqueRectTrackingContentLayerDelegate : public blink::WebContentLayerClient { WTF_MAKE_NONCOPYABLE(OpaqueRectTrackingContentLayerDelegate); public: explicit OpaqueRectTrackingContentLayerDelegate(GraphicsContextPainter*); @@ -54,8 +54,8 @@ public: // tracking opaqueness. void setOpaque(bool opaque) { m_opaque = opaque; } - // WebKit::WebContentLayerClient implementation. - virtual void paintContents(SkCanvas*, const WebKit::WebRect& clip, bool canPaintLCDText, WebKit::WebFloatRect& opaque) OVERRIDE; + // blink::WebContentLayerClient implementation. + virtual void paintContents(SkCanvas*, const blink::WebRect& clip, bool canPaintLCDText, blink::WebFloatRect& opaque) OVERRIDE; private: GraphicsContextPainter* m_painter; diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.cpp b/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.cpp index 57fbf17..20850b4 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.cpp @@ -102,7 +102,7 @@ bool UniscribeHelperTextRun::nextWinFontData( // This check is necessary because NextWinFontData can be called again // after we already ran out of fonts. fontDataAt behaves in a strange // manner when the difference between param passed and # of fonts stored in - // WebKit::Font is larger than one. We can avoid this check by setting + // blink::Font is larger than one. We can avoid this check by setting // font_index_ to # of elements in hfonts_ when we run out of font. In that // case, we'd have to go through a couple of more checks before returning // false. diff --git a/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.h b/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.h index 0bac52e..31140ed 100644 --- a/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.h +++ b/third_party/WebKit/Source/core/platform/graphics/chromium/UniscribeHelperTextRun.h @@ -70,7 +70,7 @@ private: virtual bool nextWinFontData(HFONT&, SCRIPT_CACHE*&, SCRIPT_FONTPROPERTIES*&, int& ascent, WORD& spaceGlyph); virtual void resetFontIndex(); - // Reference to WebKit::Font that contains all the information about fonts + // Reference to blink::Font that contains all the information about fonts // we can use to render this input run of text. It is used in // NextWinFontData to retrieve Windows font data for a series of // non-primary fonts. diff --git a/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.cpp b/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.cpp index 9d5f88f..fe92d52 100644 --- a/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.cpp @@ -85,7 +85,7 @@ PassRefPtr<SkImageFilter> SkiaImageFilterBuilder::transformColorSpace( return adoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), input)); } -bool SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& operations, WebKit::WebFilterOperations* filters) +bool SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& operations, blink::WebFilterOperations* filters) { if (!filters) return false; @@ -179,7 +179,7 @@ bool SkiaImageFilterBuilder::buildFilterOperations(const FilterOperations& opera } case FilterOperation::DROP_SHADOW: { const DropShadowFilterOperation* drop = static_cast<const DropShadowFilterOperation*>(&op); - filters->appendDropShadowFilter(WebKit::WebPoint(drop->x(), drop->y()), drop->stdDeviation(), drop->color().rgb()); + filters->appendDropShadowFilter(blink::WebPoint(drop->x(), drop->y()), drop->stdDeviation(), drop->color().rgb()); break; } case FilterOperation::VALIDATED_CUSTOM: diff --git a/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.h b/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.h index b798f16..d21afdd 100644 --- a/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.h +++ b/third_party/WebKit/Source/core/platform/graphics/filters/SkiaImageFilterBuilder.h @@ -43,7 +43,7 @@ public: ~SkiaImageFilterBuilder(); PassRefPtr<SkImageFilter> build(FilterEffect*, ColorSpace); - bool buildFilterOperations(const FilterOperations&, WebKit::WebFilterOperations*); + bool buildFilterOperations(const FilterOperations&, blink::WebFilterOperations*); PassRefPtr<SkImageFilter> transformColorSpace( SkImageFilter* input, ColorSpace srcColorSpace, ColorSpace dstColorSpace); diff --git a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.cpp b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.cpp index b85518d..e43f99e 100644 --- a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.cpp @@ -144,14 +144,14 @@ void DrawingBuffer::markContentsChanged() m_contentsChangeCommitted = false; } -WebKit::WebGraphicsContext3D* DrawingBuffer::context() +blink::WebGraphicsContext3D* DrawingBuffer::context() { if (!m_context) return 0; return m_context->webContext(); } -bool DrawingBuffer::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox, WebKit::WebExternalBitmap* bitmap) +bool DrawingBuffer::prepareMailbox(blink::WebExternalTextureMailbox* outMailbox, blink::WebExternalBitmap* bitmap) { if (!m_context || !m_contentsChanged || !m_lastColorBuffer) return false; @@ -220,7 +220,7 @@ bool DrawingBuffer::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox return true; } -void DrawingBuffer::mailboxReleased(const WebKit::WebExternalTextureMailbox& mailbox) +void DrawingBuffer::mailboxReleased(const blink::WebExternalTextureMailbox& mailbox) { for (size_t i = 0; i < m_textureMailboxes.size(); i++) { RefPtr<MailboxInfo> mailboxInfo = m_textureMailboxes[i]; @@ -345,13 +345,13 @@ Platform3DObject DrawingBuffer::framebuffer() const return m_fbo; } -WebKit::WebLayer* DrawingBuffer::platformLayer() +blink::WebLayer* DrawingBuffer::platformLayer() { if (!m_context) return 0; if (!m_layer) { - m_layer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createExternalTextureLayer(this)); + m_layer = adoptPtr(blink::Platform::current()->compositorSupport()->createExternalTextureLayer(this)); m_layer->setOpaque(!m_attributes.alpha); m_layer->setBlendBackgroundColor(m_attributes.alpha); diff --git a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.h b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.h index b327dbd4..2516e28 100644 --- a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.h +++ b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBuffer.h @@ -41,7 +41,7 @@ #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { class WebExternalBitmap; class WebExternalTextureLayer; class WebGraphicsContext3D; @@ -62,10 +62,10 @@ public: }; // Manages a rendering target (framebuffer + attachment) for a canvas. Can publish its rendering -// results to a WebKit::WebLayer for compositing. -class DrawingBuffer : public RefCounted<DrawingBuffer>, public WebKit::WebExternalTextureLayerClient { +// results to a blink::WebLayer for compositing. +class DrawingBuffer : public RefCounted<DrawingBuffer>, public blink::WebExternalTextureLayerClient { struct MailboxInfo : public RefCounted<MailboxInfo> { - WebKit::WebExternalTextureMailbox mailbox; + blink::WebExternalTextureMailbox mailbox; unsigned textureId; IntSize size; }; @@ -120,13 +120,13 @@ public: void markContentsChanged(); - WebKit::WebLayer* platformLayer(); + blink::WebLayer* platformLayer(); void paintCompositedResultsToCanvas(ImageBuffer*); // WebExternalTextureLayerClient implementation. - virtual WebKit::WebGraphicsContext3D* context() OVERRIDE; - virtual bool prepareMailbox(WebKit::WebExternalTextureMailbox*, WebKit::WebExternalBitmap*) OVERRIDE; - virtual void mailboxReleased(const WebKit::WebExternalTextureMailbox&) OVERRIDE; + virtual blink::WebGraphicsContext3D* context() OVERRIDE; + virtual bool prepareMailbox(blink::WebExternalTextureMailbox*, blink::WebExternalBitmap*) OVERRIDE; + virtual void mailboxReleased(const blink::WebExternalTextureMailbox&) OVERRIDE; bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject texture, GC3Denum internalFormat, GC3Denum destType, GC3Dint level, bool premultiplyAlpha, bool flipY); @@ -202,7 +202,7 @@ private: unsigned m_internalRenderbufferFormat; int m_maxTextureSize; - OwnPtr<WebKit::WebExternalTextureLayer> m_layer; + OwnPtr<blink::WebExternalTextureLayer> m_layer; // All of the mailboxes that this DrawingBuffer has ever created. Vector<RefPtr<MailboxInfo> > m_textureMailboxes; diff --git a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBufferTest.cpp b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBufferTest.cpp index 29e54b4..f7a0009 100644 --- a/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBufferTest.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/gpu/DrawingBufferTest.cpp @@ -41,7 +41,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; using testing::Test; using testing::_; @@ -76,7 +76,7 @@ TEST_F(DrawingBufferTest, verifyNoNewBuffersAfterContextLostWithMailboxes) m_drawingBuffer->markContentsChanged(); m_drawingBuffer->releaseResources(); - WebKit::WebExternalTextureMailbox mailbox; + blink::WebExternalTextureMailbox mailbox; EXPECT_FALSE(m_drawingBuffer->prepareMailbox(&mailbox, 0)); } diff --git a/third_party/WebKit/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp b/third_party/WebKit/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp index 11af84b..24a41ba 100644 --- a/third_party/WebKit/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp @@ -45,9 +45,9 @@ public: { bool wasCreated = false; - OwnPtr<WebKit::WebGraphicsContext3DProvider> provider = adoptPtr(WebKit::Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); + OwnPtr<blink::WebGraphicsContext3DProvider> provider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider()); - WebKit::WebGraphicsContext3D* webContext = 0; + blink::WebGraphicsContext3D* webContext = 0; GrContext* grContext = 0; if (provider) { @@ -56,7 +56,7 @@ public: } if (webContext && grContext) { - WebKit::WebGraphicsContext3D* oldWebContext = m_context ? m_context->webContext() : 0; + blink::WebGraphicsContext3D* oldWebContext = m_context ? m_context->webContext() : 0; GrContext* oldGrContext = m_context ? m_context->grContext() : 0; if (webContext != oldWebContext || grContext != oldGrContext) m_context.clear(); diff --git a/third_party/WebKit/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp b/third_party/WebKit/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp index 7a280e5..37dda90 100644 --- a/third_party/WebKit/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp +++ b/third_party/WebKit/Source/core/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp @@ -257,17 +257,17 @@ HarfBuzzFace* FontPlatformData::harfBuzzFace() const void FontPlatformData::getRenderStyleForStrike(const char* font, int sizeAndStyle) { - WebKit::WebFontRenderStyle style; + blink::WebFontRenderStyle style; #if OS(ANDROID) style.setDefaults(); #else if (!font || !*font) style.setDefaults(); // It's probably a webfont. Take the system defaults. - else if (WebKit::Platform::current()->sandboxSupport()) - WebKit::Platform::current()->sandboxSupport()->getRenderStyleForStrike(font, sizeAndStyle, &style); + else if (blink::Platform::current()->sandboxSupport()) + blink::Platform::current()->sandboxSupport()->getRenderStyleForStrike(font, sizeAndStyle, &style); else - WebKit::WebFontInfo::renderStyleForStrike(font, sizeAndStyle, &style); + blink::WebFontInfo::renderStyleForStrike(font, sizeAndStyle, &style); #endif style.toFontRenderStyle(&m_style); diff --git a/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.cpp b/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.cpp index 7b9938b..619c31d 100644 --- a/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.cpp +++ b/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.cpp @@ -88,7 +88,7 @@ PassOwnPtr<ImageDecoder> ImageDecoder::create(const SharedBuffer& data, ImageSou static const unsigned longestSignatureLength = sizeof("RIFF????WEBPVP") - 1; ASSERT(longestSignatureLength == 14); - size_t maxDecodedBytes = WebKit::Platform::current()->maxDecodedImageBytes(); + size_t maxDecodedBytes = blink::Platform::current()->maxDecodedImageBytes(); char contents[longestSignatureLength]; if (copyFromSharedBuffer(contents, longestSignatureLength, data, 0) < longestSignatureLength) diff --git a/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.h b/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.h index 2f6d8d9..4a0923a 100644 --- a/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.h +++ b/third_party/WebKit/Source/core/platform/image-decoders/ImageDecoder.h @@ -237,7 +237,7 @@ namespace WebCore { class ImageDecoder { WTF_MAKE_NONCOPYABLE(ImageDecoder); WTF_MAKE_FAST_ALLOCATED; public: - static const size_t noDecodedImageByteLimit = WebKit::Platform::noDecodedImageByteLimit; + static const size_t noDecodedImageByteLimit = blink::Platform::noDecodedImageByteLimit; ImageDecoder(ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption, size_t maxDecodedBytes) : m_premultiplyAlpha(alphaOption == ImageSource::AlphaPremultiplied) diff --git a/third_party/WebKit/Source/core/platform/image-decoders/gif/GIFImageDecoderTest.cpp b/third_party/WebKit/Source/core/platform/image-decoders/gif/GIFImageDecoderTest.cpp index 9c89225..dd51681 100644 --- a/third_party/WebKit/Source/core/platform/image-decoders/gif/GIFImageDecoderTest.cpp +++ b/third_party/WebKit/Source/core/platform/image-decoders/gif/GIFImageDecoderTest.cpp @@ -44,7 +44,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/core/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp b/third_party/WebKit/Source/core/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp index 9c2f95a..076ac5d 100644 --- a/third_party/WebKit/Source/core/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp +++ b/third_party/WebKit/Source/core/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp @@ -45,7 +45,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/core/platform/image-decoders/webp/WEBPImageDecoderTest.cpp b/third_party/WebKit/Source/core/platform/image-decoders/webp/WEBPImageDecoderTest.cpp index 8747467..a3c0645 100644 --- a/third_party/WebKit/Source/core/platform/image-decoders/webp/WEBPImageDecoderTest.cpp +++ b/third_party/WebKit/Source/core/platform/image-decoders/webp/WEBPImageDecoderTest.cpp @@ -46,7 +46,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.cpp b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.cpp index c626977..56a5f76 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.cpp +++ b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.cpp @@ -53,7 +53,7 @@ MediaStreamCenter& MediaStreamCenter::instance() } MediaStreamCenter::MediaStreamCenter() - : m_private(adoptPtr(WebKit::Platform::current()->createMediaStreamCenter(this))) + : m_private(adoptPtr(blink::Platform::current()->createMediaStreamCenter(this))) { } @@ -100,12 +100,12 @@ bool MediaStreamCenter::didStopMediaStreamTrack(MediaStreamComponent* track) void MediaStreamCenter::didCreateMediaStream(MediaStreamDescriptor* stream) { if (m_private) { - WebKit::WebMediaStream webStream(stream); + blink::WebMediaStream webStream(stream); m_private->didCreateMediaStream(webStream); } } -void MediaStreamCenter::stopLocalMediaStream(const WebKit::WebMediaStream& webStream) +void MediaStreamCenter::stopLocalMediaStream(const blink::WebMediaStream& webStream) { MediaStreamDescriptor* stream = webStream; MediaStreamDescriptorClient* client = stream->client(); diff --git a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.h b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.h index 28ee46a..0508a74 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.h +++ b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamCenter.h @@ -39,7 +39,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebMediaStream; class WebMediaStreamCenter; class WebMediaStreamTrack; @@ -51,7 +51,7 @@ class MediaStreamComponent; class MediaStreamDescriptor; class MediaStreamTrackSourcesRequest; -class MediaStreamCenter : public WebKit::WebMediaStreamCenterClient { +class MediaStreamCenter : public blink::WebMediaStreamCenterClient { public: ~MediaStreamCenter(); @@ -65,13 +65,13 @@ public: bool didStopMediaStreamTrack(MediaStreamComponent*); void didCreateMediaStream(MediaStreamDescriptor*); - // WebKit::WebMediaStreamCenterClient - virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE; + // blink::WebMediaStreamCenterClient + virtual void stopLocalMediaStream(const blink::WebMediaStream&) OVERRIDE; private: MediaStreamCenter(); - OwnPtr<WebKit::WebMediaStreamCenter> m_private; + OwnPtr<blink::WebMediaStreamCenter> m_private; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.cpp b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.cpp index 60a7a85..29f6470 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.cpp +++ b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.cpp @@ -65,7 +65,7 @@ MediaStreamComponent::MediaStreamComponent(const String& id, MediaStreamDescript } #if ENABLE(WEB_AUDIO) -void MediaStreamComponent::AudioSourceProviderImpl::wrap(WebKit::WebAudioSourceProvider* provider) +void MediaStreamComponent::AudioSourceProviderImpl::wrap(blink::WebAudioSourceProvider* provider) { MutexLocker locker(m_provideInputLock); m_webAudioSourceProvider = provider; @@ -85,7 +85,7 @@ void MediaStreamComponent::AudioSourceProviderImpl::provideInput(AudioBus* bus, // Wrap the AudioBus channel data using WebVector. size_t n = bus->numberOfChannels(); - WebKit::WebVector<float*> webAudioData(n); + blink::WebVector<float*> webAudioData(n); for (size_t i = 0; i < n; ++i) webAudioData[i] = bus->channel(i)->mutableData(); diff --git a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.h b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.h index b0cbd9c..264bbf1 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.h +++ b/third_party/WebKit/Source/core/platform/mediastream/MediaStreamComponent.h @@ -38,7 +38,7 @@ #include "wtf/ThreadingPrimitives.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebAudioSourceProvider; } @@ -69,7 +69,7 @@ public: #if ENABLE(WEB_AUDIO) AudioSourceProvider* audioSourceProvider() { return &m_sourceProvider; } - void setSourceProvider(WebKit::WebAudioSourceProvider* provider) { m_sourceProvider.wrap(provider); } + void setSourceProvider(blink::WebAudioSourceProvider* provider) { m_sourceProvider.wrap(provider); } #endif // ENABLE(WEB_AUDIO) ExtraData* extraData() const { return m_extraData.get(); } @@ -91,14 +91,14 @@ private: virtual ~AudioSourceProviderImpl() { } - // Wraps the given WebKit::WebAudioSourceProvider to WebCore::AudioSourceProvider. - void wrap(WebKit::WebAudioSourceProvider*); + // Wraps the given blink::WebAudioSourceProvider to WebCore::AudioSourceProvider. + void wrap(blink::WebAudioSourceProvider*); // WebCore::AudioSourceProvider virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess); private: - WebKit::WebAudioSourceProvider* m_webAudioSourceProvider; + blink::WebAudioSourceProvider* m_webAudioSourceProvider; Mutex m_provideInputLock; }; diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.cpp b/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.cpp index ca3d5bc..1281656 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.cpp +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.cpp @@ -31,7 +31,7 @@ #include "public/platform/WebRTCDTMFSenderHandler.h" #include "wtf/PassOwnPtr.h" -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.h b/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.h index f9ef7fb..58aea58 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.h +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCDTMFSenderHandler.h @@ -37,9 +37,9 @@ namespace WebCore { class RTCDTMFSenderHandlerClient; -class RTCDTMFSenderHandler : public WebKit::WebRTCDTMFSenderHandlerClient { +class RTCDTMFSenderHandler : public blink::WebRTCDTMFSenderHandlerClient { public: - static PassOwnPtr<RTCDTMFSenderHandler> create(WebKit::WebRTCDTMFSenderHandler*); + static PassOwnPtr<RTCDTMFSenderHandler> create(blink::WebRTCDTMFSenderHandler*); virtual ~RTCDTMFSenderHandler(); void setClient(RTCDTMFSenderHandlerClient*); @@ -49,13 +49,13 @@ public: bool canInsertDTMF(); bool insertDTMF(const String& tones, long duration, long interToneGap); - // WebKit::WebRTCDTMFSenderHandlerClient implementation. - virtual void didPlayTone(const WebKit::WebString& tone) const OVERRIDE; + // blink::WebRTCDTMFSenderHandlerClient implementation. + virtual void didPlayTone(const blink::WebString& tone) const OVERRIDE; private: - explicit RTCDTMFSenderHandler(WebKit::WebRTCDTMFSenderHandler*); + explicit RTCDTMFSenderHandler(blink::WebRTCDTMFSenderHandler*); - OwnPtr<WebKit::WebRTCDTMFSenderHandler> m_webHandler; + OwnPtr<blink::WebRTCDTMFSenderHandler> m_webHandler; RTCDTMFSenderHandlerClient* m_client; }; diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.cpp b/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.cpp index cd3d749..b317931 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.cpp +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.cpp @@ -32,12 +32,12 @@ namespace WebCore { -PassOwnPtr<RTCDataChannelHandler> RTCDataChannelHandler::create(WebKit::WebRTCDataChannelHandler* webHandler) +PassOwnPtr<RTCDataChannelHandler> RTCDataChannelHandler::create(blink::WebRTCDataChannelHandler* webHandler) { return adoptPtr(new RTCDataChannelHandler(webHandler)); } -RTCDataChannelHandler::RTCDataChannelHandler(WebKit::WebRTCDataChannelHandler* webHandler) +RTCDataChannelHandler::RTCDataChannelHandler(blink::WebRTCDataChannelHandler* webHandler) : m_webHandler(adoptPtr(webHandler)) , m_client(0) { @@ -119,7 +119,7 @@ void RTCDataChannelHandler::didChangeReadyState(WebRTCDataChannelHandlerClient:: m_client->didChangeReadyState(static_cast<RTCDataChannelHandlerClient::ReadyState>(state)); } -void RTCDataChannelHandler::didReceiveStringData(const WebKit::WebString& data) const +void RTCDataChannelHandler::didReceiveStringData(const blink::WebString& data) const { if (m_client) m_client->didReceiveStringData(data); diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.h b/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.h index 70a3076..3f2acf3 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.h +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCDataChannelHandler.h @@ -36,9 +36,9 @@ namespace WebCore { class RTCDataChannelHandlerClient; -class RTCDataChannelHandler : public WebKit::WebRTCDataChannelHandlerClient { +class RTCDataChannelHandler : public blink::WebRTCDataChannelHandlerClient { public: - static PassOwnPtr<RTCDataChannelHandler> create(WebKit::WebRTCDataChannelHandler*); + static PassOwnPtr<RTCDataChannelHandler> create(blink::WebRTCDataChannelHandler*); virtual ~RTCDataChannelHandler(); void setClient(RTCDataChannelHandlerClient*); @@ -60,16 +60,16 @@ public: bool sendRawData(const char*, size_t); void close(); - // WebKit::WebRTCDataChannelHandlerClient implementation. + // blink::WebRTCDataChannelHandlerClient implementation. virtual void didChangeReadyState(ReadyState) const OVERRIDE; - virtual void didReceiveStringData(const WebKit::WebString&) const OVERRIDE; + virtual void didReceiveStringData(const blink::WebString&) const OVERRIDE; virtual void didReceiveRawData(const char*, size_t) const OVERRIDE; virtual void didDetectError() const OVERRIDE; private: - explicit RTCDataChannelHandler(WebKit::WebRTCDataChannelHandler*); + explicit RTCDataChannelHandler(blink::WebRTCDataChannelHandler*); - OwnPtr<WebKit::WebRTCDataChannelHandler> m_webHandler; + OwnPtr<blink::WebRTCDataChannelHandler> m_webHandler; RTCDataChannelHandlerClient* m_client; }; diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.cpp b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.cpp index f931931..e2c1563 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.cpp +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.cpp @@ -57,7 +57,7 @@ namespace WebCore { -WebKit::WebRTCPeerConnectionHandler* RTCPeerConnectionHandler::toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler* handler) +blink::WebRTCPeerConnectionHandler* RTCPeerConnectionHandler::toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler* handler) { return static_cast<RTCPeerConnectionHandler*>(handler)->m_webHandler.get(); } @@ -84,7 +84,7 @@ RTCPeerConnectionHandler::~RTCPeerConnectionHandler() bool RTCPeerConnectionHandler::createWebHandler() { - m_webHandler = adoptPtr(WebKit::Platform::current()->createRTCPeerConnectionHandler(this)); + m_webHandler = adoptPtr(blink::Platform::current()->createRTCPeerConnectionHandler(this)); return m_webHandler; } @@ -103,12 +103,12 @@ void RTCPeerConnectionHandler::createAnswer(PassRefPtr<RTCSessionDescriptionRequ m_webHandler->createAnswer(request, constraints); } -void RTCPeerConnectionHandler::setLocalDescription(PassRefPtr<RTCVoidRequest> request, WebKit::WebRTCSessionDescription sessionDescription) +void RTCPeerConnectionHandler::setLocalDescription(PassRefPtr<RTCVoidRequest> request, blink::WebRTCSessionDescription sessionDescription) { m_webHandler->setLocalDescription(request, sessionDescription); } -void RTCPeerConnectionHandler::setRemoteDescription(PassRefPtr<RTCVoidRequest> request, WebKit::WebRTCSessionDescription sessionDescription) +void RTCPeerConnectionHandler::setRemoteDescription(PassRefPtr<RTCVoidRequest> request, blink::WebRTCSessionDescription sessionDescription) { m_webHandler->setRemoteDescription(request, sessionDescription); } @@ -118,22 +118,22 @@ bool RTCPeerConnectionHandler::updateIce(PassRefPtr<RTCConfiguration> configurat return m_webHandler->updateICE(configuration, constraints); } -bool RTCPeerConnectionHandler::addIceCandidate(WebKit::WebRTCICECandidate iceCandidate) +bool RTCPeerConnectionHandler::addIceCandidate(blink::WebRTCICECandidate iceCandidate) { return m_webHandler->addICECandidate(iceCandidate); } -bool RTCPeerConnectionHandler::addIceCandidate(PassRefPtr<RTCVoidRequest> request, WebKit::WebRTCICECandidate iceCandidate) +bool RTCPeerConnectionHandler::addIceCandidate(PassRefPtr<RTCVoidRequest> request, blink::WebRTCICECandidate iceCandidate) { return m_webHandler->addICECandidate(request, iceCandidate); } -WebKit::WebRTCSessionDescription RTCPeerConnectionHandler::localDescription() +blink::WebRTCSessionDescription RTCPeerConnectionHandler::localDescription() { return m_webHandler->localDescription(); } -WebKit::WebRTCSessionDescription RTCPeerConnectionHandler::remoteDescription() +blink::WebRTCSessionDescription RTCPeerConnectionHandler::remoteDescription() { return m_webHandler->remoteDescription(); } @@ -153,9 +153,9 @@ void RTCPeerConnectionHandler::getStats(PassRefPtr<RTCStatsRequest> request) m_webHandler->getStats(request); } -PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandler::createDataChannel(const String& label, const WebKit::WebRTCDataChannelInit& init) +PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandler::createDataChannel(const String& label, const blink::WebRTCDataChannelInit& init) { - WebKit::WebRTCDataChannelHandler* webHandler = m_webHandler->createDataChannel(label, init); + blink::WebRTCDataChannelHandler* webHandler = m_webHandler->createDataChannel(label, init); if (!webHandler) return nullptr; @@ -164,7 +164,7 @@ PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandler::createDataChannel(co PassOwnPtr<RTCDTMFSenderHandler> RTCPeerConnectionHandler::createDTMFSender(PassRefPtr<MediaStreamComponent> track) { - WebKit::WebRTCDTMFSenderHandler* webHandler = m_webHandler->createDTMFSender(track); + blink::WebRTCDTMFSenderHandler* webHandler = m_webHandler->createDTMFSender(track); if (!webHandler) return nullptr; @@ -181,37 +181,37 @@ void RTCPeerConnectionHandler::negotiationNeeded() m_client->negotiationNeeded(); } -void RTCPeerConnectionHandler::didGenerateICECandidate(const WebKit::WebRTCICECandidate& iceCandidate) +void RTCPeerConnectionHandler::didGenerateICECandidate(const blink::WebRTCICECandidate& iceCandidate) { m_client->didGenerateIceCandidate(iceCandidate); } -void RTCPeerConnectionHandler::didChangeSignalingState(WebKit::WebRTCPeerConnectionHandlerClient::SignalingState state) +void RTCPeerConnectionHandler::didChangeSignalingState(blink::WebRTCPeerConnectionHandlerClient::SignalingState state) { m_client->didChangeSignalingState(static_cast<RTCPeerConnectionHandlerClient::SignalingState>(state)); } -void RTCPeerConnectionHandler::didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state) +void RTCPeerConnectionHandler::didChangeICEGatheringState(blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState state) { m_client->didChangeIceGatheringState(static_cast<RTCPeerConnectionHandlerClient::IceGatheringState>(state)); } -void RTCPeerConnectionHandler::didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState state) +void RTCPeerConnectionHandler::didChangeICEConnectionState(blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState state) { m_client->didChangeIceConnectionState(static_cast<RTCPeerConnectionHandlerClient::IceConnectionState>(state)); } -void RTCPeerConnectionHandler::didAddRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor) +void RTCPeerConnectionHandler::didAddRemoteStream(const blink::WebMediaStream& webMediaStreamDescriptor) { m_client->didAddRemoteStream(webMediaStreamDescriptor); } -void RTCPeerConnectionHandler::didRemoveRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor) +void RTCPeerConnectionHandler::didRemoveRemoteStream(const blink::WebMediaStream& webMediaStreamDescriptor) { m_client->didRemoveRemoteStream(webMediaStreamDescriptor); } -void RTCPeerConnectionHandler::didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler* webHandler) +void RTCPeerConnectionHandler::didAddRemoteDataChannel(blink::WebRTCDataChannelHandler* webHandler) { ASSERT(webHandler); m_client->didAddRemoteDataChannel(RTCDataChannelHandler::create(webHandler)); diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.h b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.h index 5b0d689..5565981 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.h +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandler.h @@ -38,7 +38,7 @@ #include "wtf/OwnPtr.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebMediaStream; class WebRTCICECandidate; class WebRTCSessionDescription; @@ -57,7 +57,7 @@ class RTCSessionDescriptionRequest; class RTCStatsRequest; class RTCVoidRequest; -class RTCPeerConnectionHandler : public WebKit::WebRTCPeerConnectionHandlerClient { +class RTCPeerConnectionHandler : public blink::WebRTCPeerConnectionHandlerClient { public: static PassOwnPtr<RTCPeerConnectionHandler> create(RTCPeerConnectionHandlerClient*); virtual ~RTCPeerConnectionHandler(); @@ -68,39 +68,39 @@ public: void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>); void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>); - void setLocalDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCSessionDescription); - void setRemoteDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCSessionDescription); - WebKit::WebRTCSessionDescription localDescription(); - WebKit::WebRTCSessionDescription remoteDescription(); + void setLocalDescription(PassRefPtr<RTCVoidRequest>, blink::WebRTCSessionDescription); + void setRemoteDescription(PassRefPtr<RTCVoidRequest>, blink::WebRTCSessionDescription); + blink::WebRTCSessionDescription localDescription(); + blink::WebRTCSessionDescription remoteDescription(); bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>); // DEPRECATED - bool addIceCandidate(WebKit::WebRTCICECandidate); + bool addIceCandidate(blink::WebRTCICECandidate); - bool addIceCandidate(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCICECandidate); + bool addIceCandidate(PassRefPtr<RTCVoidRequest>, blink::WebRTCICECandidate); bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>); void removeStream(PassRefPtr<MediaStreamDescriptor>); void getStats(PassRefPtr<RTCStatsRequest>); - PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const WebKit::WebRTCDataChannelInit&); + PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const blink::WebRTCDataChannelInit&); PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamComponent>); void stop(); - // WebKit::WebRTCPeerConnectionHandlerClient implementation. + // blink::WebRTCPeerConnectionHandlerClient implementation. virtual void negotiationNeeded() OVERRIDE; - virtual void didGenerateICECandidate(const WebKit::WebRTCICECandidate&) OVERRIDE; - virtual void didChangeSignalingState(WebKit::WebRTCPeerConnectionHandlerClient::SignalingState) OVERRIDE; - virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState) OVERRIDE; - virtual void didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState) OVERRIDE; - virtual void didAddRemoteStream(const WebKit::WebMediaStream&) OVERRIDE; - virtual void didRemoveRemoteStream(const WebKit::WebMediaStream&) OVERRIDE; - virtual void didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler*) OVERRIDE; + virtual void didGenerateICECandidate(const blink::WebRTCICECandidate&) OVERRIDE; + virtual void didChangeSignalingState(blink::WebRTCPeerConnectionHandlerClient::SignalingState) OVERRIDE; + virtual void didChangeICEGatheringState(blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState) OVERRIDE; + virtual void didChangeICEConnectionState(blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState) OVERRIDE; + virtual void didAddRemoteStream(const blink::WebMediaStream&) OVERRIDE; + virtual void didRemoveRemoteStream(const blink::WebMediaStream&) OVERRIDE; + virtual void didAddRemoteDataChannel(blink::WebRTCDataChannelHandler*) OVERRIDE; - static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler*); + static blink::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RTCPeerConnectionHandler*); private: explicit RTCPeerConnectionHandler(RTCPeerConnectionHandlerClient*); - OwnPtr<WebKit::WebRTCPeerConnectionHandler> m_webHandler; + OwnPtr<blink::WebRTCPeerConnectionHandler> m_webHandler; RTCPeerConnectionHandlerClient* m_client; }; diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandlerClient.h b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandlerClient.h index e78e44c..46f276f 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandlerClient.h +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCPeerConnectionHandlerClient.h @@ -33,7 +33,7 @@ #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebRTCICECandidate; } @@ -72,7 +72,7 @@ public: virtual ~RTCPeerConnectionHandlerClient() { } virtual void negotiationNeeded() = 0; - virtual void didGenerateIceCandidate(WebKit::WebRTCICECandidate) = 0; + virtual void didGenerateIceCandidate(blink::WebRTCICECandidate) = 0; virtual void didChangeSignalingState(SignalingState) = 0; virtual void didChangeIceGatheringState(IceGatheringState) = 0; virtual void didChangeIceConnectionState(IceConnectionState) = 0; diff --git a/third_party/WebKit/Source/core/platform/mediastream/RTCSessionDescriptionRequest.h b/third_party/WebKit/Source/core/platform/mediastream/RTCSessionDescriptionRequest.h index 0c7b7be..988f3ef 100644 --- a/third_party/WebKit/Source/core/platform/mediastream/RTCSessionDescriptionRequest.h +++ b/third_party/WebKit/Source/core/platform/mediastream/RTCSessionDescriptionRequest.h @@ -36,7 +36,7 @@ #include "wtf/RefPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebRTCSessionDescription; } @@ -51,7 +51,7 @@ public: virtual ~RTCSessionDescriptionRequest() { } - virtual void requestSucceeded(const WebKit::WebRTCSessionDescription&) = 0; + virtual void requestSucceeded(const blink::WebRTCSessionDescription&) = 0; virtual void requestFailed(const String& error) = 0; PassRefPtr<ExtraData> extraData() const { return m_extraData; } diff --git a/third_party/WebKit/Source/core/platform/testing/FakeWebGraphicsContext3D.h b/third_party/WebKit/Source/core/platform/testing/FakeWebGraphicsContext3D.h index bf4c87e..db97f80 100644 --- a/third_party/WebKit/Source/core/platform/testing/FakeWebGraphicsContext3D.h +++ b/third_party/WebKit/Source/core/platform/testing/FakeWebGraphicsContext3D.h @@ -29,7 +29,7 @@ #include "core/platform/graphics/GraphicsContext3D.h" #include "public/platform/WebGraphicsContext3D.h" -namespace WebKit { +namespace blink { // WebGraphicsContext3D base class for use in WebKit unit tests. // All operations are no-ops (returning 0 if necessary). @@ -289,6 +289,6 @@ protected: Attributes m_attrs; }; -} // namespace WebKit +} // namespace blink #endif // FakeWebGraphicsContext3D_h diff --git a/third_party/WebKit/Source/core/plugins/PluginView.h b/third_party/WebKit/Source/core/plugins/PluginView.h index 5b1c68d..cc817b3 100644 --- a/third_party/WebKit/Source/core/plugins/PluginView.h +++ b/third_party/WebKit/Source/core/plugins/PluginView.h @@ -32,7 +32,7 @@ struct NPObject; -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -44,7 +44,7 @@ class PluginView : public Widget { public: virtual bool isPluginView() const { return true; } - virtual WebKit::WebLayer* platformLayer() const { return 0; } + virtual blink::WebLayer* platformLayer() const { return 0; } virtual NPObject* scriptableObject() { return 0; } virtual bool getFormValue(String&) { return false; } virtual bool wantsWheelEvents() { return false; } diff --git a/third_party/WebKit/Source/core/rendering/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/rendering/CompositedLayerMapping.cpp index 92c9237..1beb7cc 100644 --- a/third_party/WebKit/Source/core/rendering/CompositedLayerMapping.cpp +++ b/third_party/WebKit/Source/core/rendering/CompositedLayerMapping.cpp @@ -859,7 +859,7 @@ void CompositedLayerMapping::updateDrawsContent(bool isSimpleContainer) if (hasPaintedContent && isAcceleratedCanvas(renderer())) { CanvasRenderingContext* context = toHTMLCanvasElement(renderer()->node())->renderingContext(); // Content layer may be null if context is lost. - if (WebKit::WebLayer* contentLayer = context->platformLayer()) { + if (blink::WebLayer* contentLayer = context->platformLayer()) { Color bgColor; if (contentLayerSupportsDirectBackgroundComposition(renderer())) { bgColor = rendererBackgroundColor(); diff --git a/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.cpp b/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.cpp index a3a8ab7..efb8bd6 100644 --- a/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.cpp @@ -84,9 +84,9 @@ static String unavailablePluginReplacementText(Node* node, RenderEmbeddedObject: Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale(); switch (pluginUnavailabilityReason) { case RenderEmbeddedObject::PluginMissing: - return locale.queryString(WebKit::WebLocalizedString::MissingPluginText); + return locale.queryString(blink::WebLocalizedString::MissingPluginText); case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy: - return locale.queryString(WebKit::WebLocalizedString::BlockedPluginText); + return locale.queryString(blink::WebLocalizedString::BlockedPluginText); } ASSERT_NOT_REACHED(); diff --git a/third_party/WebKit/Source/core/rendering/RenderFileUploadControl.cpp b/third_party/WebKit/Source/core/rendering/RenderFileUploadControl.cpp index ed97088..2fc30d0 100644 --- a/third_party/WebKit/Source/core/rendering/RenderFileUploadControl.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderFileUploadControl.cpp @@ -157,7 +157,7 @@ void RenderFileUploadControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogic RenderFileUploadControl* renderer = const_cast<RenderFileUploadControl*>(this); float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), TextRun::AllowTrailingExpansion)); - const String label = toHTMLInputElement(node())->locale().queryString(WebKit::WebLocalizedString::FileButtonNoFileSelectedLabel); + const String label = toHTMLInputElement(node())->locale().queryString(blink::WebLocalizedString::FileButtonNoFileSelectedLabel); float defaultLabelWidth = font.width(constructTextRun(renderer, font, label, style(), TextRun::AllowTrailingExpansion)); if (HTMLInputElement* button = uploadButton()) if (RenderObject* buttonRenderer = button->renderer()) diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp index d8e9ddc..b668619 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayerCompositor.cpp @@ -1116,7 +1116,7 @@ void RenderLayerCompositor::rebuildCompositingLayerTree(RenderLayer* layer, Vect if (!depth) { int percentageIncreaseInPixels = static_cast<int>(pixelsAddedByPromotingAllTransitions / pixelsWithoutPromotingAllTransitions * 100); - WebKit::Platform::current()->histogramCustomCounts("Renderer.PixelIncreaseFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); + blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreaseFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); } } @@ -1169,14 +1169,14 @@ void RenderLayerCompositor::frameViewDidScroll() m_scrollLayer->setPosition(-scrollPosition); - WebKit::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedRootBackground", + blink::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedRootBackground", ScrolledMainFrameBucket, AcceleratedFixedRootBackgroundHistogramMax); if (!m_renderView->rootBackgroundIsEntirelyFixed()) return; - WebKit::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedRootBackground", + blink::Platform::current()->histogramEnumeration("Renderer.AcceleratedFixedRootBackground", !!fixedRootBackgroundLayer() ? ScrolledMainFrameWithAcceleratedFixedRootBackground : ScrolledMainFrameWithUnacceleratedFixedRootBackground, diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerScrollableArea.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerScrollableArea.cpp index a666c7c..6499369 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerScrollableArea.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayerScrollableArea.cpp @@ -1349,7 +1349,7 @@ void RenderLayerScrollableArea::updateScrollableAreaSet(bool hasOverflow) // Count the total number of RenderLayers that are scrollable areas for // any period. We only want to record this at most once per RenderLayer. if (requiresScrollableArea && !m_isScrollableAreaHasBeenRecorded) { - WebKit::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::IsScrollableAreaBucket, RenderLayer::CompositedScrollingHistogramMax); + blink::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::IsScrollableAreaBucket, RenderLayer::CompositedScrollingHistogramMax); m_isScrollableAreaHasBeenRecorded = true; } @@ -1387,7 +1387,7 @@ void RenderLayerScrollableArea::updateNeedsCompositedScrolling() // relax composited scrolling requirements, thereby increasing the // number of composited overflow divs. if (layer()->acceleratedCompositingForOverflowScrollEnabled()) - WebKit::Platform::current()->histogramEnumeration("Renderer.NeedsCompositedScrolling", needsCompositedScrolling, 2); + blink::Platform::current()->histogramEnumeration("Renderer.NeedsCompositedScrolling", needsCompositedScrolling, 2); const bool needsCompositedScrollingDidChange = setNeedsCompositedScrolling(needsCompositedScrolling); @@ -1409,7 +1409,7 @@ bool RenderLayerScrollableArea::setNeedsCompositedScrolling(bool needsComposited // some point. This should be recorded at most once per RenderLayer, so we // check m_willUseCompositedScrollingHasBeenRecorded. if (layer()->acceleratedCompositingForOverflowScrollEnabled() && !m_willUseCompositedScrollingHasBeenRecorded) { - WebKit::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::WillUseCompositedScrollingBucket, RenderLayer::CompositedScrollingHistogramMax); + blink::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::WillUseCompositedScrollingBucket, RenderLayer::CompositedScrollingHistogramMax); m_willUseCompositedScrollingHasBeenRecorded = true; } diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp index 74fa089..401202b 100644 --- a/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderLayerStackingNode.cpp @@ -627,7 +627,7 @@ bool RenderLayerStackingNode::setNeedsToBeStackingContainer(bool needsToBeStacki // containers some point. This should be recorded at most once per // RenderLayer, so we check m_needsToBeStackingContainerHasBeenRecorded. if (layer()->acceleratedCompositingForOverflowScrollEnabled() && !m_needsToBeStackingContainerHasBeenRecorded) { - WebKit::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::NeedsToBeStackingContainerBucket, RenderLayer::CompositedScrollingHistogramMax); + blink::Platform::current()->histogramEnumeration("Renderer.CompositedScrolling", RenderLayer::NeedsToBeStackingContainerBucket, RenderLayer::CompositedScrollingHistogramMax); m_needsToBeStackingContainerHasBeenRecorded = true; } diff --git a/third_party/WebKit/Source/core/rendering/RenderTheme.cpp b/third_party/WebKit/Source/core/rendering/RenderTheme.cpp index 393e34e..04af283 100644 --- a/third_party/WebKit/Source/core/rendering/RenderTheme.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderTheme.cpp @@ -75,16 +75,16 @@ static Color& customFocusRingColor() return color; } -static WebKit::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o) +static blink::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o) { if (!theme->isEnabled(o)) - return WebKit::WebFallbackThemeEngine::StateDisabled; + return blink::WebFallbackThemeEngine::StateDisabled; if (theme->isPressed(o)) - return WebKit::WebFallbackThemeEngine::StatePressed; + return blink::WebFallbackThemeEngine::StatePressed; if (theme->isHovered(o)) - return WebKit::WebFallbackThemeEngine::StateHover; + return blink::WebFallbackThemeEngine::StateHover; - return WebKit::WebFallbackThemeEngine::StateNormal; + return blink::WebFallbackThemeEngine::StateNormal; } RenderTheme::RenderTheme() @@ -1154,12 +1154,12 @@ String RenderTheme::fileListNameForWidth(Locale& locale, const FileList* fileLis String string; if (fileList->isEmpty()) { - string = locale.queryString(WebKit::WebLocalizedString::FileButtonNoFileSelectedLabel); + string = locale.queryString(blink::WebLocalizedString::FileButtonNoFileSelectedLabel); } else if (fileList->length() == 1) { string = fileList->item(0)->name(); } else { // FIXME: Localization of fileList->length(). - return StringTruncator::rightTruncate(locale.queryString(WebKit::WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font, StringTruncator::EnableRoundingHacks); + return StringTruncator::rightTruncate(locale.queryString(blink::WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font, StringTruncator::EnableRoundingHacks); } return StringTruncator::centerTruncate(string, width, font, StringTruncator::EnableRoundingHacks); @@ -1238,8 +1238,8 @@ void RenderTheme::setSizeIfAuto(RenderStyle* style, const IntSize& size) bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r) { - WebKit::WebFallbackThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebFallbackThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.button.checked = isChecked(o); extraParams.button.indeterminate = isIndeterminate(o); @@ -1254,7 +1254,7 @@ bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintIn i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); + blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); return false; } @@ -1264,7 +1264,7 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) return; - IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartCheckbox); + IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartCheckbox); float zoomLevel = style->effectiveZoom(); size.setWidth(size.width() * zoomLevel); size.setHeight(size.height() * zoomLevel); @@ -1280,8 +1280,8 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r) { - WebKit::WebFallbackThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebFallbackThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.button.checked = isChecked(o); extraParams.button.indeterminate = isIndeterminate(o); @@ -1296,7 +1296,7 @@ bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); + blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); return false; } @@ -1306,7 +1306,7 @@ void RenderTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle* style, Element if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) return; - IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartRadio); + IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartRadio); float zoomLevel = style->effectiveZoom(); size.setWidth(size.width() * zoomLevel); size.setHeight(size.height() * zoomLevel); diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp index 98f7071..f3ee81f 100644 --- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp @@ -83,7 +83,7 @@ void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, if (isRunningLayoutTest()) { // Match Linux spin button style in layout tests. // FIXME: Consider removing the conditional if a future Android theme matches this. - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartInnerSpinButton); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartInnerSpinButton); style->setWidth(Length(size.width(), Fixed)); style->setMinWidth(Length(size.width(), Fixed)); @@ -99,7 +99,7 @@ int RenderThemeChromiumAndroid::menuListArrowPadding() const { // We cannot use the scrollbar thickness here, as it's width is 0 on Android. // Instead, use the width of the scrollbar down arrow. - IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarDownArrow); + IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartScrollbarDownArrow); return scrollbarSize.width(); } diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault.cpp b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault.cpp index 0eec664..4a610c8 100644 --- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault.cpp @@ -52,16 +52,16 @@ double RenderThemeChromiumDefault::m_caretBlinkInterval; static const unsigned defaultButtonBackgroundColor = 0xffdddddd; -static WebKit::WebThemeEngine::State getWebThemeState(const RenderTheme* theme, const RenderObject* o) +static blink::WebThemeEngine::State getWebThemeState(const RenderTheme* theme, const RenderObject* o) { if (!theme->isEnabled(o)) - return WebKit::WebThemeEngine::StateDisabled; + return blink::WebThemeEngine::StateDisabled; if (theme->isPressed(o)) - return WebKit::WebThemeEngine::StatePressed; + return blink::WebThemeEngine::StatePressed; if (theme->isHovered(o)) - return WebKit::WebThemeEngine::StateHover; + return blink::WebThemeEngine::StateHover; - return WebKit::WebThemeEngine::StateNormal; + return blink::WebThemeEngine::StateNormal; } PassRefPtr<RenderTheme> RenderThemeChromiumDefault::create() @@ -168,7 +168,7 @@ int RenderThemeChromiumDefault::sliderTickOffsetFromTrackCenter() const void RenderThemeChromiumDefault::adjustSliderThumbSize(RenderStyle* style, Element* element) const { - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartSliderThumb); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartSliderThumb); float zoomLevel = style->effectiveZoom(); if (style->appearance() == SliderThumbHorizontalPart) { style->setWidth(Length(size.width() * zoomLevel, Fixed)); @@ -209,8 +209,8 @@ void RenderThemeChromiumDefault::setSelectionColors( bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.button.checked = isChecked(o); extraParams.button.indeterminate = isIndeterminate(o); @@ -225,7 +225,7 @@ bool RenderThemeChromiumDefault::paintCheckbox(RenderObject* o, const PaintInfo& i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartCheckbox, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartCheckbox, getWebThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); return false; } @@ -235,7 +235,7 @@ void RenderThemeChromiumDefault::setCheckboxSize(RenderStyle* style) const if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) return; - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartCheckbox); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartCheckbox); float zoomLevel = style->effectiveZoom(); size.setWidth(size.width() * zoomLevel); size.setHeight(size.height() * zoomLevel); @@ -244,11 +244,11 @@ void RenderThemeChromiumDefault::setCheckboxSize(RenderStyle* style) const bool RenderThemeChromiumDefault::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.button.checked = isChecked(o); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartRadio, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartRadio, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } @@ -258,7 +258,7 @@ void RenderThemeChromiumDefault::setRadioSize(RenderStyle* style) const if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) return; - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartRadio); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartRadio); float zoomLevel = style->effectiveZoom(); size.setWidth(size.width() * zoomLevel); size.setHeight(size.height() * zoomLevel); @@ -267,14 +267,14 @@ void RenderThemeChromiumDefault::setRadioSize(RenderStyle* style) const bool RenderThemeChromiumDefault::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.button.hasBorder = true; extraParams.button.backgroundColor = defaultButtonBackgroundColor; if (o->hasBackground()) extraParams.button.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb(); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartButton, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } @@ -287,17 +287,17 @@ bool RenderThemeChromiumDefault::paintTextField(RenderObject* o, const PaintInfo ControlPart part = o->style()->appearance(); - WebKit::WebThemeEngine::ExtraParams extraParams; + blink::WebThemeEngine::ExtraParams extraParams; extraParams.textField.isTextArea = part == TextAreaPart; extraParams.textField.isListbox = part == ListboxPart; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebCanvas* canvas = i.context->canvas(); // Fallback to white if the specified color object is invalid. Color backgroundColor = o->resolveColor(CSSPropertyBackgroundColor, Color::white); extraParams.textField.backgroundColor = backgroundColor.rgb(); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartTextField, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartTextField, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } @@ -309,7 +309,7 @@ bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo& const int right = rect.x() + rect.width(); const int middle = rect.y() + rect.height() / 2; - WebKit::WebThemeEngine::ExtraParams extraParams; + blink::WebThemeEngine::ExtraParams extraParams; extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13; extraParams.menuList.arrowY = middle; const RenderBox* box = toRenderBox(o); @@ -321,16 +321,16 @@ bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo& if (o->hasBackground()) extraParams.menuList.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb(); - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebCanvas* canvas = i.context->canvas(); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartMenuList, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartMenuList, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart; paintSliderTicks(o, i, rect); @@ -346,15 +346,15 @@ bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintIn i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderTrack, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartSliderTrack, getWebThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); return false; } bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart; extraParams.slider.inDrag = isPressed(o); @@ -369,13 +369,13 @@ bool RenderThemeChromiumDefault::paintSliderThumb(RenderObject* o, const PaintIn i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderThumb, getWebThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartSliderThumb, getWebThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); return false; } void RenderThemeChromiumDefault::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const { - IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartInnerSpinButton); + IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::WebThemeEngine::PartInnerSpinButton); style->setWidth(Length(size.width(), Fixed)); style->setMinWidth(Length(size.width(), Fixed)); @@ -383,12 +383,12 @@ void RenderThemeChromiumDefault::adjustInnerSpinButtonStyle(RenderStyle* style, bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect) { - WebKit::WebThemeEngine::ExtraParams extraParams; - WebKit::WebCanvas* canvas = i.context->canvas(); + blink::WebThemeEngine::ExtraParams extraParams; + blink::WebCanvas* canvas = i.context->canvas(); extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState); extraParams.innerSpin.readOnly = isReadOnlyControl(o); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartInnerSpinButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartInnerSpinButton, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } @@ -400,7 +400,7 @@ bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintIn RenderProgress* renderProgress = toRenderProgress(o); IntRect valueRect = progressValueRectFor(renderProgress, rect); - WebKit::WebThemeEngine::ExtraParams extraParams; + blink::WebThemeEngine::ExtraParams extraParams; extraParams.progressBar.determinate = renderProgress->isDeterminate(); extraParams.progressBar.valueRectX = valueRect.x(); extraParams.progressBar.valueRectY = valueRect.y(); @@ -408,8 +408,8 @@ bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintIn extraParams.progressBar.valueRectHeight = valueRect.height(); DirectionFlippingScope scope(o, i, rect); - WebKit::WebCanvas* canvas = i.context->canvas(); - WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams); + blink::WebCanvas* canvas = i.context->canvas(); + blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), blink::WebRect(rect), &extraParams); return false; } diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumWin.cpp b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumWin.cpp index 8324b05..ef3ca2d 100644 --- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumWin.cpp +++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumWin.cpp @@ -301,8 +301,8 @@ bool RenderThemeChromiumWin::paintButton(RenderObject* o, const PaintInfo& i, co const ThemeData& themeData = getThemeData(o); ThemePainter painter(i.context, r); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintButton(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintButton(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); return false; } @@ -316,8 +316,8 @@ bool RenderThemeChromiumWin::paintSliderTrack(RenderObject* o, const PaintInfo& const ThemeData& themeData = getThemeData(o); ThemePainter painter(i.context, r); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); paintSliderTicks(o, i, r); @@ -329,8 +329,8 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo& const ThemeData& themeData = getThemeData(o); ThemePainter painter(i.context, r); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); return false; } @@ -338,7 +338,7 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo& static int menuListButtonWidth() { static int width = isRunningLayoutTest() ? kStandardMenuListButtonWidth : - IntSize(WebKit::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); + IntSize(blink::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); return width; } @@ -394,8 +394,8 @@ bool RenderThemeChromiumWin::paintMenuListButton(RenderObject* o, const PaintInf // Get the correct theme data for a textfield and paint the menu. ThemePainter painter(i.context, rect); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintMenuList(canvas, CP_DROPDOWNBUTTON, determineState(o), determineClassicState(o), WebKit::WebRect(painter.drawRect())); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintMenuList(canvas, CP_DROPDOWNBUTTON, determineState(o), determineClassicState(o), blink::WebRect(painter.drawRect())); return false; } @@ -571,8 +571,8 @@ bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o, { const ThemeData& themeData = getThemeData(o); ThemePainter painter(i.context, r); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintTextField(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect()), backgroundColor.rgb(), fillContentArea, drawEdges); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintTextField(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect()), backgroundColor.rgb(), fillContentArea, drawEdges); // End of block commits the painter before restoring context. } if (o->style()->hasBorderRadius()) @@ -596,16 +596,16 @@ bool RenderThemeChromiumWin::paintInnerSpinButton(RenderObject* object, const Pa half.setHeight(rect.height() / 2); const ThemeData& upThemeData = getThemeData(object, SpinButtonUp); ThemePainter upPainter(info.context, half); - WebKit::WebCanvas* canvas = upPainter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintSpinButton(canvas, upThemeData.m_part, upThemeData.m_state, upThemeData.m_classicState, WebKit::WebRect(upPainter.drawRect())); + blink::WebCanvas* canvas = upPainter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintSpinButton(canvas, upThemeData.m_part, upThemeData.m_state, upThemeData.m_classicState, blink::WebRect(upPainter.drawRect())); } { half.setY(rect.y() + rect.height() / 2); const ThemeData& downThemeData = getThemeData(object, SpinButtonDown); ThemePainter downPainter(info.context, half); - WebKit::WebCanvas* canvas = downPainter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintSpinButton(canvas, downThemeData.m_part, downThemeData.m_state, downThemeData.m_classicState, WebKit::WebRect(downPainter.drawRect())); + blink::WebCanvas* canvas = downPainter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintSpinButton(canvas, downThemeData.m_part, downThemeData.m_state, downThemeData.m_classicState, blink::WebRect(downPainter.drawRect())); } return false; } @@ -638,8 +638,8 @@ bool RenderThemeChromiumWin::paintProgressBar(RenderObject* o, const PaintInfo& double animatedSeconds = renderProgress->animationStartTime() ? WTF::currentTime() - renderProgress->animationStartTime() : 0; ThemePainter painter(i.context, r); DirectionFlippingScope scope(o, i, r); - WebKit::WebCanvas* canvas = painter.context()->canvas(); - WebKit::Platform::current()->themeEngine()->paintProgressBar(canvas, WebKit::WebRect(r), WebKit::WebRect(valueRect), renderProgress->isDeterminate(), animatedSeconds); + blink::WebCanvas* canvas = painter.context()->canvas(); + blink::Platform::current()->themeEngine()->paintProgressBar(canvas, blink::WebRect(r), blink::WebRect(valueRect), renderProgress->isDeterminate(), animatedSeconds); return false; } diff --git a/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.cpp b/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.cpp index 5532f77..01d5512 100644 --- a/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.cpp +++ b/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.cpp @@ -34,7 +34,7 @@ #include "public/platform/WebAnimation.h" #include "wtf/text/StringBuilder.h" -using WebKit::WebAnimation; +using blink::WebAnimation; namespace WebCore { diff --git a/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.h b/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.h index c13f38a..724de2e 100644 --- a/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.h +++ b/third_party/WebKit/Source/core/rendering/animation/WebAnimationProvider.h @@ -33,7 +33,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebAnimation; } @@ -48,9 +48,9 @@ struct WebAnimations { ~WebAnimations(); WebAnimations(const WebAnimations&); bool isEmpty() const; - OwnPtr<WebKit::WebAnimation> m_transformAnimation; - OwnPtr<WebKit::WebAnimation> m_opacityAnimation; - OwnPtr<WebKit::WebAnimation> m_filterAnimation; + OwnPtr<blink::WebAnimation> m_transformAnimation; + OwnPtr<blink::WebAnimation> m_opacityAnimation; + OwnPtr<blink::WebAnimation> m_filterAnimation; }; class WebAnimationProvider { @@ -65,7 +65,7 @@ public: WebAnimations startTransition(double timeOffset, CSSPropertyID, const RenderStyle* fromStyle, const RenderStyle* toStyle, bool hasTransform, bool hasFilter, const IntSize& boxSize, float fromOpacity, float toOpacity); private: - PassOwnPtr<WebKit::WebAnimation> createWebAnimationAndStoreId(const KeyframeValueList&, const IntSize& boxSize, const CSSAnimationData*, const String& animationName, double timeOffset); + PassOwnPtr<blink::WebAnimation> createWebAnimationAndStoreId(const KeyframeValueList&, const IntSize& boxSize, const CSSAnimationData*, const String& animationName, double timeOffset); typedef HashMap<String, int> AnimationIdMap; AnimationIdMap m_animationIdMap; diff --git a/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp b/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp index ecde69f..75e983d 100644 --- a/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp +++ b/third_party/WebKit/Source/core/svg/SVGPathStringSource.cpp @@ -247,4 +247,4 @@ bool SVGPathStringSource::parseArcToSegment(float& rx, float& ry, float& angle, return parseArcToSegmentHelper(m_current.m_character16, m_end.m_character16, rx, ry, angle, largeArc, sweep, targetPoint); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/core/testing/InspectorFrontendClientLocal.cpp b/third_party/WebKit/Source/core/testing/InspectorFrontendClientLocal.cpp index 52952d8..1adc4ab 100644 --- a/third_party/WebKit/Source/core/testing/InspectorFrontendClientLocal.cpp +++ b/third_party/WebKit/Source/core/testing/InspectorFrontendClientLocal.cpp @@ -69,7 +69,7 @@ public: private: void schedule() { - class TaskImpl : public WebKit::WebThread::Task { + class TaskImpl : public blink::WebThread::Task { public: RefPtr<InspectorBackendMessageQueue> owner; virtual void run() @@ -79,7 +79,7 @@ private: }; TaskImpl* taskImpl = new TaskImpl; taskImpl->owner = this; - WebKit::Platform::current()->currentThread()->postTask(taskImpl); + blink::Platform::current()->currentThread()->postTask(taskImpl); } void deliver() diff --git a/third_party/WebKit/Source/core/testing/InternalProfilers.cpp b/third_party/WebKit/Source/core/testing/InternalProfilers.cpp index 4560ee4..95d706f 100644 --- a/third_party/WebKit/Source/core/testing/InternalProfilers.cpp +++ b/third_party/WebKit/Source/core/testing/InternalProfilers.cpp @@ -40,22 +40,22 @@ namespace WebCore { void InternalProfilers::startHeapProfiling(const String& prefix) { - WebKit::Platform::current()->startHeapProfiling(prefix); + blink::Platform::current()->startHeapProfiling(prefix); } void InternalProfilers::stopHeapProfiling() { - WebKit::Platform::current()->stopHeapProfiling(); + blink::Platform::current()->stopHeapProfiling(); } void InternalProfilers::dumpHeapProfiling(const String& reason) { - WebKit::Platform::current()->dumpHeapProfiling(reason); + blink::Platform::current()->dumpHeapProfiling(reason); } String InternalProfilers::getHeapProfile() { - String text = WebKit::Platform::current()->getHeapProfile(); + String text = blink::Platform::current()->getHeapProfile(); // Only return the first line which contains total numbers // because whole dump is too big and too noisy to process in JavaScript. return text.substring(0, text.find('\n')); diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp index 89a618f..5cacf1c 100644 --- a/third_party/WebKit/Source/core/testing/Internals.cpp +++ b/third_party/WebKit/Source/core/testing/Internals.cpp @@ -1298,7 +1298,7 @@ static RenderLayer* findRenderLayerForGraphicsLayer(RenderLayer* searchRoot, Gra // of rects returned by an SkRegion (which have been split apart for sorting // purposes). No attempt is made to do this efficiently (eg. by relying on the // sort criteria of SkRegion). -static void mergeRects(WebKit::WebVector<WebKit::WebRect>& rects) +static void mergeRects(blink::WebVector<blink::WebRect>& rects) { for (size_t i = 0; i < rects.size(); ++i) { if (rects[i].isEmpty()) @@ -1313,23 +1313,23 @@ static void mergeRects(WebKit::WebVector<WebKit::WebRect>& rects) if (rects[i].y == rects[j].y && rects[i].height == rects[j].height) { if (rects[i].x + rects[i].width == rects[j].x) { rects[i].width += rects[j].width; - rects[j] = WebKit::WebRect(); + rects[j] = blink::WebRect(); updated = true; } else if (rects[i].x == rects[j].x + rects[j].width) { rects[i].x = rects[j].x; rects[i].width += rects[j].width; - rects[j] = WebKit::WebRect(); + rects[j] = blink::WebRect(); updated = true; } } else if (rects[i].x == rects[j].x && rects[i].width == rects[j].width) { if (rects[i].y + rects[i].height == rects[j].y) { rects[i].height += rects[j].height; - rects[j] = WebKit::WebRect(); + rects[j] = blink::WebRect(); updated = true; } else if (rects[i].y == rects[j].y + rects[j].height) { rects[i].y = rects[j].y; rects[i].height += rects[j].height; - rects[j] = WebKit::WebRect(); + rects[j] = blink::WebRect(); updated = true; } } @@ -1340,7 +1340,7 @@ static void mergeRects(WebKit::WebVector<WebKit::WebRect>& rects) static void accumulateLayerRectList(RenderLayerCompositor* compositor, GraphicsLayer* graphicsLayer, LayerRectList* rects) { - WebKit::WebVector<WebKit::WebRect> layerRects = graphicsLayer->platformLayer()->touchEventHandlerRegion(); + blink::WebVector<blink::WebRect> layerRects = graphicsLayer->platformLayer()->touchEventHandlerRegion(); if (!layerRects.isEmpty()) { mergeRects(layerRects); String layerType; diff --git a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp index d436560..997e15c 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp @@ -108,7 +108,7 @@ void UserTiming::mark(const String& markName, ExceptionState& es) double startTime = m_performance->now(); insertPerformanceEntry(m_marksMap, PerformanceMark::create(markName, startTime)); - WebKit::Platform::current()->histogramCustomCounts("PLT.UserTiming_Mark", static_cast<int>(startTime), 0, 600000, 100); + blink::Platform::current()->histogramCustomCounts("PLT.UserTiming_Mark", static_cast<int>(startTime), 0, 600000, 100); } void UserTiming::clearMarks(const String& markName) @@ -157,7 +157,7 @@ void UserTiming::measure(const String& measureName, const String& startMark, con insertPerformanceEntry(m_measuresMap, PerformanceMeasure::create(measureName, startTime, endTime)); if (endTime >= startTime) - WebKit::Platform::current()->histogramCustomCounts("PLT.UserTiming_MeasureDuration", static_cast<int>(endTime - startTime), 0, 600000, 100); + blink::Platform::current()->histogramCustomCounts("PLT.UserTiming_MeasureDuration", static_cast<int>(endTime - startTime), 0, 600000, 100); } void UserTiming::clearMeasures(const String& measureName) diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp index f37168f..4e969fe 100644 --- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp +++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp @@ -119,7 +119,7 @@ void WorkerThread::workerThread() } // The corresponding call to didStopWorkerRunLoop is in // ~WorkerScriptController. - WebKit::Platform::current()->didStartWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_runLoop)); + blink::Platform::current()->didStartWorkerRunLoop(blink::WebWorkerRunLoop(&m_runLoop)); WorkerScriptController* script = m_workerGlobalScope->script(); InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), startMode); diff --git a/third_party/WebKit/Source/core/xml/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xml/XMLHttpRequest.cpp index 0d4d2fe..f468a70 100644 --- a/third_party/WebKit/Source/core/xml/XMLHttpRequest.cpp +++ b/third_party/WebKit/Source/core/xml/XMLHttpRequest.cpp @@ -720,7 +720,7 @@ void XMLHttpRequest::send(ArrayBuffer* body, ExceptionState& es) String consoleMessage("ArrayBuffer is deprecated in XMLHttpRequest.send(). Use ArrayBufferView instead."); executionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, consoleMessage); - WebKit::Platform::current()->histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBuffer, XMLHttpRequestSendArrayBufferOrViewMax); + blink::Platform::current()->histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBuffer, XMLHttpRequestSendArrayBufferOrViewMax); sendBytesData(body->data(), body->byteLength(), es); } @@ -729,7 +729,7 @@ void XMLHttpRequest::send(ArrayBufferView* body, ExceptionState& es) { LOG(Network, "XMLHttpRequest %p send() ArrayBufferView %p", this, body); - WebKit::Platform::current()->histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBufferView, XMLHttpRequestSendArrayBufferOrViewMax); + blink::Platform::current()->histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBufferView, XMLHttpRequestSendArrayBufferOrViewMax); sendBytesData(body->baseAddress(), body->byteLength(), es); } diff --git a/third_party/WebKit/Source/modules/crypto/AesCbcParams.cpp b/third_party/WebKit/Source/modules/crypto/AesCbcParams.cpp index e84bc7a..b16e331 100644 --- a/third_party/WebKit/Source/modules/crypto/AesCbcParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/AesCbcParams.cpp @@ -38,13 +38,13 @@ namespace WebCore { Uint8Array* AesCbcParams::iv() { if (!m_iv) { - const WebKit::WebVector<unsigned char>& iv = m_algorithm.aesCbcParams()->iv(); + const blink::WebVector<unsigned char>& iv = m_algorithm.aesCbcParams()->iv(); m_iv = Uint8Array::create(iv.data(), iv.size()); } return m_iv.get(); } -AesCbcParams::AesCbcParams(const WebKit::WebCryptoAlgorithm& algorithm) +AesCbcParams::AesCbcParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.aesCbcParams()); diff --git a/third_party/WebKit/Source/modules/crypto/AesCbcParams.h b/third_party/WebKit/Source/modules/crypto/AesCbcParams.h index b422adf..223ca2b 100644 --- a/third_party/WebKit/Source/modules/crypto/AesCbcParams.h +++ b/third_party/WebKit/Source/modules/crypto/AesCbcParams.h @@ -38,12 +38,12 @@ namespace WebCore { class AesCbcParams : public Algorithm { public: - static PassRefPtr<AesCbcParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new AesCbcParams(algorithm)); } + static PassRefPtr<AesCbcParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new AesCbcParams(algorithm)); } Uint8Array* iv(); private: - explicit AesCbcParams(const WebKit::WebCryptoAlgorithm&); + explicit AesCbcParams(const blink::WebCryptoAlgorithm&); RefPtr<Uint8Array> m_iv; }; diff --git a/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.cpp b/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.cpp index 5df24f8..f4e2807 100644 --- a/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.cpp @@ -40,7 +40,7 @@ unsigned short AesKeyGenParams::length() const return m_algorithm.aesKeyGenParams()->length(); } -AesKeyGenParams::AesKeyGenParams(const WebKit::WebCryptoAlgorithm& algorithm) +AesKeyGenParams::AesKeyGenParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.aesKeyGenParams()); diff --git a/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.h b/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.h index f727114..655e8ce 100644 --- a/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.h +++ b/third_party/WebKit/Source/modules/crypto/AesKeyGenParams.h @@ -38,12 +38,12 @@ namespace WebCore { class AesKeyGenParams : public Algorithm { public: - static PassRefPtr<AesKeyGenParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new AesKeyGenParams(algorithm)); } + static PassRefPtr<AesKeyGenParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new AesKeyGenParams(algorithm)); } unsigned short length() const; private: - explicit AesKeyGenParams(const WebKit::WebCryptoAlgorithm&); + explicit AesKeyGenParams(const blink::WebCryptoAlgorithm&); }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/crypto/Algorithm.cpp b/third_party/WebKit/Source/modules/crypto/Algorithm.cpp index 46f6b53..89a5172 100644 --- a/third_party/WebKit/Source/modules/crypto/Algorithm.cpp +++ b/third_party/WebKit/Source/modules/crypto/Algorithm.cpp @@ -43,25 +43,25 @@ namespace WebCore { -PassRefPtr<Algorithm> Algorithm::create(const WebKit::WebCryptoAlgorithm& algorithm) +PassRefPtr<Algorithm> Algorithm::create(const blink::WebCryptoAlgorithm& algorithm) { switch (algorithm.paramsType()) { - case WebKit::WebCryptoAlgorithmParamsTypeNone: + case blink::WebCryptoAlgorithmParamsTypeNone: return adoptRef(new Algorithm(algorithm)); - case WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams: + case blink::WebCryptoAlgorithmParamsTypeAesCbcParams: return AesCbcParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams: return AesKeyGenParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeHmacParams: + case blink::WebCryptoAlgorithmParamsTypeHmacParams: return HmacParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeHmacKeyParams: + case blink::WebCryptoAlgorithmParamsTypeHmacKeyParams: return HmacKeyParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeRsaSsaParams: + case blink::WebCryptoAlgorithmParamsTypeRsaSsaParams: return RsaSsaParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: return RsaKeyGenParams::create(algorithm); - case WebKit::WebCryptoAlgorithmParamsTypeAesGcmParams: - case WebKit::WebCryptoAlgorithmParamsTypeRsaOaepParams: + case blink::WebCryptoAlgorithmParamsTypeAesGcmParams: + case blink::WebCryptoAlgorithmParamsTypeRsaOaepParams: // TODO notImplemented(); break; @@ -70,7 +70,7 @@ PassRefPtr<Algorithm> Algorithm::create(const WebKit::WebCryptoAlgorithm& algori return 0; } -Algorithm::Algorithm(const WebKit::WebCryptoAlgorithm& algorithm) +Algorithm::Algorithm(const blink::WebCryptoAlgorithm& algorithm) : m_algorithm(algorithm) { ScriptWrappable::init(this); diff --git a/third_party/WebKit/Source/modules/crypto/Algorithm.h b/third_party/WebKit/Source/modules/crypto/Algorithm.h index 5a201b9..779bf28 100644 --- a/third_party/WebKit/Source/modules/crypto/Algorithm.h +++ b/third_party/WebKit/Source/modules/crypto/Algorithm.h @@ -41,16 +41,16 @@ namespace WebCore { class Algorithm : public ScriptWrappable, public RefCounted<Algorithm> { public: - static PassRefPtr<Algorithm> create(const WebKit::WebCryptoAlgorithm&); + static PassRefPtr<Algorithm> create(const blink::WebCryptoAlgorithm&); String name(); - WebKit::WebCryptoAlgorithmParamsType type() const { return m_algorithm.paramsType(); } + blink::WebCryptoAlgorithmParamsType type() const { return m_algorithm.paramsType(); } protected: - explicit Algorithm(const WebKit::WebCryptoAlgorithm&); + explicit Algorithm(const blink::WebCryptoAlgorithm&); - const WebKit::WebCryptoAlgorithm m_algorithm; + const blink::WebCryptoAlgorithm m_algorithm; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.cpp b/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.cpp index e291b50..8d6c2ba 100644 --- a/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.cpp +++ b/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.cpp @@ -61,7 +61,7 @@ void CryptoResultImpl::completeWithError() finish(); } -void CryptoResultImpl::completeWithBuffer(const WebKit::WebArrayBuffer& buffer) +void CryptoResultImpl::completeWithBuffer(const blink::WebArrayBuffer& buffer) { m_promiseResolver->resolve(PassRefPtr<ArrayBuffer>(buffer)); finish(); @@ -73,13 +73,13 @@ void CryptoResultImpl::completeWithBoolean(bool b) finish(); } -void CryptoResultImpl::completeWithKey(const WebKit::WebCryptoKey& key) +void CryptoResultImpl::completeWithKey(const blink::WebCryptoKey& key) { m_promiseResolver->resolve(Key::create(key)); finish(); } -void CryptoResultImpl::completeWithKeyPair(const WebKit::WebCryptoKey& publicKey, const WebKit::WebCryptoKey& privateKey) +void CryptoResultImpl::completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) { m_promiseResolver->resolve(KeyPair::create(publicKey, privateKey)); finish(); diff --git a/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.h b/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.h index 0e930c7..a0f39ed 100644 --- a/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.h +++ b/third_party/WebKit/Source/modules/crypto/CryptoResultImpl.h @@ -49,10 +49,10 @@ public: static PassRefPtr<CryptoResultImpl> create(ScriptPromise); virtual void completeWithError() OVERRIDE; - virtual void completeWithBuffer(const WebKit::WebArrayBuffer&) OVERRIDE; + virtual void completeWithBuffer(const blink::WebArrayBuffer&) OVERRIDE; virtual void completeWithBoolean(bool) OVERRIDE; - virtual void completeWithKey(const WebKit::WebCryptoKey&) OVERRIDE; - virtual void completeWithKeyPair(const WebKit::WebCryptoKey& publicKey, const WebKit::WebCryptoKey& privateKey) OVERRIDE; + virtual void completeWithKey(const blink::WebCryptoKey&) OVERRIDE; + virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE; private: explicit CryptoResultImpl(ScriptPromise); diff --git a/third_party/WebKit/Source/modules/crypto/HmacKeyParams.cpp b/third_party/WebKit/Source/modules/crypto/HmacKeyParams.cpp index d6fd851..2d2c5bb 100644 --- a/third_party/WebKit/Source/modules/crypto/HmacKeyParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/HmacKeyParams.cpp @@ -49,7 +49,7 @@ unsigned HmacKeyParams::length(bool& isNull) return length; } -HmacKeyParams::HmacKeyParams(const WebKit::WebCryptoAlgorithm& algorithm) +HmacKeyParams::HmacKeyParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.hmacKeyParams()); diff --git a/third_party/WebKit/Source/modules/crypto/HmacKeyParams.h b/third_party/WebKit/Source/modules/crypto/HmacKeyParams.h index 234ab47..64b286c 100644 --- a/third_party/WebKit/Source/modules/crypto/HmacKeyParams.h +++ b/third_party/WebKit/Source/modules/crypto/HmacKeyParams.h @@ -38,14 +38,14 @@ namespace WebCore { class HmacKeyParams : public Algorithm { public: - static PassRefPtr<HmacKeyParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new HmacKeyParams(algorithm)); } + static PassRefPtr<HmacKeyParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new HmacKeyParams(algorithm)); } Algorithm* hash(); unsigned length(bool& isNull); private: - explicit HmacKeyParams(const WebKit::WebCryptoAlgorithm&); + explicit HmacKeyParams(const blink::WebCryptoAlgorithm&); RefPtr<Algorithm> m_hash; }; diff --git a/third_party/WebKit/Source/modules/crypto/HmacParams.cpp b/third_party/WebKit/Source/modules/crypto/HmacParams.cpp index 8a00564..eb82c20 100644 --- a/third_party/WebKit/Source/modules/crypto/HmacParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/HmacParams.cpp @@ -42,7 +42,7 @@ Algorithm* HmacParams::hash() return m_hash.get(); } -HmacParams::HmacParams(const WebKit::WebCryptoAlgorithm& algorithm) +HmacParams::HmacParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.hmacParams()); diff --git a/third_party/WebKit/Source/modules/crypto/HmacParams.h b/third_party/WebKit/Source/modules/crypto/HmacParams.h index 45ddebd0..eb85d09 100644 --- a/third_party/WebKit/Source/modules/crypto/HmacParams.h +++ b/third_party/WebKit/Source/modules/crypto/HmacParams.h @@ -38,12 +38,12 @@ namespace WebCore { class HmacParams : public Algorithm { public: - static PassRefPtr<HmacParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new HmacParams(algorithm)); } + static PassRefPtr<HmacParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new HmacParams(algorithm)); } Algorithm* hash(); private: - explicit HmacParams(const WebKit::WebCryptoAlgorithm&); + explicit HmacParams(const blink::WebCryptoAlgorithm&); RefPtr<Algorithm> m_hash; }; diff --git a/third_party/WebKit/Source/modules/crypto/Key.cpp b/third_party/WebKit/Source/modules/crypto/Key.cpp index 7f6ae98..e808095 100644 --- a/third_party/WebKit/Source/modules/crypto/Key.cpp +++ b/third_party/WebKit/Source/modules/crypto/Key.cpp @@ -40,14 +40,14 @@ namespace WebCore { namespace { -const char* keyTypeToString(WebKit::WebCryptoKeyType type) +const char* keyTypeToString(blink::WebCryptoKeyType type) { switch (type) { - case WebKit::WebCryptoKeyTypeSecret: + case blink::WebCryptoKeyTypeSecret: return "secret"; - case WebKit::WebCryptoKeyTypePublic: + case blink::WebCryptoKeyTypePublic: return "public"; - case WebKit::WebCryptoKeyTypePrivate: + case blink::WebCryptoKeyTypePrivate: return "private"; } ASSERT_NOT_REACHED(); @@ -55,23 +55,23 @@ const char* keyTypeToString(WebKit::WebCryptoKeyType type) } struct KeyUsageMapping { - WebKit::WebCryptoKeyUsage value; + blink::WebCryptoKeyUsage value; const char* const name; }; const KeyUsageMapping keyUsageMappings[] = { - { WebKit::WebCryptoKeyUsageEncrypt, "encrypt" }, - { WebKit::WebCryptoKeyUsageDecrypt, "decrypt" }, - { WebKit::WebCryptoKeyUsageSign, "sign" }, - { WebKit::WebCryptoKeyUsageVerify, "verify" }, - { WebKit::WebCryptoKeyUsageDeriveKey, "deriveKey" }, - { WebKit::WebCryptoKeyUsageWrapKey, "wrapKey" }, - { WebKit::WebCryptoKeyUsageUnwrapKey, "unwrapKey" }, + { blink::WebCryptoKeyUsageEncrypt, "encrypt" }, + { blink::WebCryptoKeyUsageDecrypt, "decrypt" }, + { blink::WebCryptoKeyUsageSign, "sign" }, + { blink::WebCryptoKeyUsageVerify, "verify" }, + { blink::WebCryptoKeyUsageDeriveKey, "deriveKey" }, + { blink::WebCryptoKeyUsageWrapKey, "wrapKey" }, + { blink::WebCryptoKeyUsageUnwrapKey, "unwrapKey" }, }; -COMPILE_ASSERT(WebKit::EndOfWebCryptoKeyUsage == (1 << 6) + 1, update_keyUsageMappings); +COMPILE_ASSERT(blink::EndOfWebCryptoKeyUsage == (1 << 6) + 1, update_keyUsageMappings); -const char* keyUsageToString(WebKit::WebCryptoKeyUsage usage) +const char* keyUsageToString(blink::WebCryptoKeyUsage usage) { for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyUsageMappings); ++i) { if (keyUsageMappings[i].value == usage) @@ -81,7 +81,7 @@ const char* keyUsageToString(WebKit::WebCryptoKeyUsage usage) return 0; } -WebKit::WebCryptoKeyUsageMask keyUsageStringToMask(const String& usageString) +blink::WebCryptoKeyUsageMask keyUsageStringToMask(const String& usageString) { for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyUsageMappings); ++i) { if (keyUsageMappings[i].name == usageString) @@ -90,23 +90,23 @@ WebKit::WebCryptoKeyUsageMask keyUsageStringToMask(const String& usageString) return 0; } -WebKit::WebCryptoKeyUsageMask toKeyUsage(AlgorithmOperation operation) +blink::WebCryptoKeyUsageMask toKeyUsage(AlgorithmOperation operation) { switch (operation) { case Encrypt: - return WebKit::WebCryptoKeyUsageEncrypt; + return blink::WebCryptoKeyUsageEncrypt; case Decrypt: - return WebKit::WebCryptoKeyUsageDecrypt; + return blink::WebCryptoKeyUsageDecrypt; case Sign: - return WebKit::WebCryptoKeyUsageSign; + return blink::WebCryptoKeyUsageSign; case Verify: - return WebKit::WebCryptoKeyUsageVerify; + return blink::WebCryptoKeyUsageVerify; case DeriveKey: - return WebKit::WebCryptoKeyUsageDeriveKey; + return blink::WebCryptoKeyUsageDeriveKey; case WrapKey: - return WebKit::WebCryptoKeyUsageWrapKey; + return blink::WebCryptoKeyUsageWrapKey; case UnwrapKey: - return WebKit::WebCryptoKeyUsageUnwrapKey; + return blink::WebCryptoKeyUsageUnwrapKey; case Digest: case GenerateKey: case ImportKey: @@ -118,7 +118,7 @@ WebKit::WebCryptoKeyUsageMask toKeyUsage(AlgorithmOperation operation) return 0; } -bool getHmacHashId(const WebKit::WebCryptoAlgorithm& algorithm, WebKit::WebCryptoAlgorithmId& hashId) +bool getHmacHashId(const blink::WebCryptoAlgorithm& algorithm, blink::WebCryptoAlgorithmId& hashId) { if (algorithm.hmacParams()) { hashId = algorithm.hmacParams()->hash().id(); @@ -137,7 +137,7 @@ Key::~Key() { } -Key::Key(const WebKit::WebCryptoKey& key) +Key::Key(const blink::WebCryptoKey& key) : m_key(key) { ScriptWrappable::init(this); @@ -168,14 +168,14 @@ Vector<String> Key::usages() const { Vector<String> result; for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyUsageMappings); ++i) { - WebKit::WebCryptoKeyUsage usage = keyUsageMappings[i].value; + blink::WebCryptoKeyUsage usage = keyUsageMappings[i].value; if (m_key.usages() & usage) result.append(keyUsageToString(usage)); } return result; } -bool Key::canBeUsedForAlgorithm(const WebKit::WebCryptoAlgorithm& algorithm, AlgorithmOperation op, ExceptionState& es) const +bool Key::canBeUsedForAlgorithm(const blink::WebCryptoAlgorithm& algorithm, AlgorithmOperation op, ExceptionState& es) const { if (!(m_key.usages() & toKeyUsage(op))) { es.throwDOMException(NotSupportedError, "key.usages does not permit this operation"); @@ -190,9 +190,9 @@ bool Key::canBeUsedForAlgorithm(const WebKit::WebCryptoAlgorithm& algorithm, Alg // Verify that the algorithm-specific parameters for the key conform to the // algorithm. - if (m_key.algorithm().id() == WebKit::WebCryptoAlgorithmIdHmac) { - WebKit::WebCryptoAlgorithmId keyHash; - WebKit::WebCryptoAlgorithmId algorithmHash; + if (m_key.algorithm().id() == blink::WebCryptoAlgorithmIdHmac) { + blink::WebCryptoAlgorithmId keyHash; + blink::WebCryptoAlgorithmId algorithmHash; if (!getHmacHashId(m_key.algorithm(), keyHash) || !getHmacHashId(algorithm, algorithmHash) || keyHash != algorithmHash) { es.throwDOMException(NotSupportedError, "key.algorithm does not match that of operation (HMAC's hash differs)"); return false; @@ -202,23 +202,23 @@ bool Key::canBeUsedForAlgorithm(const WebKit::WebCryptoAlgorithm& algorithm, Alg return true; } -bool Key::parseFormat(const String& formatString, WebKit::WebCryptoKeyFormat& format, ExceptionState& es) +bool Key::parseFormat(const String& formatString, blink::WebCryptoKeyFormat& format, ExceptionState& es) { // There are few enough values that testing serially is fast enough. if (formatString == "raw") { - format = WebKit::WebCryptoKeyFormatRaw; + format = blink::WebCryptoKeyFormatRaw; return true; } if (formatString == "pkcs8") { - format = WebKit::WebCryptoKeyFormatPkcs8; + format = blink::WebCryptoKeyFormatPkcs8; return true; } if (formatString == "spki") { - format = WebKit::WebCryptoKeyFormatSpki; + format = blink::WebCryptoKeyFormatSpki; return true; } if (formatString == "jwk") { - format = WebKit::WebCryptoKeyFormatJwk; + format = blink::WebCryptoKeyFormatJwk; return true; } @@ -226,11 +226,11 @@ bool Key::parseFormat(const String& formatString, WebKit::WebCryptoKeyFormat& fo return false; } -bool Key::parseUsageMask(const Vector<String>& usages, WebKit::WebCryptoKeyUsageMask& mask, ExceptionState& es) +bool Key::parseUsageMask(const Vector<String>& usages, blink::WebCryptoKeyUsageMask& mask, ExceptionState& es) { mask = 0; for (size_t i = 0; i < usages.size(); ++i) { - WebKit::WebCryptoKeyUsageMask usage = keyUsageStringToMask(usages[i]); + blink::WebCryptoKeyUsageMask usage = keyUsageStringToMask(usages[i]); if (!usage) { es.throwTypeError("Invalid keyUsages argument"); return false; diff --git a/third_party/WebKit/Source/modules/crypto/Key.h b/third_party/WebKit/Source/modules/crypto/Key.h index 403dbe2..aa6bad0 100644 --- a/third_party/WebKit/Source/modules/crypto/Key.h +++ b/third_party/WebKit/Source/modules/crypto/Key.h @@ -46,7 +46,7 @@ class ExceptionState; class Key : public ScriptWrappable, public RefCounted<Key> { public: - static PassRefPtr<Key> create(const WebKit::WebCryptoKey& key) { return adoptRef(new Key(key)); } + static PassRefPtr<Key> create(const blink::WebCryptoKey& key) { return adoptRef(new Key(key)); } ~Key(); @@ -55,17 +55,17 @@ public: Algorithm* algorithm(); Vector<String> usages() const; - const WebKit::WebCryptoKey& key() const { return m_key; } + const blink::WebCryptoKey& key() const { return m_key; } - bool canBeUsedForAlgorithm(const WebKit::WebCryptoAlgorithm&, AlgorithmOperation, ExceptionState&) const; + bool canBeUsedForAlgorithm(const blink::WebCryptoAlgorithm&, AlgorithmOperation, ExceptionState&) const; - static bool parseFormat(const String&, WebKit::WebCryptoKeyFormat&, ExceptionState&); - static bool parseUsageMask(const Vector<String>&, WebKit::WebCryptoKeyUsageMask&, ExceptionState&); + static bool parseFormat(const String&, blink::WebCryptoKeyFormat&, ExceptionState&); + static bool parseUsageMask(const Vector<String>&, blink::WebCryptoKeyUsageMask&, ExceptionState&); protected: - explicit Key(const WebKit::WebCryptoKey&); + explicit Key(const blink::WebCryptoKey&); - const WebKit::WebCryptoKey m_key; + const blink::WebCryptoKey m_key; RefPtr<Algorithm> m_algorithm; }; diff --git a/third_party/WebKit/Source/modules/crypto/KeyPair.cpp b/third_party/WebKit/Source/modules/crypto/KeyPair.cpp index 87290bc2..6beaf2b 100644 --- a/third_party/WebKit/Source/modules/crypto/KeyPair.cpp +++ b/third_party/WebKit/Source/modules/crypto/KeyPair.cpp @@ -36,10 +36,10 @@ namespace WebCore { -PassRefPtr<KeyPair> KeyPair::create(const WebKit::WebCryptoKey& publicKey, const WebKit::WebCryptoKey& privateKey) +PassRefPtr<KeyPair> KeyPair::create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) { - ASSERT(publicKey.type() == WebKit::WebCryptoKeyTypePublic); - ASSERT(privateKey.type() == WebKit::WebCryptoKeyTypePrivate); + ASSERT(publicKey.type() == blink::WebCryptoKeyTypePublic); + ASSERT(privateKey.type() == blink::WebCryptoKeyTypePrivate); return adoptRef(new KeyPair(Key::create(publicKey), Key::create(privateKey))); } diff --git a/third_party/WebKit/Source/modules/crypto/KeyPair.h b/third_party/WebKit/Source/modules/crypto/KeyPair.h index ce20fd3..7377e93 100644 --- a/third_party/WebKit/Source/modules/crypto/KeyPair.h +++ b/third_party/WebKit/Source/modules/crypto/KeyPair.h @@ -36,7 +36,7 @@ #include "wtf/RefCounted.h" #include "wtf/RefPtr.h" -namespace WebKit { class WebCryptoKey; } +namespace blink { class WebCryptoKey; } namespace WebCore { @@ -44,7 +44,7 @@ class Key; class KeyPair : public ScriptWrappable, public RefCounted<KeyPair> { public: - static PassRefPtr<KeyPair> create(const WebKit::WebCryptoKey& publicKey, const WebKit::WebCryptoKey& privateKey); + static PassRefPtr<KeyPair> create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey); Key* publicKey() { return m_publicKey.get(); } Key* privateKey() { return m_privateKey.get(); } diff --git a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp index 96e1f73..8af0a2a 100644 --- a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp +++ b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp @@ -52,65 +52,65 @@ namespace { struct AlgorithmNameMapping { const char* const algorithmName; - WebKit::WebCryptoAlgorithmId algorithmId; + blink::WebCryptoAlgorithmId algorithmId; }; // Indicates that the algorithm doesn't support the specified operation. const int UnsupportedOp = -1; -// Either UnsupportedOp, or a value from WebKit::WebCryptoAlgorithmParamsType +// Either UnsupportedOp, or a value from blink::WebCryptoAlgorithmParamsType typedef int AlgorithmParamsForOperation; struct OperationParamsMapping { - WebKit::WebCryptoAlgorithmId algorithmId; + blink::WebCryptoAlgorithmId algorithmId; AlgorithmOperation operation; AlgorithmParamsForOperation params; }; const AlgorithmNameMapping algorithmNameMappings[] = { - {"AES-CBC", WebKit::WebCryptoAlgorithmIdAesCbc}, - {"HMAC", WebKit::WebCryptoAlgorithmIdHmac}, - {"RSASSA-PKCS1-v1_5", WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5}, - {"RSAES-PKCS1-v1_5", WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5}, - {"SHA-1", WebKit::WebCryptoAlgorithmIdSha1}, - {"SHA-224", WebKit::WebCryptoAlgorithmIdSha224}, - {"SHA-256", WebKit::WebCryptoAlgorithmIdSha256}, - {"SHA-384", WebKit::WebCryptoAlgorithmIdSha384}, - {"SHA-512", WebKit::WebCryptoAlgorithmIdSha512}, + {"AES-CBC", blink::WebCryptoAlgorithmIdAesCbc}, + {"HMAC", blink::WebCryptoAlgorithmIdHmac}, + {"RSASSA-PKCS1-v1_5", blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5}, + {"RSAES-PKCS1-v1_5", blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5}, + {"SHA-1", blink::WebCryptoAlgorithmIdSha1}, + {"SHA-224", blink::WebCryptoAlgorithmIdSha224}, + {"SHA-256", blink::WebCryptoAlgorithmIdSha256}, + {"SHA-384", blink::WebCryptoAlgorithmIdSha384}, + {"SHA-512", blink::WebCryptoAlgorithmIdSha512}, }; // What operations each algorithm supports, and what parameters it expects. const OperationParamsMapping operationParamsMappings[] = { // AES-CBC - {WebKit::WebCryptoAlgorithmIdAesCbc, Decrypt, WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams}, - {WebKit::WebCryptoAlgorithmIdAesCbc, Encrypt, WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams}, - {WebKit::WebCryptoAlgorithmIdAesCbc, GenerateKey, WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams}, - {WebKit::WebCryptoAlgorithmIdAesCbc, ImportKey, WebKit::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdAesCbc, Decrypt, blink::WebCryptoAlgorithmParamsTypeAesCbcParams}, + {blink::WebCryptoAlgorithmIdAesCbc, Encrypt, blink::WebCryptoAlgorithmParamsTypeAesCbcParams}, + {blink::WebCryptoAlgorithmIdAesCbc, GenerateKey, blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams}, + {blink::WebCryptoAlgorithmIdAesCbc, ImportKey, blink::WebCryptoAlgorithmParamsTypeNone}, // HMAC - {WebKit::WebCryptoAlgorithmIdHmac, Sign, WebKit::WebCryptoAlgorithmParamsTypeHmacParams}, - {WebKit::WebCryptoAlgorithmIdHmac, Verify, WebKit::WebCryptoAlgorithmParamsTypeHmacParams}, - {WebKit::WebCryptoAlgorithmIdHmac, GenerateKey, WebKit::WebCryptoAlgorithmParamsTypeHmacKeyParams}, - {WebKit::WebCryptoAlgorithmIdHmac, ImportKey, WebKit::WebCryptoAlgorithmParamsTypeHmacParams}, + {blink::WebCryptoAlgorithmIdHmac, Sign, blink::WebCryptoAlgorithmParamsTypeHmacParams}, + {blink::WebCryptoAlgorithmIdHmac, Verify, blink::WebCryptoAlgorithmParamsTypeHmacParams}, + {blink::WebCryptoAlgorithmIdHmac, GenerateKey, blink::WebCryptoAlgorithmParamsTypeHmacKeyParams}, + {blink::WebCryptoAlgorithmIdHmac, ImportKey, blink::WebCryptoAlgorithmParamsTypeHmacParams}, // RSASSA-PKCS1-v1_5 - {WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, Sign, WebKit::WebCryptoAlgorithmParamsTypeRsaSsaParams}, - {WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, Verify, WebKit::WebCryptoAlgorithmParamsTypeRsaSsaParams}, - {WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, GenerateKey, WebKit::WebCryptoAlgorithmParamsTypeRsaKeyGenParams}, - {WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, ImportKey, WebKit::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, Sign, blink::WebCryptoAlgorithmParamsTypeRsaSsaParams}, + {blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, Verify, blink::WebCryptoAlgorithmParamsTypeRsaSsaParams}, + {blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, GenerateKey, blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams}, + {blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, ImportKey, blink::WebCryptoAlgorithmParamsTypeNone}, // RSAES-PKCS1-v1_5 - {WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, Encrypt, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, Decrypt, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, GenerateKey, WebKit::WebCryptoAlgorithmParamsTypeRsaKeyGenParams}, - {WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, ImportKey, WebKit::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, Encrypt, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, Decrypt, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, GenerateKey, blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams}, + {blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, ImportKey, blink::WebCryptoAlgorithmParamsTypeNone}, // SHA-* - {WebKit::WebCryptoAlgorithmIdSha1, Digest, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdSha224, Digest, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdSha256, Digest, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdSha384, Digest, WebKit::WebCryptoAlgorithmParamsTypeNone}, - {WebKit::WebCryptoAlgorithmIdSha512, Digest, WebKit::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdSha1, Digest, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdSha224, Digest, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdSha256, Digest, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdSha384, Digest, blink::WebCryptoAlgorithmParamsTypeNone}, + {blink::WebCryptoAlgorithmIdSha512, Digest, blink::WebCryptoAlgorithmParamsTypeNone}, }; // This structure describes an algorithm and its supported operations. @@ -122,7 +122,7 @@ struct AlgorithmInfo { paramsForOperation[i] = UnsupportedOp; } - WebKit::WebCryptoAlgorithmId algorithmId; + blink::WebCryptoAlgorithmId algorithmId; const char* algorithmName; AlgorithmParamsForOperation paramsForOperation[NumberOfAlgorithmOperations]; }; @@ -135,17 +135,17 @@ public: static AlgorithmRegistry& instance(); const AlgorithmInfo* lookupAlgorithmByName(const String&) const; - const AlgorithmInfo* lookupAlgorithmById(WebKit::WebCryptoAlgorithmId) const; + const AlgorithmInfo* lookupAlgorithmById(blink::WebCryptoAlgorithmId) const; private: AlgorithmRegistry(); // Algorithm name to ID. - typedef HashMap<String, WebKit::WebCryptoAlgorithmId, CaseFoldingHash> AlgorithmNameToIdMap; + typedef HashMap<String, blink::WebCryptoAlgorithmId, CaseFoldingHash> AlgorithmNameToIdMap; AlgorithmNameToIdMap m_algorithmNameToId; // Algorithm ID to information. - AlgorithmInfo m_algorithms[WebKit::NumberOfWebCryptoAlgorithmId]; + AlgorithmInfo m_algorithms[blink::NumberOfWebCryptoAlgorithmId]; }; AlgorithmRegistry& AlgorithmRegistry::instance() @@ -162,7 +162,7 @@ const AlgorithmInfo* AlgorithmRegistry::lookupAlgorithmByName(const String& algo return lookupAlgorithmById(it->value); } -const AlgorithmInfo* AlgorithmRegistry::lookupAlgorithmById(WebKit::WebCryptoAlgorithmId algorithmId) const +const AlgorithmInfo* AlgorithmRegistry::lookupAlgorithmById(blink::WebCryptoAlgorithmId algorithmId) const { ASSERT(algorithmId >= 0 && algorithmId < WTF_ARRAY_LENGTH(m_algorithms)); return &m_algorithms[algorithmId]; @@ -323,7 +323,7 @@ bool getOptionalUint32(const Dictionary& raw, const char* propertyName, bool& ha return true; } -bool parseAesCbcParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseAesCbcParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { RefPtr<ArrayBufferView> iv; if (!getArrayBufferView(raw, "iv", iv, context, es)) @@ -334,23 +334,23 @@ bool parseAesCbcParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmP return false; } - params = adoptPtr(new WebKit::WebCryptoAesCbcParams(static_cast<unsigned char*>(iv->baseAddress()), iv->byteLength())); + params = adoptPtr(new blink::WebCryptoAesCbcParams(static_cast<unsigned char*>(iv->baseAddress()), iv->byteLength())); return true; } -bool parseAesKeyGenParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseAesKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { uint16_t length; if (!getUint16(raw, "length", length, context, es)) return false; - params = adoptPtr(new WebKit::WebCryptoAesKeyGenParams(length)); + params = adoptPtr(new blink::WebCryptoAesKeyGenParams(length)); return true; } -bool normalizeAlgorithm(const Dictionary&, AlgorithmOperation, WebKit::WebCryptoAlgorithm&, ExceptionContext, ExceptionState&); +bool normalizeAlgorithm(const Dictionary&, AlgorithmOperation, blink::WebCryptoAlgorithm&, ExceptionContext, ExceptionState&); -bool parseHash(const Dictionary& raw, WebKit::WebCryptoAlgorithm& hash, ExceptionContext context, ExceptionState& es) +bool parseHash(const Dictionary& raw, blink::WebCryptoAlgorithm& hash, ExceptionContext context, ExceptionState& es) { Dictionary rawHash; if (!raw.get("hash", rawHash)) { @@ -362,19 +362,19 @@ bool parseHash(const Dictionary& raw, WebKit::WebCryptoAlgorithm& hash, Exceptio return normalizeAlgorithm(rawHash, Digest, hash, context, es); } -bool parseHmacParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseHmacParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { - WebKit::WebCryptoAlgorithm hash; + blink::WebCryptoAlgorithm hash; if (!parseHash(raw, hash, context, es)) return false; - params = adoptPtr(new WebKit::WebCryptoHmacParams(hash)); + params = adoptPtr(new blink::WebCryptoHmacParams(hash)); return true; } -bool parseHmacKeyParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseHmacKeyParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { - WebKit::WebCryptoAlgorithm hash; + blink::WebCryptoAlgorithm hash; if (!parseHash(raw, hash, context, es)) return false; @@ -383,21 +383,21 @@ bool parseHmacKeyParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithm if (!getOptionalUint32(raw, "length", hasLength, length, context, es)) return false; - params = adoptPtr(new WebKit::WebCryptoHmacKeyParams(hash, hasLength, length)); + params = adoptPtr(new blink::WebCryptoHmacKeyParams(hash, hasLength, length)); return true; } -bool parseRsaSsaParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseRsaSsaParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { - WebKit::WebCryptoAlgorithm hash; + blink::WebCryptoAlgorithm hash; if (!parseHash(raw, hash, context, es)) return false; - params = adoptPtr(new WebKit::WebCryptoRsaSsaParams(hash)); + params = adoptPtr(new blink::WebCryptoRsaSsaParams(hash)); return true; } -bool parseRsaKeyGenParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) +bool parseRsaKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es) { uint32_t modulusLength; if (!getUint32(raw, "modulusLength", modulusLength, context, es)) @@ -407,35 +407,35 @@ bool parseRsaKeyGenParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorit if (!getUint8Array(raw, "publicExponent", publicExponent, context, es)) return false; - params = adoptPtr(new WebKit::WebCryptoRsaKeyGenParams(modulusLength, static_cast<const unsigned char*>(publicExponent->baseAddress()), publicExponent->byteLength())); + params = adoptPtr(new blink::WebCryptoRsaKeyGenParams(modulusLength, static_cast<const unsigned char*>(publicExponent->baseAddress()), publicExponent->byteLength())); return true; } -bool parseAlgorithmParams(const Dictionary& raw, WebKit::WebCryptoAlgorithmParamsType type, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, ExceptionContext& context, ExceptionState& es) +bool parseAlgorithmParams(const Dictionary& raw, blink::WebCryptoAlgorithmParamsType type, OwnPtr<blink::WebCryptoAlgorithmParams>& params, ExceptionContext& context, ExceptionState& es) { switch (type) { - case WebKit::WebCryptoAlgorithmParamsTypeNone: + case blink::WebCryptoAlgorithmParamsTypeNone: return true; - case WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams: + case blink::WebCryptoAlgorithmParamsTypeAesCbcParams: context.add("AesCbcParams"); return parseAesCbcParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams: context.add("AesKeyGenParams"); return parseAesKeyGenParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeHmacParams: + case blink::WebCryptoAlgorithmParamsTypeHmacParams: context.add("HmacParams"); return parseHmacParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeHmacKeyParams: + case blink::WebCryptoAlgorithmParamsTypeHmacKeyParams: context.add("HmacKeyParams"); return parseHmacKeyParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeRsaSsaParams: + case blink::WebCryptoAlgorithmParamsTypeRsaSsaParams: context.add("RsaSSaParams"); return parseRsaSsaParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: + case blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams: context.add("RsaKeyGenParams"); return parseRsaKeyGenParams(raw, params, context, es); - case WebKit::WebCryptoAlgorithmParamsTypeAesGcmParams: - case WebKit::WebCryptoAlgorithmParamsTypeRsaOaepParams: + case blink::WebCryptoAlgorithmParamsTypeAesGcmParams: + case blink::WebCryptoAlgorithmParamsTypeRsaOaepParams: // TODO notImplemented(); break; @@ -468,7 +468,7 @@ const AlgorithmInfo* algorithmInfo(const Dictionary& raw, const ExceptionContext // This implementation corresponds with: // http://www.w3.org/TR/WebCryptoAPI/#algorithm-normalizing-rules -bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, WebKit::WebCryptoAlgorithm& algorithm, ExceptionContext context, ExceptionState& es) +bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, blink::WebCryptoAlgorithm& algorithm, ExceptionContext context, ExceptionState& es) { context.add("Algorithm"); @@ -483,23 +483,23 @@ bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, WebKit::We return false; } - WebKit::WebCryptoAlgorithmParamsType paramsType = static_cast<WebKit::WebCryptoAlgorithmParamsType>(info->paramsForOperation[op]); - OwnPtr<WebKit::WebCryptoAlgorithmParams> params; + blink::WebCryptoAlgorithmParamsType paramsType = static_cast<blink::WebCryptoAlgorithmParamsType>(info->paramsForOperation[op]); + OwnPtr<blink::WebCryptoAlgorithmParams> params; if (!parseAlgorithmParams(raw, paramsType, params, context, es)) return false; - algorithm = WebKit::WebCryptoAlgorithm(info->algorithmId, params.release()); + algorithm = blink::WebCryptoAlgorithm(info->algorithmId, params.release()); return true; } } // namespace -bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, WebKit::WebCryptoAlgorithm& algorithm, ExceptionState& es) +bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, blink::WebCryptoAlgorithm& algorithm, ExceptionState& es) { return normalizeAlgorithm(raw, op, algorithm, ExceptionContext(), es); } -const char* algorithmIdToName(WebKit::WebCryptoAlgorithmId id) +const char* algorithmIdToName(blink::WebCryptoAlgorithmId id) { return AlgorithmRegistry::instance().lookupAlgorithmById(id)->algorithmName; } diff --git a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.h b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.h index eb48788..ffad50a 100644 --- a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.h +++ b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.h @@ -34,7 +34,7 @@ #include "public/platform/WebCryptoAlgorithm.h" #include "wtf/Assertions.h" -namespace WebKit { class WebCryptoAlgorithm; } +namespace blink { class WebCryptoAlgorithm; } namespace WebCore { @@ -58,11 +58,11 @@ enum AlgorithmOperation { // Normalizes an algorithm identifier (dictionary) into a WebCryptoAlgorithm. If // normalization fails then returns false and sets the ExceptionState. -bool normalizeAlgorithm(const Dictionary&, AlgorithmOperation, WebKit::WebCryptoAlgorithm&, ExceptionState&) WARN_UNUSED_RETURN; +bool normalizeAlgorithm(const Dictionary&, AlgorithmOperation, blink::WebCryptoAlgorithm&, ExceptionState&) WARN_UNUSED_RETURN; // Returns a null-terminated C-string literal. Caller can assume the pointer // will be valid for the program's entire runtime. -const char* algorithmIdToName(WebKit::WebCryptoAlgorithmId); +const char* algorithmIdToName(blink::WebCryptoAlgorithmId); } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.cpp b/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.cpp index 69a9e67..53c3f14 100644 --- a/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.cpp @@ -43,13 +43,13 @@ unsigned RsaKeyGenParams::modulusLength() const Uint8Array* RsaKeyGenParams::publicExponent() { if (!m_publicExponent) { - const WebKit::WebVector<unsigned char>& exponent = m_algorithm.rsaKeyGenParams()->publicExponent(); + const blink::WebVector<unsigned char>& exponent = m_algorithm.rsaKeyGenParams()->publicExponent(); m_publicExponent = Uint8Array::create(exponent.data(), exponent.size()); } return m_publicExponent.get(); } -RsaKeyGenParams::RsaKeyGenParams(const WebKit::WebCryptoAlgorithm& algorithm) +RsaKeyGenParams::RsaKeyGenParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.rsaKeyGenParams()); diff --git a/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.h b/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.h index 016e5aa..7a44705 100644 --- a/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.h +++ b/third_party/WebKit/Source/modules/crypto/RsaKeyGenParams.h @@ -39,13 +39,13 @@ namespace WebCore { class RsaKeyGenParams : public Algorithm { public: - static PassRefPtr<RsaKeyGenParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new RsaKeyGenParams(algorithm)); } + static PassRefPtr<RsaKeyGenParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new RsaKeyGenParams(algorithm)); } unsigned modulusLength() const; Uint8Array* publicExponent(); private: - explicit RsaKeyGenParams(const WebKit::WebCryptoAlgorithm&); + explicit RsaKeyGenParams(const blink::WebCryptoAlgorithm&); RefPtr<Uint8Array> m_publicExponent; }; diff --git a/third_party/WebKit/Source/modules/crypto/RsaSsaParams.cpp b/third_party/WebKit/Source/modules/crypto/RsaSsaParams.cpp index 89e6aca..214efc3 100644 --- a/third_party/WebKit/Source/modules/crypto/RsaSsaParams.cpp +++ b/third_party/WebKit/Source/modules/crypto/RsaSsaParams.cpp @@ -42,7 +42,7 @@ Algorithm* RsaSsaParams::hash() return m_hash.get(); } -RsaSsaParams::RsaSsaParams(const WebKit::WebCryptoAlgorithm& algorithm) +RsaSsaParams::RsaSsaParams(const blink::WebCryptoAlgorithm& algorithm) : Algorithm(algorithm) { ASSERT(algorithm.rsaSsaParams()); diff --git a/third_party/WebKit/Source/modules/crypto/RsaSsaParams.h b/third_party/WebKit/Source/modules/crypto/RsaSsaParams.h index 65c5043..dd17e015 100644 --- a/third_party/WebKit/Source/modules/crypto/RsaSsaParams.h +++ b/third_party/WebKit/Source/modules/crypto/RsaSsaParams.h @@ -38,12 +38,12 @@ namespace WebCore { class RsaSsaParams : public Algorithm { public: - static PassRefPtr<RsaSsaParams> create(const WebKit::WebCryptoAlgorithm& algorithm) { return adoptRef(new RsaSsaParams(algorithm)); } + static PassRefPtr<RsaSsaParams> create(const blink::WebCryptoAlgorithm& algorithm) { return adoptRef(new RsaSsaParams(algorithm)); } Algorithm* hash(); private: - explicit RsaSsaParams(const WebKit::WebCryptoAlgorithm&); + explicit RsaSsaParams(const blink::WebCryptoAlgorithm&); RefPtr<Algorithm> m_hash; }; diff --git a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp index 31fad71..8c4018e 100644 --- a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp +++ b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp @@ -68,7 +68,7 @@ ScriptPromise startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, Alg return ScriptPromise(); } - WebKit::WebCryptoAlgorithm algorithm; + blink::WebCryptoAlgorithm algorithm; if (!normalizeAlgorithm(rawAlgorithm, operationType, algorithm, es)) return ScriptPromise(); @@ -83,19 +83,19 @@ ScriptPromise startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, Alg switch (operationType) { case Encrypt: - WebKit::Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result()); + blink::Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result()); break; case Decrypt: - WebKit::Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result()); + blink::Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result()); break; case Sign: - WebKit::Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result()); + blink::Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result()); break; case Verify: - WebKit::Platform::current()->crypto()->verifySignature(algorithm, key->key(), reinterpret_cast<const unsigned char*>(signature->baseAddress()), signature->byteLength(), data, dataSize, result->result()); + blink::Platform::current()->crypto()->verifySignature(algorithm, key->key(), reinterpret_cast<const unsigned char*>(signature->baseAddress()), signature->byteLength(), data, dataSize, result->result()); break; case Digest: - WebKit::Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result()); + blink::Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result()); break; default: ASSERT_NOT_REACHED(); @@ -139,23 +139,23 @@ ScriptPromise SubtleCrypto::digest(const Dictionary& rawAlgorithm, ArrayBufferVi ScriptPromise SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es) { - WebKit::WebCryptoKeyUsageMask keyUsages; + blink::WebCryptoKeyUsageMask keyUsages; if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es)) return ScriptPromise(); - WebKit::WebCryptoAlgorithm algorithm; + blink::WebCryptoAlgorithm algorithm; if (!normalizeAlgorithm(rawAlgorithm, GenerateKey, algorithm, es)) return ScriptPromise(); ScriptPromise promise = ScriptPromise::createPending(); RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise); - WebKit::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result()); + blink::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result()); return promise; } ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es) { - WebKit::WebCryptoKeyFormat format; + blink::WebCryptoKeyFormat format; if (!Key::parseFormat(rawFormat, format, es)) return ScriptPromise(); @@ -164,12 +164,12 @@ ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* return ScriptPromise(); } - WebKit::WebCryptoKeyUsageMask keyUsages; + blink::WebCryptoKeyUsageMask keyUsages; if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es)) return ScriptPromise(); // The algorithm is optional. - WebKit::WebCryptoAlgorithm algorithm; + blink::WebCryptoAlgorithm algorithm; if (!rawAlgorithm.isUndefinedOrNull() && !normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, es)) return ScriptPromise(); @@ -177,13 +177,13 @@ ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* ScriptPromise promise = ScriptPromise::createPending(); RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise); - WebKit::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result()); + blink::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result()); return promise; } ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, ExceptionState& es) { - WebKit::WebCryptoKeyFormat format; + blink::WebCryptoKeyFormat format; if (!Key::parseFormat(rawFormat, format, es)) return ScriptPromise(); @@ -199,7 +199,7 @@ ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, Excepti ScriptPromise promise = ScriptPromise::createPending(); RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise); - WebKit::Platform::current()->crypto()->exportKey(format, key->key(), result->result()); + blink::Platform::current()->crypto()->exportKey(format, key->key(), result->result()); return promise; } diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp index b2c338f..f0b9213 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp @@ -75,7 +75,7 @@ PassRefPtr<DeviceMotionData> DeviceMotionData::create(PassRefPtr<Acceleration> a return adoptRef(new DeviceMotionData(acceleration, accelerationIncludingGravity, rotationRate, canProvideInterval, interval)); } -PassRefPtr<DeviceMotionData> DeviceMotionData::create(const WebKit::WebDeviceMotionData& data) +PassRefPtr<DeviceMotionData> DeviceMotionData::create(const blink::WebDeviceMotionData& data) { return DeviceMotionData::create( DeviceMotionData::Acceleration::create( diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h index 3936608..980c8fc 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.h @@ -30,7 +30,7 @@ #include "wtf/RefCounted.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebDeviceMotionData; } @@ -89,7 +89,7 @@ public: static PassRefPtr<DeviceMotionData> create(); static PassRefPtr<DeviceMotionData> create(PassRefPtr<Acceleration> acceleration, PassRefPtr<Acceleration> accelerationIncludingGravity, PassRefPtr<RotationRate> rotationRate, bool canProvideInterval, double interval); - static PassRefPtr<DeviceMotionData> create(const WebKit::WebDeviceMotionData&); + static PassRefPtr<DeviceMotionData> create(const blink::WebDeviceMotionData&); PassRefPtr<Acceleration> acceleration() const { return m_acceleration; } PassRefPtr<Acceleration> accelerationIncludingGravity() const { return m_accelerationIncludingGravity; } diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.cpp index 79faf3d..00efc88 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.cpp @@ -64,16 +64,16 @@ void DeviceMotionDispatcher::removeDeviceMotionController(DeviceMotionController void DeviceMotionDispatcher::startListening() { - WebKit::Platform::current()->setDeviceMotionListener(this); + blink::Platform::current()->setDeviceMotionListener(this); } void DeviceMotionDispatcher::stopListening() { - WebKit::Platform::current()->setDeviceMotionListener(0); + blink::Platform::current()->setDeviceMotionListener(0); m_lastDeviceMotionData.clear(); } -void DeviceMotionDispatcher::didChangeDeviceMotion(const WebKit::WebDeviceMotionData& motion) +void DeviceMotionDispatcher::didChangeDeviceMotion(const blink::WebDeviceMotionData& motion) { m_lastDeviceMotionData = DeviceMotionData::create(motion); diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.h b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.h index d28815f..03ced17 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.h +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionDispatcher.h @@ -35,7 +35,7 @@ #include "public/platform/WebDeviceMotionListener.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebDeviceMotionData; } @@ -46,7 +46,7 @@ class DeviceMotionData; // This class listens to device motion data and dispatches it to all // listening controllers. -class DeviceMotionDispatcher : public DeviceSensorEventDispatcher, public WebKit::WebDeviceMotionListener { +class DeviceMotionDispatcher : public DeviceSensorEventDispatcher, public blink::WebDeviceMotionListener { public: static DeviceMotionDispatcher& instance(); @@ -55,7 +55,7 @@ public: DeviceMotionData* latestDeviceMotionData(); // This method is called every time new device motion data is available. - virtual void didChangeDeviceMotion(const WebKit::WebDeviceMotionData&) OVERRIDE; + virtual void didChangeDeviceMotion(const blink::WebDeviceMotionData&) OVERRIDE; void addDeviceMotionController(DeviceMotionController*); void removeDeviceMotionController(DeviceMotionController*); diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp index c86d60d..8c6aeb2 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp @@ -39,7 +39,7 @@ PassRefPtr<DeviceOrientationData> DeviceOrientationData::create(bool canProvideA return adoptRef(new DeviceOrientationData(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma, canProvideAbsolute, absolute)); } -PassRefPtr<DeviceOrientationData> DeviceOrientationData::create(const WebKit::WebDeviceOrientationData& data) +PassRefPtr<DeviceOrientationData> DeviceOrientationData::create(const blink::WebDeviceOrientationData& data) { return DeviceOrientationData::create(data.hasAlpha, data.alpha, data.hasBeta, data.beta, data.hasGamma, data.gamma, data.hasAbsolute, data.absolute); } diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.h b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.h index 34285fa..274ac81 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.h +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.h @@ -29,7 +29,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" -namespace WebKit { +namespace blink { class WebDeviceOrientationData; } @@ -39,7 +39,7 @@ class DeviceOrientationData : public RefCounted<DeviceOrientationData> { public: static PassRefPtr<DeviceOrientationData> create(); static PassRefPtr<DeviceOrientationData> create(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma, bool canProvideAbsolute = false, bool absolute = false); - static PassRefPtr<DeviceOrientationData> create(const WebKit::WebDeviceOrientationData&); + static PassRefPtr<DeviceOrientationData> create(const blink::WebDeviceOrientationData&); double alpha() const; double beta() const; diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.cpp index 24fd9bf..c446692 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.cpp @@ -64,16 +64,16 @@ void DeviceOrientationDispatcher::removeDeviceOrientationController(NewDeviceOri void DeviceOrientationDispatcher::startListening() { - WebKit::Platform::current()->setDeviceOrientationListener(this); + blink::Platform::current()->setDeviceOrientationListener(this); } void DeviceOrientationDispatcher::stopListening() { - WebKit::Platform::current()->setDeviceOrientationListener(0); + blink::Platform::current()->setDeviceOrientationListener(0); m_lastDeviceOrientationData.clear(); } -void DeviceOrientationDispatcher::didChangeDeviceOrientation(const WebKit::WebDeviceOrientationData& motion) +void DeviceOrientationDispatcher::didChangeDeviceOrientation(const blink::WebDeviceOrientationData& motion) { m_lastDeviceOrientationData = DeviceOrientationData::create(motion); diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.h b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.h index 6d8fc0c..89b28c8 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.h +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationDispatcher.h @@ -35,7 +35,7 @@ #include "public/platform/WebDeviceOrientationListener.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebDeviceOrientationData; } @@ -46,7 +46,7 @@ class DeviceOrientationData; // This class listens to device motion data and dispatches it to all // listening controllers. -class DeviceOrientationDispatcher : public DeviceSensorEventDispatcher, public WebKit::WebDeviceOrientationListener { +class DeviceOrientationDispatcher : public DeviceSensorEventDispatcher, public blink::WebDeviceOrientationListener { public: static DeviceOrientationDispatcher& instance(); @@ -55,7 +55,7 @@ public: DeviceOrientationData* latestDeviceOrientationData(); // This method is called every time new device motion data is available. - virtual void didChangeDeviceOrientation(const WebKit::WebDeviceOrientationData&) OVERRIDE; + virtual void didChangeDeviceOrientation(const blink::WebDeviceOrientationData&) OVERRIDE; void addDeviceOrientationController(NewDeviceOrientationController*); void removeDeviceOrientationController(NewDeviceOrientationController*); diff --git a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.cpp b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.cpp index 45775ea..390b5f4b 100644 --- a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.cpp +++ b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.cpp @@ -72,9 +72,9 @@ DOMFileSystemBase::~DOMFileSystemBase() { } -WebKit::WebFileSystem* DOMFileSystemBase::fileSystem() const +blink::WebFileSystem* DOMFileSystemBase::fileSystem() const { - return WebKit::Platform::current()->fileSystem(); + return blink::Platform::current()->fileSystem(); } SecurityOrigin* DOMFileSystemBase::securityOrigin() const diff --git a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.h b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.h index 145e726..893ecd7 100644 --- a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.h +++ b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBase.h @@ -38,7 +38,7 @@ #include "wtf/RefCounted.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebFileSystem; } @@ -85,7 +85,7 @@ public: const String& name() const { return m_name; } FileSystemType type() const { return m_type; } KURL rootURL() const { return m_filesystemRootURL; } - WebKit::WebFileSystem* fileSystem() const; + blink::WebFileSystem* fileSystem() const; SecurityOrigin* securityOrigin() const; // The clonable flag is used in the structured clone algorithm to test diff --git a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp index 419f7b6..0f54d41 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp +++ b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp @@ -261,7 +261,7 @@ FileWriterBaseCallbacks::FileWriterBaseCallbacks(PassRefPtr<FileWriterBase> file { } -void FileWriterBaseCallbacks::didCreateFileWriter(PassOwnPtr<WebKit::WebFileWriter> fileWriter, long long length) +void FileWriterBaseCallbacks::didCreateFileWriter(PassOwnPtr<blink::WebFileWriter> fileWriter, long long length) { m_fileWriter->initialize(fileWriter, length); if (m_successCallback) diff --git a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.h b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.h index 45357e3..92db0c2 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.h +++ b/third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.h @@ -132,7 +132,7 @@ private: class FileWriterBaseCallbacks : public FileSystemCallbacksBase { public: static PassOwnPtr<AsyncFileSystemCallbacks> create(PassRefPtr<FileWriterBase>, PassRefPtr<FileWriterBaseCallback>, PassRefPtr<ErrorCallback>); - virtual void didCreateFileWriter(PassOwnPtr<WebKit::WebFileWriter>, long long length); + virtual void didCreateFileWriter(PassOwnPtr<blink::WebFileWriter>, long long length); private: FileWriterBaseCallbacks(PassRefPtr<FileWriterBase>, PassRefPtr<FileWriterBaseCallback>, PassRefPtr<ErrorCallback>); diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriter.cpp b/third_party/WebKit/Source/modules/filesystem/FileWriter.cpp index 5dab7e8..e2e7cd8 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriter.cpp +++ b/third_party/WebKit/Source/modules/filesystem/FileWriter.cpp @@ -225,7 +225,7 @@ void FileWriter::didTruncate() unsetPendingActivity(this); } -void FileWriter::didFail(WebKit::WebFileError code) +void FileWriter::didFail(blink::WebFileError code) { ASSERT(m_operationInProgress != OperationNone); ASSERT(static_cast<FileError::ErrorCode>(code) != FileError::OK); diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriter.h b/third_party/WebKit/Source/modules/filesystem/FileWriter.h index 552ef5f..2cc7578 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriter.h +++ b/third_party/WebKit/Source/modules/filesystem/FileWriter.h @@ -47,7 +47,7 @@ class Blob; class ExceptionState; class ExecutionContext; -class FileWriter : public ScriptWrappable, public FileWriterBase, public ActiveDOMObject, public EventTargetWithInlineData, public WebKit::WebFileWriterClient { +class FileWriter : public ScriptWrappable, public FileWriterBase, public ActiveDOMObject, public EventTargetWithInlineData, public blink::WebFileWriterClient { DEFINE_EVENT_TARGET_REFCOUNTING(FileWriterBase); public: static PassRefPtr<FileWriter> create(ExecutionContext*); @@ -68,7 +68,7 @@ public: // WebFileWriterClient virtual void didWrite(long long bytes, bool complete) OVERRIDE; virtual void didTruncate() OVERRIDE; - virtual void didFail(WebKit::WebFileError) OVERRIDE; + virtual void didFail(blink::WebFileError) OVERRIDE; // ActiveDOMObject virtual void stop(); diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriterBase.cpp b/third_party/WebKit/Source/modules/filesystem/FileWriterBase.cpp index 7dc3f78..b626906 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriterBase.cpp +++ b/third_party/WebKit/Source/modules/filesystem/FileWriterBase.cpp @@ -43,7 +43,7 @@ FileWriterBase::~FileWriterBase() { } -void FileWriterBase::initialize(PassOwnPtr<WebKit::WebFileWriter> writer, long long length) +void FileWriterBase::initialize(PassOwnPtr<blink::WebFileWriter> writer, long long length) { ASSERT(!m_writer); ASSERT(length >= 0); diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriterBase.h b/third_party/WebKit/Source/modules/filesystem/FileWriterBase.h index 20cecf9..8cf9b87 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriterBase.h +++ b/third_party/WebKit/Source/modules/filesystem/FileWriterBase.h @@ -35,14 +35,14 @@ #include "wtf/PassOwnPtr.h" #include "wtf/RefCounted.h" -namespace WebKit { class WebFileWriter; } +namespace blink { class WebFileWriter; } namespace WebCore { class FileWriterBase : public RefCounted<FileWriterBase> { public: virtual ~FileWriterBase(); - void initialize(PassOwnPtr<WebKit::WebFileWriter>, long long length); + void initialize(PassOwnPtr<blink::WebFileWriter>, long long length); long long position() const { @@ -56,7 +56,7 @@ public: protected: FileWriterBase(); - WebKit::WebFileWriter* writer() + blink::WebFileWriter* writer() { return m_writer.get(); } @@ -76,7 +76,7 @@ protected: private: friend class WTF::RefCounted<FileWriterBase>; - OwnPtr<WebKit::WebFileWriter> m_writer; + OwnPtr<blink::WebFileWriter> m_writer; long long m_position; long long m_length; }; diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriterSync.cpp b/third_party/WebKit/Source/modules/filesystem/FileWriterSync.cpp index 8e9175a..6fa77c6 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriterSync.cpp +++ b/third_party/WebKit/Source/modules/filesystem/FileWriterSync.cpp @@ -110,7 +110,7 @@ void FileWriterSync::didTruncate() #endif } -void FileWriterSync::didFail(WebKit::WebFileError error) +void FileWriterSync::didFail(blink::WebFileError error) { ASSERT(m_error == FileError::OK); m_error = static_cast<FileError::ErrorCode>(error); diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriterSync.h b/third_party/WebKit/Source/modules/filesystem/FileWriterSync.h index 965bacdfc..d7c5050 100644 --- a/third_party/WebKit/Source/modules/filesystem/FileWriterSync.h +++ b/third_party/WebKit/Source/modules/filesystem/FileWriterSync.h @@ -42,7 +42,7 @@ namespace WebCore { class Blob; class ExceptionState; -class FileWriterSync : public ScriptWrappable, public FileWriterBase, public WebKit::WebFileWriterClient { +class FileWriterSync : public ScriptWrappable, public FileWriterBase, public blink::WebFileWriterClient { public: static PassRefPtr<FileWriterSync> create() { @@ -58,7 +58,7 @@ public: // WebFileWriterClient, via FileWriterBase virtual void didWrite(long long bytes, bool complete) OVERRIDE; virtual void didTruncate() OVERRIDE; - virtual void didFail(WebKit::WebFileError) OVERRIDE; + virtual void didFail(blink::WebFileError) OVERRIDE; private: FileWriterSync(); diff --git a/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp b/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp index 3f26499..c20df32 100644 --- a/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp +++ b/third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp @@ -64,7 +64,7 @@ void LocalFileSystemBase::resolveURL(ExecutionContext* context, const KURL& file context->postTask(createCallbackTask(&fileSystemNotAllowed, callbacks)); return; } - WebKit::Platform::current()->fileSystem()->resolveURL(fileSystemURL, callbacks); + blink::Platform::current()->fileSystem()->resolveURL(fileSystemURL, callbacks); } void LocalFileSystemBase::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) @@ -74,7 +74,7 @@ void LocalFileSystemBase::requestFileSystem(ExecutionContext* context, FileSyste return; } KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString()); - WebKit::Platform::current()->fileSystem()->openFileSystem(storagePartition, static_cast<WebKit::WebFileSystemType>(type), callbacks); + blink::Platform::current()->fileSystem()->openFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks); } void LocalFileSystemBase::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) @@ -87,7 +87,7 @@ void LocalFileSystemBase::deleteFileSystem(ExecutionContext* context, FileSystem return; } KURL storagePartition = KURL(KURL(), context->securityOrigin()->toString()); - WebKit::Platform::current()->fileSystem()->deleteFileSystem(storagePartition, static_cast<WebKit::WebFileSystemType>(type), callbacks); + blink::Platform::current()->fileSystem()->deleteFileSystem(storagePartition, static_cast<blink::WebFileSystemType>(type), callbacks); } LocalFileSystemBase::LocalFileSystemBase(PassOwnPtr<FileSystemClient> client) diff --git a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp index 1e63a7d..f677c55 100644 --- a/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp +++ b/third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp @@ -35,12 +35,12 @@ namespace WebCore { static void sampleGamepads(GamepadList* into) { - WebKit::WebGamepads gamepads; + blink::WebGamepads gamepads; - WebKit::Platform::current()->sampleGamepads(gamepads); + blink::Platform::current()->sampleGamepads(gamepads); - for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) { - WebKit::WebGamepad& webGamepad = gamepads.items[i]; + for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) { + blink::WebGamepad& webGamepad = gamepads.items[i]; if (i < gamepads.length && webGamepad.connected) { RefPtr<Gamepad> gamepad = into->item(i); if (!gamepad) diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBCallbacks.h b/third_party/WebKit/Source/modules/indexeddb/IDBCallbacks.h index 0514ccf..50f3f11 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBCallbacks.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBCallbacks.h @@ -69,7 +69,7 @@ public: // From IDBFactory.open()/deleteDatabase() virtual void onBlocked(int64_t /* existingVersion */) { ASSERT_NOT_REACHED(); } // From IDBFactory.open() - virtual void onUpgradeNeeded(int64_t /* oldVersion */, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&, WebKit::WebIDBCallbacks::DataLoss dataLoss, String dataLossMessage) { ASSERT_NOT_REACHED(); } + virtual void onUpgradeNeeded(int64_t /* oldVersion */, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&, blink::WebIDBCallbacks::DataLoss dataLoss, String dataLossMessage) { ASSERT_NOT_REACHED(); } virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); } }; diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp index bf5cecb..24448d9 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp +++ b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp @@ -186,7 +186,7 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionState& es) { IDB_TRACE("IDBDatabase::createObjectStore"); - WebKit::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBCreateObjectStoreCall, IDBMethodsMax); + blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBCreateObjectStoreCall, IDBMethodsMax); if (!m_versionChangeTransaction) { es.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage); return 0; @@ -230,7 +230,7 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co void IDBDatabase::deleteObjectStore(const String& name, ExceptionState& es) { IDB_TRACE("IDBDatabase::deleteObjectStore"); - WebKit::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteObjectStoreCall, IDBMethodsMax); + blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteObjectStoreCall, IDBMethodsMax); if (!m_versionChangeTransaction) { es.throwDOMException(InvalidStateError, IDBDatabase::notVersionChangeTransactionErrorMessage); return; @@ -258,7 +258,7 @@ void IDBDatabase::deleteObjectStore(const String& name, ExceptionState& es) PassRefPtr<IDBTransaction> IDBDatabase::transaction(ExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionState& es) { IDB_TRACE("IDBDatabase::transaction"); - WebKit::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBTransactionCall, IDBMethodsMax); + blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBTransactionCall, IDBMethodsMax); if (!scope.size()) { es.throwDOMException(InvalidAccessError, "The storeNames parameter was empty."); return 0; diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp index 233cbfa..886b9a7 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp +++ b/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp @@ -96,7 +96,7 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const S PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ExecutionContext* context, const String& name, int64_t version, ExceptionState& es) { - WebKit::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBOpenCall, IDBMethodsMax); + blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBOpenCall, IDBMethodsMax); ASSERT(version >= 1 || version == IDBDatabaseMetadata::NoIntVersion); if (name.isNull()) { es.throwUninformativeAndGenericTypeError(); @@ -125,7 +125,7 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const S PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ExecutionContext* context, const String& name, ExceptionState& es) { IDB_TRACE("IDBFactory::deleteDatabase"); - WebKit::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteDatabaseCall, IDBMethodsMax); + blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteDatabaseCall, IDBMethodsMax); if (name.isNull()) { es.throwUninformativeAndGenericTypeError(); return 0; diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp index b7111ad..8bb9556 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp +++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp @@ -71,7 +71,7 @@ void IDBOpenDBRequest::onBlocked(int64_t oldVersion) enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), newVersionAny.release(), EventTypeNames::blocked)); } -void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> prpDatabaseBackend, const IDBDatabaseMetadata& metadata, WebKit::WebIDBCallbacks::DataLoss dataLoss, String dataLossMessage) +void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> prpDatabaseBackend, const IDBDatabaseMetadata& metadata, blink::WebIDBCallbacks::DataLoss dataLoss, String dataLossMessage) { IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()"); if (m_contextStopped || !executionContext()) { diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.h b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.h index b54fe4f..805d3d7 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.h @@ -40,7 +40,7 @@ public: using IDBRequest::onSuccess; virtual void onBlocked(int64_t existingVersion) OVERRIDE; - virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&, WebKit::WebIDBCallbacks::DataLoss, String dataLossMessage) OVERRIDE; + virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&, blink::WebIDBCallbacks::DataLoss, String dataLossMessage) OVERRIDE; virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) OVERRIDE; // EventTarget diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp index 7551d1d..6df67fe 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp +++ b/third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp @@ -180,7 +180,7 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping) EXPECT_EQ(request->readyState(), "pending"); executionContext()->stopActiveDOMObjects(); - request->onUpgradeNeeded(oldVersion, interface, metadata, WebKit::WebIDBCallbacks::DataLossNone, String()); + request->onUpgradeNeeded(oldVersion, interface, metadata, blink::WebIDBCallbacks::DataLossNone, String()); } { diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.cpp index 0cc9d3a..2648924 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.cpp +++ b/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.cpp @@ -31,12 +31,12 @@ namespace WebCore { -PassRefPtr<IDBVersionChangeEvent> IDBVersionChangeEvent::create(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, WebKit::WebIDBCallbacks::DataLoss dataLoss, const String& dataLossMessage) +PassRefPtr<IDBVersionChangeEvent> IDBVersionChangeEvent::create(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBCallbacks::DataLoss dataLoss, const String& dataLossMessage) { return adoptRef(new IDBVersionChangeEvent(oldVersion, newVersion, eventType, dataLoss, dataLossMessage)); } -IDBVersionChangeEvent::IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, WebKit::WebIDBCallbacks::DataLoss dataLoss, const String& dataLossMessage) +IDBVersionChangeEvent::IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBCallbacks::DataLoss dataLoss, const String& dataLossMessage) : Event(eventType, false /*canBubble*/, false /*cancelable*/) , m_oldVersion(oldVersion) , m_newVersion(newVersion) @@ -53,7 +53,7 @@ IDBVersionChangeEvent::~IDBVersionChangeEvent() const AtomicString& IDBVersionChangeEvent::dataLoss() { DEFINE_STATIC_LOCAL(AtomicString, total, ("total", AtomicString::ConstructFromLiteral)); - if (m_dataLoss == WebKit::WebIDBCallbacks::DataLossTotal) + if (m_dataLoss == blink::WebIDBCallbacks::DataLossTotal) return total; DEFINE_STATIC_LOCAL(AtomicString, none, ("none", AtomicString::ConstructFromLiteral)); return none; diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.h b/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.h index 3da5434..e6b97ec 100644 --- a/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.h +++ b/third_party/WebKit/Source/modules/indexeddb/IDBVersionChangeEvent.h @@ -37,7 +37,7 @@ namespace WebCore { class IDBVersionChangeEvent : public Event { public: - static PassRefPtr<IDBVersionChangeEvent> create(PassRefPtr<IDBAny> oldVersion = IDBAny::createNull(), PassRefPtr<IDBAny> newVersion = IDBAny::createNull(), const AtomicString& eventType = AtomicString(), WebKit::WebIDBCallbacks::DataLoss = WebKit::WebIDBCallbacks::DataLossNone, const String& dataLossMessage = String()); + static PassRefPtr<IDBVersionChangeEvent> create(PassRefPtr<IDBAny> oldVersion = IDBAny::createNull(), PassRefPtr<IDBAny> newVersion = IDBAny::createNull(), const AtomicString& eventType = AtomicString(), blink::WebIDBCallbacks::DataLoss = blink::WebIDBCallbacks::DataLossNone, const String& dataLossMessage = String()); virtual ~IDBVersionChangeEvent(); virtual PassRefPtr<IDBAny> oldVersion() { return m_oldVersion; } @@ -51,7 +51,7 @@ public: virtual const AtomicString& interfaceName() const; private: - IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, WebKit::WebIDBCallbacks::DataLoss, const String& dataLoss); + IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBCallbacks::DataLoss, const String& dataLoss); RefPtr<IDBAny> m_oldVersion; RefPtr<IDBAny> m_newVersion; diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp index 6951560..a239d9f 100644 --- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp +++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp @@ -50,7 +50,7 @@ MediaStreamTrackSourcesRequest::~MediaStreamTrackSourcesRequest() { } -void MediaStreamTrackSourcesRequest::requestSucceeded(const WebKit::WebVector<WebKit::WebSourceInfo>& webSourceInfos) +void MediaStreamTrackSourcesRequest::requestSucceeded(const blink::WebVector<blink::WebSourceInfo>& webSourceInfos) { ASSERT(m_callback && !m_scheduledEventTimer.isActive()); diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.h b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.h index 1225bad..2a44d92 100644 --- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.h +++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequest.h @@ -34,7 +34,7 @@ #include "wtf/RefPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebSourceInfo; } @@ -55,7 +55,7 @@ public: String origin() { return m_origin; } - void requestSucceeded(const WebKit::WebVector<WebKit::WebSourceInfo>&); + void requestSucceeded(const blink::WebVector<blink::WebSourceInfo>&); PassRefPtr<ExtraData> extraData() const { return m_extraData; } void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; } diff --git a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.cpp b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.cpp index 1941333..e1d3f55 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.cpp +++ b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.cpp @@ -60,7 +60,7 @@ PassRefPtr<RTCDataChannel> RTCDataChannel::create(ExecutionContext* context, Pas return adoptRef(new RTCDataChannel(context, handler)); } -PassRefPtr<RTCDataChannel> RTCDataChannel::create(ExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const WebKit::WebRTCDataChannelInit& init, ExceptionState& es) +PassRefPtr<RTCDataChannel> RTCDataChannel::create(ExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const blink::WebRTCDataChannelInit& init, ExceptionState& es) { OwnPtr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, init); if (!handler) { diff --git a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h index 232ea9f..911b705 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h +++ b/third_party/WebKit/Source/modules/mediastream/RTCDataChannel.h @@ -31,7 +31,7 @@ #include "platform/Timer.h" #include "wtf/RefCounted.h" -namespace WebKit { +namespace blink { struct WebRTCDataChannelInit; } @@ -46,7 +46,7 @@ class RTCDataChannel : public RefCounted<RTCDataChannel>, public ScriptWrappable REFCOUNTED_EVENT_TARGET(RTCDataChannel); public: static PassRefPtr<RTCDataChannel> create(ExecutionContext*, PassOwnPtr<RTCDataChannelHandler>); - static PassRefPtr<RTCDataChannel> create(ExecutionContext*, RTCPeerConnectionHandler*, const String& label, const WebKit::WebRTCDataChannelInit&, ExceptionState&); + static PassRefPtr<RTCDataChannel> create(ExecutionContext*, RTCPeerConnectionHandler*, const String& label, const blink::WebRTCDataChannelInit&, ExceptionState&); ~RTCDataChannel(); String label() const; diff --git a/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.cpp b/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.cpp index b981486..54348a1 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.cpp +++ b/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.cpp @@ -54,15 +54,15 @@ PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(const Dictionary& dictionary unsigned short sdpMLineIndex = 0; dictionary.get("sdpMLineIndex", sdpMLineIndex); - return adoptRef(new RTCIceCandidate(WebKit::WebRTCICECandidate(candidate, sdpMid, sdpMLineIndex))); + return adoptRef(new RTCIceCandidate(blink::WebRTCICECandidate(candidate, sdpMid, sdpMLineIndex))); } -PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(WebKit::WebRTCICECandidate webCandidate) +PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(blink::WebRTCICECandidate webCandidate) { return adoptRef(new RTCIceCandidate(webCandidate)); } -RTCIceCandidate::RTCIceCandidate(WebKit::WebRTCICECandidate webCandidate) +RTCIceCandidate::RTCIceCandidate(blink::WebRTCICECandidate webCandidate) : m_webCandidate(webCandidate) { ScriptWrappable::init(this); @@ -83,7 +83,7 @@ unsigned short RTCIceCandidate::sdpMLineIndex() const return m_webCandidate.sdpMLineIndex(); } -WebKit::WebRTCICECandidate RTCIceCandidate::webCandidate() +blink::WebRTCICECandidate RTCIceCandidate::webCandidate() { return m_webCandidate; } diff --git a/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.h b/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.h index ff63eb6..9d93405 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.h +++ b/third_party/WebKit/Source/modules/mediastream/RTCIceCandidate.h @@ -46,18 +46,18 @@ class ExceptionState; class RTCIceCandidate FINAL : public RefCounted<RTCIceCandidate>, public ScriptWrappable { public: static PassRefPtr<RTCIceCandidate> create(const Dictionary&, ExceptionState&); - static PassRefPtr<RTCIceCandidate> create(WebKit::WebRTCICECandidate); + static PassRefPtr<RTCIceCandidate> create(blink::WebRTCICECandidate); String candidate() const; String sdpMid() const; unsigned short sdpMLineIndex() const; - WebKit::WebRTCICECandidate webCandidate(); + blink::WebRTCICECandidate webCandidate(); private: - explicit RTCIceCandidate(WebKit::WebRTCICECandidate); + explicit RTCIceCandidate(blink::WebRTCICECandidate); - WebKit::WebRTCICECandidate m_webCandidate; + blink::WebRTCICECandidate m_webCandidate; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp index 46d5097..1a898c0 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp +++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp @@ -226,7 +226,7 @@ void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> pr PassRefPtr<RTCSessionDescription> RTCPeerConnection::localDescription(ExceptionState& es) { - WebKit::WebRTCSessionDescription webSessionDescription = m_peerHandler->localDescription(); + blink::WebRTCSessionDescription webSessionDescription = m_peerHandler->localDescription(); if (webSessionDescription.isNull()) return 0; @@ -253,7 +253,7 @@ void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> p PassRefPtr<RTCSessionDescription> RTCPeerConnection::remoteDescription(ExceptionState& es) { - WebKit::WebRTCSessionDescription webSessionDescription = m_peerHandler->remoteDescription(); + blink::WebRTCSessionDescription webSessionDescription = m_peerHandler->remoteDescription(); if (webSessionDescription.isNull()) return 0; @@ -465,7 +465,7 @@ PassRefPtr<RTCDataChannel> RTCPeerConnection::createDataChannel(String label, co return 0; } - WebKit::WebRTCDataChannelInit init; + blink::WebRTCDataChannelInit init; options.get("ordered", init.ordered); options.get("negotiated", init.negotiated); @@ -541,7 +541,7 @@ void RTCPeerConnection::negotiationNeeded() scheduleDispatchEvent(Event::create(EventTypeNames::negotiationneeded)); } -void RTCPeerConnection::didGenerateIceCandidate(WebKit::WebRTCICECandidate webCandidate) +void RTCPeerConnection::didGenerateIceCandidate(blink::WebRTCICECandidate webCandidate) { ASSERT(executionContext()->isContextThread()); if (webCandidate.isNull()) diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h index 2cf1a11..d0eead5 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h +++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h @@ -113,7 +113,7 @@ public: // RTCPeerConnectionHandlerClient virtual void negotiationNeeded() OVERRIDE; - virtual void didGenerateIceCandidate(WebKit::WebRTCICECandidate) OVERRIDE; + virtual void didGenerateIceCandidate(blink::WebRTCICECandidate) OVERRIDE; virtual void didChangeSignalingState(SignalingState) OVERRIDE; virtual void didChangeIceGatheringState(IceGatheringState) OVERRIDE; virtual void didChangeIceConnectionState(IceConnectionState) OVERRIDE; diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.cpp b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.cpp index 261e6b8..e870e5b 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.cpp +++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.cpp @@ -61,15 +61,15 @@ PassRefPtr<RTCSessionDescription> RTCSessionDescription::create(const Dictionary String sdp; descriptionInitDict.get("sdp", sdp); - return adoptRef(new RTCSessionDescription(WebKit::WebRTCSessionDescription(type, sdp))); + return adoptRef(new RTCSessionDescription(blink::WebRTCSessionDescription(type, sdp))); } -PassRefPtr<RTCSessionDescription> RTCSessionDescription::create(WebKit::WebRTCSessionDescription webSessionDescription) +PassRefPtr<RTCSessionDescription> RTCSessionDescription::create(blink::WebRTCSessionDescription webSessionDescription) { return adoptRef(new RTCSessionDescription(webSessionDescription)); } -RTCSessionDescription::RTCSessionDescription(WebKit::WebRTCSessionDescription webSessionDescription) +RTCSessionDescription::RTCSessionDescription(blink::WebRTCSessionDescription webSessionDescription) : m_webSessionDescription(webSessionDescription) { ScriptWrappable::init(this); @@ -98,7 +98,7 @@ void RTCSessionDescription::setSdp(const String& sdp) m_webSessionDescription.setSDP(sdp); } -WebKit::WebRTCSessionDescription RTCSessionDescription::webSessionDescription() +blink::WebRTCSessionDescription RTCSessionDescription::webSessionDescription() { return m_webSessionDescription; } diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h index 447c01b..8e87f89 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h +++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescription.h @@ -45,7 +45,7 @@ class ExceptionState; class RTCSessionDescription FINAL : public RefCounted<RTCSessionDescription>, public ScriptWrappable { public: static PassRefPtr<RTCSessionDescription> create(const Dictionary&, ExceptionState&); - static PassRefPtr<RTCSessionDescription> create(WebKit::WebRTCSessionDescription); + static PassRefPtr<RTCSessionDescription> create(blink::WebRTCSessionDescription); String type(); void setType(const String&, ExceptionState&); @@ -53,12 +53,12 @@ public: String sdp(); void setSdp(const String&); - WebKit::WebRTCSessionDescription webSessionDescription(); + blink::WebRTCSessionDescription webSessionDescription(); private: - explicit RTCSessionDescription(WebKit::WebRTCSessionDescription); + explicit RTCSessionDescription(blink::WebRTCSessionDescription); - WebKit::WebRTCSessionDescription m_webSessionDescription; + blink::WebRTCSessionDescription m_webSessionDescription; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp index 9575817..5af65e7 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp +++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp @@ -58,7 +58,7 @@ RTCSessionDescriptionRequestImpl::~RTCSessionDescriptionRequestImpl() { } -void RTCSessionDescriptionRequestImpl::requestSucceeded(const WebKit::WebRTCSessionDescription& webSessionDescription) +void RTCSessionDescriptionRequestImpl::requestSucceeded(const blink::WebRTCSessionDescription& webSessionDescription) { if (m_successCallback) { RefPtr<RTCSessionDescription> sessionDescription = RTCSessionDescription::create(webSessionDescription); diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h index d6d3f78..724057a 100644 --- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h +++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h @@ -34,7 +34,7 @@ #include "core/dom/ActiveDOMObject.h" #include "core/platform/mediastream/RTCSessionDescriptionRequest.h" -namespace WebKit { +namespace blink { class WebRTCSessionDescription; } @@ -49,7 +49,7 @@ public: static PassRefPtr<RTCSessionDescriptionRequestImpl> create(ExecutionContext*, PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCErrorCallback>); virtual ~RTCSessionDescriptionRequestImpl(); - virtual void requestSucceeded(const WebKit::WebRTCSessionDescription&) OVERRIDE; + virtual void requestSucceeded(const blink::WebRTCSessionDescription&) OVERRIDE; virtual void requestFailed(const String& error) OVERRIDE; // ActiveDOMObject diff --git a/third_party/WebKit/Source/modules/mediastream/SourceInfo.cpp b/third_party/WebKit/Source/modules/mediastream/SourceInfo.cpp index c748d6e..be8dfc2 100644 --- a/third_party/WebKit/Source/modules/mediastream/SourceInfo.cpp +++ b/third_party/WebKit/Source/modules/mediastream/SourceInfo.cpp @@ -30,13 +30,13 @@ namespace WebCore { -PassRefPtr<SourceInfo> SourceInfo::create(const WebKit::WebSourceInfo& webSourceInfo) +PassRefPtr<SourceInfo> SourceInfo::create(const blink::WebSourceInfo& webSourceInfo) { ASSERT(!webSourceInfo.isNull()); return adoptRef(new SourceInfo(webSourceInfo)); } -SourceInfo::SourceInfo(const WebKit::WebSourceInfo& webSourceInfo) +SourceInfo::SourceInfo(const blink::WebSourceInfo& webSourceInfo) : m_webSourceInfo(webSourceInfo) { ScriptWrappable::init(this); @@ -50,11 +50,11 @@ String SourceInfo::id() const String SourceInfo::kind() const { switch (m_webSourceInfo.kind()) { - case WebKit::WebSourceInfo::SourceKindAudio: + case blink::WebSourceInfo::SourceKindAudio: return "audio"; - case WebKit::WebSourceInfo::SourceKindVideo: + case blink::WebSourceInfo::SourceKindVideo: return "video"; - case WebKit::WebSourceInfo::SourceKindNone: + case blink::WebSourceInfo::SourceKindNone: return "none"; } @@ -70,11 +70,11 @@ String SourceInfo::label() const String SourceInfo::facing() const { switch (m_webSourceInfo.facing()) { - case WebKit::WebSourceInfo::VideoFacingModeNone: + case blink::WebSourceInfo::VideoFacingModeNone: return String(); - case WebKit::WebSourceInfo::VideoFacingModeUser: + case blink::WebSourceInfo::VideoFacingModeUser: return "user"; - case WebKit::WebSourceInfo::VideoFacingModeEnvironment: + case blink::WebSourceInfo::VideoFacingModeEnvironment: return "environment"; } diff --git a/third_party/WebKit/Source/modules/mediastream/SourceInfo.h b/third_party/WebKit/Source/modules/mediastream/SourceInfo.h index 94bce29..5734988 100644 --- a/third_party/WebKit/Source/modules/mediastream/SourceInfo.h +++ b/third_party/WebKit/Source/modules/mediastream/SourceInfo.h @@ -36,7 +36,7 @@ namespace WebCore { class SourceInfo : public RefCounted<SourceInfo>, public ScriptWrappable { public: - static PassRefPtr<SourceInfo> create(const WebKit::WebSourceInfo&); + static PassRefPtr<SourceInfo> create(const blink::WebSourceInfo&); String id() const; String kind() const; @@ -44,9 +44,9 @@ public: String facing() const; private: - explicit SourceInfo(const WebKit::WebSourceInfo&); + explicit SourceInfo(const blink::WebSourceInfo&); - WebKit::WebSourceInfo m_webSourceInfo; + blink::WebSourceInfo m_webSourceInfo; }; typedef Vector<RefPtr<SourceInfo> > SourceInfoVector; diff --git a/third_party/WebKit/Source/modules/mediastream/WebMediaStreamTrackSourcesRequest.cpp b/third_party/WebKit/Source/modules/mediastream/WebMediaStreamTrackSourcesRequest.cpp index 4a0665b..bf2f972 100644 --- a/third_party/WebKit/Source/modules/mediastream/WebMediaStreamTrackSourcesRequest.cpp +++ b/third_party/WebKit/Source/modules/mediastream/WebMediaStreamTrackSourcesRequest.cpp @@ -33,7 +33,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -89,5 +89,5 @@ void WebMediaStreamTrackSourcesRequest::setExtraData(ExtraData* extraData) m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData))); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/modules/quota/StorageQuota.cpp b/third_party/WebKit/Source/modules/quota/StorageQuota.cpp index a715cef..9739205 100644 --- a/third_party/WebKit/Source/modules/quota/StorageQuota.cpp +++ b/third_party/WebKit/Source/modules/quota/StorageQuota.cpp @@ -54,8 +54,8 @@ void StorageQuota::queryUsageAndQuota(ExecutionContext* executionContext, PassRe { ASSERT(executionContext); - WebKit::WebStorageQuotaType storageType = static_cast<WebKit::WebStorageQuotaType>(m_type); - if (storageType != WebKit::WebStorageQuotaTypeTemporary && storageType != WebKit::WebStorageQuotaTypePersistent) { + blink::WebStorageQuotaType storageType = static_cast<blink::WebStorageQuotaType>(m_type); + if (storageType != blink::WebStorageQuotaTypeTemporary && storageType != blink::WebStorageQuotaTypePersistent) { // Unknown storage type is requested. executionContext->postTask(StorageErrorCallback::CallbackTask::create(errorCallback, NotSupportedError)); return; @@ -68,7 +68,7 @@ void StorageQuota::queryUsageAndQuota(ExecutionContext* executionContext, PassRe } KURL storagePartition = KURL(KURL(), securityOrigin->toString()); - WebKit::Platform::current()->queryStorageUsageAndQuota(storagePartition, storageType, WebStorageQuotaCallbacksImpl::createLeakedPtr(successCallback, errorCallback)); + blink::Platform::current()->queryStorageUsageAndQuota(storagePartition, storageType, WebStorageQuotaCallbacksImpl::createLeakedPtr(successCallback, errorCallback)); } StorageQuota::~StorageQuota() diff --git a/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.cpp b/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.cpp index 574703e..18949ed 100644 --- a/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.cpp +++ b/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.cpp @@ -66,7 +66,7 @@ void WebStorageQuotaCallbacksImpl::didGrantStorageQuota(unsigned long long grant m_quotaCallback->handleEvent(grantedQuotaInBytes); } -void WebStorageQuotaCallbacksImpl::didFail(WebKit::WebStorageQuotaError error) +void WebStorageQuotaCallbacksImpl::didFail(blink::WebStorageQuotaError error) { OwnPtr<WebStorageQuotaCallbacksImpl> deleter = adoptPtr(this); if (m_errorCallback) diff --git a/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.h b/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.h index 6c71dc2..97ba9cb 100644 --- a/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.h +++ b/third_party/WebKit/Source/modules/quota/WebStorageQuotaCallbacksImpl.h @@ -41,7 +41,7 @@ namespace WebCore { -class WebStorageQuotaCallbacksImpl : public WebKit::WebStorageQuotaCallbacks { +class WebStorageQuotaCallbacksImpl : public blink::WebStorageQuotaCallbacks { public: // The class is self-destructed and thus we have leakedPtr constructors. static WebStorageQuotaCallbacksImpl* createLeakedPtr(PassRefPtr<StorageUsageCallback> success, PassRefPtr<StorageErrorCallback> error) @@ -60,7 +60,7 @@ public: virtual void didQueryStorageUsageAndQuota(unsigned long long usageInBytes, unsigned long long quotaInBytes); virtual void didGrantStorageQuota(unsigned long long grantedQuotaInBytes); - virtual void didFail(WebKit::WebStorageQuotaError); + virtual void didFail(blink::WebStorageQuotaError); private: WebStorageQuotaCallbacksImpl(PassRefPtr<StorageUsageCallback>, PassRefPtr<StorageErrorCallback>); diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp index 0372350..eb292ad 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp +++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp @@ -50,8 +50,8 @@ #include "public/platform/WebString.h" #include "public/platform/WebURL.h" -using WebKit::WebServiceWorkerProvider; -using WebKit::WebString; +using blink::WebServiceWorkerProvider; +using blink::WebString; namespace WebCore { diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h index d8d1594..c1e60e5 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h +++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h @@ -35,7 +35,7 @@ #include "core/frame/Navigator.h" #include "platform/Supplementable.h" -namespace WebKit { +namespace blink { class WebServiceWorkerProvider; class WebServiceWorkerProviderClient; } @@ -62,12 +62,12 @@ private: virtual void willDetachGlobalObjectFromFrame() OVERRIDE; - WebKit::WebServiceWorkerProvider* ensureProvider(); + blink::WebServiceWorkerProvider* ensureProvider(); static const char* supplementName(); Navigator* m_navigator; - OwnPtr<WebKit::WebServiceWorkerProvider> m_provider; + OwnPtr<blink::WebServiceWorkerProvider> m_provider; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp index e731dbe..54458f7 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp @@ -35,7 +35,7 @@ namespace WebCore { -ServiceWorker::ServiceWorker(PassOwnPtr<WebKit::WebServiceWorker> worker) +ServiceWorker::ServiceWorker(PassOwnPtr<blink::WebServiceWorker> worker) : m_outerWorker(worker) { } diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.h index 068b757..ff1e849 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.h +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.h @@ -37,7 +37,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" -namespace WebKit { +namespace blink { class WebServiceWorker; } @@ -45,13 +45,13 @@ namespace WebCore { class ServiceWorker : public RefCounted<ServiceWorker> { public: - static PassRefPtr<ServiceWorker> create(PassOwnPtr<WebKit::WebServiceWorker> worker) + static PassRefPtr<ServiceWorker> create(PassOwnPtr<blink::WebServiceWorker> worker) { return adoptRef(new ServiceWorker(worker)); } // For CallbackPromiseAdapter - typedef WebKit::WebServiceWorker WebType; + typedef blink::WebServiceWorker WebType; static PassRefPtr<ServiceWorker> from(WebType* worker) { return create(adoptPtr(worker)); @@ -60,9 +60,9 @@ public: ~ServiceWorker() { } private: - explicit ServiceWorker(PassOwnPtr<WebKit::WebServiceWorker>); + explicit ServiceWorker(PassOwnPtr<blink::WebServiceWorker>); - OwnPtr<WebKit::WebServiceWorker> m_outerWorker; + OwnPtr<blink::WebServiceWorker> m_outerWorker; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.cpp index 61572c6..9c37cfa 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.cpp +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "ServiceWorkerError.h" -using WebKit::WebServiceWorkerError; +using blink::WebServiceWorkerError; namespace WebCore { String ServiceWorkerError::errorString(WebServiceWorkerError::ErrorType type) diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.h index 1c29ea5..276eb13 100644 --- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.h +++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerError.h @@ -40,7 +40,7 @@ namespace WebCore { class ServiceWorkerError { public: // For CallbackPromiseAdapter - typedef WebKit::WebServiceWorkerError WebType; + typedef blink::WebServiceWorkerError WebType; static PassRefPtr<DOMError> from(WebType* webErrorRaw) { OwnPtr<WebType> webError = adoptPtr(webErrorRaw); @@ -49,7 +49,7 @@ public: } private: - static String errorString(WebKit::WebServiceWorkerError::ErrorType); + static String errorString(blink::WebServiceWorkerError::ErrorType); WTF_MAKE_NONCOPYABLE(ServiceWorkerError); ServiceWorkerError() WTF_DELETED_FUNCTION; }; diff --git a/third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp b/third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp index 6581515..de601e67 100644 --- a/third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp +++ b/third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp @@ -59,8 +59,8 @@ bool NavigatorVibration::vibrate(const VibrationPattern& pattern) // If any pattern entry is too long then truncate it. for (size_t i = 0; i < length; ++i) { - if (sanitized[i] > WebKit::kVibrationDurationMax) - sanitized[i] = WebKit::kVibrationDurationMax; + if (sanitized[i] > blink::kVibrationDurationMax) + sanitized[i] = blink::kVibrationDurationMax; } // If the last item in the pattern is a pause then discard it. @@ -93,7 +93,7 @@ void NavigatorVibration::cancelVibration() { m_pattern.clear(); if (m_isVibrating) { - WebKit::Platform::current()->cancelVibration(); + blink::Platform::current()->cancelVibration(); m_isVibrating = false; m_timerStop.stop(); } @@ -105,7 +105,7 @@ void NavigatorVibration::timerStartFired(Timer<NavigatorVibration>* timer) if (m_pattern.size()) { m_isVibrating = true; - WebKit::Platform::current()->vibrate(m_pattern[0]); + blink::Platform::current()->vibrate(m_pattern[0]); m_timerStop.startOneShot(m_pattern[0] / 1000.0); m_pattern.remove(0); } diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp index 6bde9d6..3380564 100644 --- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp +++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp @@ -39,7 +39,7 @@ namespace WebCore { AsyncAudioDecoder::AsyncAudioDecoder() - : m_thread(adoptPtr(WebKit::Platform::current()->createThread("Audio Decoder"))) + : m_thread(adoptPtr(blink::Platform::current()->createThread("Audio Decoder"))) { } diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h index bb805af..9bc8144 100644 --- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h +++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h @@ -50,7 +50,7 @@ private: static void decode(ArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback); static void notifyComplete(ArrayBuffer* audioData, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, AudioBuffer*); - OwnPtr<WebKit::WebThread> m_thread; + OwnPtr<blink::WebThread> m_thread; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp index 332c261..0554582 100644 --- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp +++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp @@ -84,7 +84,7 @@ void OfflineAudioDestinationNode::startRendering() if (!m_startedRendering) { m_startedRendering = true; ref(); // See corresponding deref() call in notifyCompleteDispatch(). - m_renderThread = adoptPtr(WebKit::Platform::current()->createThread("Offline Audio Renderer")); + m_renderThread = adoptPtr(blink::Platform::current()->createThread("Offline Audio Renderer")); m_renderThread->postTask(new Task(WTF::bind(&OfflineAudioDestinationNode::offlineRender, this))); } } diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h index ac93807..a2f2a61 100644 --- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h +++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h @@ -68,7 +68,7 @@ private: RefPtr<AudioBus> m_renderBus; // Rendering thread. - OwnPtr<WebKit::WebThread> m_renderThread; + OwnPtr<blink::WebThread> m_renderThread; bool m_startedRendering; void offlineRender(); diff --git a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp index f22371b..03aeaef 100644 --- a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp +++ b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp @@ -46,7 +46,7 @@ static size_t chooseBufferSize() // Choose a buffer size based on the audio hardware buffer size. Arbitarily make it a power of // two that is 4 times greater than the hardware buffer size. // FIXME: What is the best way to choose this? - size_t hardwareBufferSize = WebKit::Platform::current()->audioHardwareBufferSize(); + size_t hardwareBufferSize = blink::Platform::current()->audioHardwareBufferSize(); size_t bufferSize = 1 << static_cast<unsigned>(log2(4 * hardwareBufferSize) + 0.5); if (bufferSize < 256) diff --git a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp index 9992bdf..e6fa44b 100644 --- a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp @@ -47,7 +47,7 @@ void QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin( const String& originIdentifier, const String& databaseName, unsigned long long* databaseSize, unsigned long long* spaceAvailable) { - // Extra scope to unlock prior to potentially calling WebKit::Platform. + // Extra scope to unlock prior to potentially calling blink::Platform. { MutexLocker lockData(m_dataGuard); ASSERT(m_databaseSizes.contains(originIdentifier)); @@ -62,7 +62,7 @@ void QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin( } // The embedder hasn't pushed this value to us, so we pull it as needed. - *spaceAvailable = WebKit::Platform::current()->databaseGetSpaceAvailableForOrigin(originIdentifier); + *spaceAvailable = blink::Platform::current()->databaseGetSpaceAvailableForOrigin(originIdentifier); } void QuotaTracker::updateDatabaseSize( diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp index 3b6fed9..8e5dd11 100644 --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystem.cpp @@ -89,12 +89,12 @@ bool SQLiteFileSystem::deleteEmptyDatabaseDirectory(const String&) bool SQLiteFileSystem::deleteDatabaseFile(const String& fileName) { - return (WebKit::Platform::current()->databaseDeleteFile(fileName, false) == SQLITE_OK); + return (blink::Platform::current()->databaseDeleteFile(fileName, false) == SQLITE_OK); } long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName) { - return WebKit::Platform::current()->databaseGetFileSize(fileName); + return blink::Platform::current()->databaseGetFileSize(fileName); } } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp index e8c4e33..498759e 100644 --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp @@ -69,10 +69,10 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName, return result; if (fd < 0) { - fd = WebKit::Platform::current()->databaseOpenFile(String(fileName), desiredFlags); + fd = blink::Platform::current()->databaseOpenFile(String(fileName), desiredFlags); if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) { int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY; - fd = WebKit::Platform::current()->databaseOpenFile(String(fileName), newFlags); + fd = blink::Platform::current()->databaseOpenFile(String(fileName), newFlags); } } if (fd < 0) { @@ -103,7 +103,7 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName, // should be synched after the file is deleted. int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir) { - return WebKit::Platform::current()->databaseDeleteFile(String(fileName), syncDir); + return blink::Platform::current()->databaseDeleteFile(String(fileName), syncDir); } // Check the existance and status of the given file. @@ -114,7 +114,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir) // res - the result. int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res) { - int attr = static_cast<int>(WebKit::Platform::current()->databaseGetFileAttributes(String(fileName))); + int attr = static_cast<int>(blink::Platform::current()->databaseGetFileAttributes(String(fileName))); if (attr < 0) { *res = 0; return SQLITE_OK; diff --git a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp index 7935965..ed2b1cb 100644 --- a/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp @@ -55,7 +55,7 @@ namespace { int chromiumOpen(sqlite3_vfs*, const char* fileName, sqlite3_file* id, int desiredFlags, int* usedFlags) { - HANDLE h = WebKit::Platform::current()->databaseOpenFile(String(fileName), desiredFlags); + HANDLE h = blink::Platform::current()->databaseOpenFile(String(fileName), desiredFlags); if (h == INVALID_HANDLE_VALUE) { if (desiredFlags & SQLITE_OPEN_READWRITE) { int newFlags = (desiredFlags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE; @@ -82,7 +82,7 @@ int chromiumOpen(sqlite3_vfs*, const char* fileName, // should be synched after the file is deleted. int chromiumDelete(sqlite3_vfs*, const char* fileName, int) { - return WebKit::Platform::current()->databaseDeleteFile(String(fileName), false); + return blink::Platform::current()->databaseDeleteFile(String(fileName), false); } // Check the existance and status of the given file. @@ -93,7 +93,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int) // res - the result. int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res) { - DWORD attr = WebKit::Platform::current()->databaseGetFileAttributes(String(fileName)); + DWORD attr = blink::Platform::current()->databaseGetFileAttributes(String(fileName)); switch (flag) { case SQLITE_ACCESS_READ: case SQLITE_ACCESS_EXISTS: diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.cpp index c5a00e0..2850ed4 100644 --- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.cpp +++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.cpp @@ -36,7 +36,7 @@ #include "public/platform/WebMIDIAccessor.h" #include "wtf/text/WTFString.h" -using WebKit::WebString; +using blink::WebString; namespace WebCore { @@ -51,7 +51,7 @@ MIDIAccessor::MIDIAccessor(MIDIAccessorClient* client) { ASSERT(client); - m_accessor = adoptPtr(WebKit::Platform::current()->createMIDIAccessor(this)); + m_accessor = adoptPtr(blink::Platform::current()->createMIDIAccessor(this)); ASSERT(m_accessor); } diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h index 2204afe..78290b6 100644 --- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h +++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessor.h @@ -40,7 +40,7 @@ namespace WebCore { class MIDIAccessorClient; -class MIDIAccessor : public WebKit::WebMIDIAccessorClient { +class MIDIAccessor : public blink::WebMIDIAccessorClient { public: static PassOwnPtr<MIDIAccessor> create(MIDIAccessorClient*); @@ -49,9 +49,9 @@ public: void startSession(); void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp); - // WebKit::WebMIDIAccessorClient - virtual void didAddInputPort(const WebKit::WebString& id, const WebKit::WebString& manufacturer, const WebKit::WebString& name, const WebKit::WebString& version) OVERRIDE; - virtual void didAddOutputPort(const WebKit::WebString& id, const WebKit::WebString& manufacturer, const WebKit::WebString& name, const WebKit::WebString& version) OVERRIDE; + // blink::WebMIDIAccessorClient + virtual void didAddInputPort(const blink::WebString& id, const blink::WebString& manufacturer, const blink::WebString& name, const blink::WebString& version) OVERRIDE; + virtual void didAddOutputPort(const blink::WebString& id, const blink::WebString& manufacturer, const blink::WebString& name, const blink::WebString& version) OVERRIDE; virtual void didStartSession(bool success) OVERRIDE; virtual void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) OVERRIDE; @@ -59,7 +59,7 @@ private: explicit MIDIAccessor(MIDIAccessorClient*); MIDIAccessorClient* m_client; - OwnPtr<WebKit::WebMIDIAccessor> m_accessor; + OwnPtr<blink::WebMIDIAccessor> m_accessor; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.cpp b/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.cpp index 645b953..bef3b3c 100644 --- a/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.cpp +++ b/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.cpp @@ -55,7 +55,7 @@ #include "wtf/Vector.h" #include "wtf/text/WTFString.h" -using WebKit::WebSocketHandle; +using blink::WebSocketHandle; namespace WebCore { @@ -116,7 +116,7 @@ void NewWebSocketChannelImpl::BlobLoader::didFail(FileError::ErrorCode errorCode NewWebSocketChannelImpl::NewWebSocketChannelImpl(ExecutionContext* context, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber) : ContextLifecycleObserver(context) - , m_handle(adoptPtr(WebKit::Platform::current()->createWebSocketHandle())) + , m_handle(adoptPtr(blink::Platform::current()->createWebSocketHandle())) , m_client(client) , m_identifier(0) , m_sendingQuota(0) @@ -149,7 +149,7 @@ void NewWebSocketChannelImpl::connect(const KURL& url, const String& protocol) // it. protocol.split(", ", true, protocols); } - WebKit::WebVector<WebKit::WebString> webProtocols(protocols.size()); + blink::WebVector<blink::WebString> webProtocols(protocols.size()); for (size_t i = 0; i < protocols.size(); ++i) { webProtocols[i] = protocols[i]; } @@ -371,7 +371,7 @@ Document* NewWebSocketChannelImpl::document() return toDocument(context); } -void NewWebSocketChannelImpl::didConnect(WebSocketHandle* handle, bool fail, const WebKit::WebString& selectedProtocol, const WebKit::WebString& extensions) +void NewWebSocketChannelImpl::didConnect(WebSocketHandle* handle, bool fail, const blink::WebString& selectedProtocol, const blink::WebString& extensions) { LOG(Network, "NewWebSocketChannelImpl %p didConnect(%p, %d, %s, %s)", this, handle, fail, selectedProtocol.utf8().data(), extensions.utf8().data()); ASSERT(m_handle); @@ -391,13 +391,13 @@ void NewWebSocketChannelImpl::didConnect(WebSocketHandle* handle, bool fail, con m_client->didConnect(); } -void NewWebSocketChannelImpl::didFail(WebSocketHandle* handle, const WebKit::WebString& message) +void NewWebSocketChannelImpl::didFail(WebSocketHandle* handle, const blink::WebString& message) { LOG(Network, "NewWebSocketChannelImpl %p didFail(%p, %s)", this, handle, message.utf8().data()); // FIXME: Hande the failure correctly. // CloseEventCodeAbnormalClosure is the closing code for the closure // without sending or receiving a Close control frame. - didClose(handle, false, CloseEventCodeAbnormalClosure, WebKit::WebString()); + didClose(handle, false, CloseEventCodeAbnormalClosure, blink::WebString()); // |this| may be deleted. } @@ -452,7 +452,7 @@ void NewWebSocketChannelImpl::didReceiveData(WebSocketHandle* handle, bool fin, } } -void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, bool wasClean, unsigned short code, const WebKit::WebString& reason) +void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, bool wasClean, unsigned short code, const blink::WebString& reason) { // FIXME: Use |wasClean| appropriately. LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %d, %u, %s)", this, handle, wasClean, code, String(reason).utf8().data()); diff --git a/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.h b/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.h index a3cb53c..6497228 100644 --- a/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.h +++ b/third_party/WebKit/Source/modules/websockets/NewWebSocketChannelImpl.h @@ -55,7 +55,7 @@ namespace WebCore { class Document; // This class may replace MainThreadWebSocketChannel. -class NewWebSocketChannelImpl : public WebSocketChannel, public RefCounted<NewWebSocketChannelImpl>, public WebKit::WebSocketHandleClient, public ContextLifecycleObserver { +class NewWebSocketChannelImpl : public WebSocketChannel, public RefCounted<NewWebSocketChannelImpl>, public blink::WebSocketHandleClient, public ContextLifecycleObserver { WTF_MAKE_FAST_ALLOCATED; public: // You can specify the source file and the line number information @@ -122,11 +122,11 @@ private: Document* document(); // can be called only when m_identifier > 0. // WebSocketHandleClient functions. - virtual void didConnect(WebKit::WebSocketHandle*, bool fail, const WebKit::WebString& selectedProtocol, const WebKit::WebString& extensions) OVERRIDE; - virtual void didFail(WebKit::WebSocketHandle*, const WebKit::WebString& message) OVERRIDE; - virtual void didReceiveData(WebKit::WebSocketHandle*, bool fin, WebKit::WebSocketHandle::MessageType, const char* data, size_t /* size */) OVERRIDE; - virtual void didClose(WebKit::WebSocketHandle*, bool wasClean, unsigned short code, const WebKit::WebString& reason) OVERRIDE; - virtual void didReceiveFlowControl(WebKit::WebSocketHandle*, int64_t quota) OVERRIDE; + virtual void didConnect(blink::WebSocketHandle*, bool fail, const blink::WebString& selectedProtocol, const blink::WebString& extensions) OVERRIDE; + virtual void didFail(blink::WebSocketHandle*, const blink::WebString& message) OVERRIDE; + virtual void didReceiveData(blink::WebSocketHandle*, bool fin, blink::WebSocketHandle::MessageType, const char* data, size_t /* size */) OVERRIDE; + virtual void didClose(blink::WebSocketHandle*, bool wasClean, unsigned short code, const blink::WebString& reason) OVERRIDE; + virtual void didReceiveFlowControl(blink::WebSocketHandle*, int64_t quota) OVERRIDE; // Methods for BlobLoader. void didFinishLoadingBlob(PassRefPtr<ArrayBuffer>); @@ -142,7 +142,7 @@ private: // m_handle is a handle of the connection. // m_handle == 0 means this channel is closed. - OwnPtr<WebKit::WebSocketHandle> m_handle; + OwnPtr<blink::WebSocketHandle> m_handle; // m_client can be deleted while this channel is alive, but this class // expects that disconnect() is called before the deletion. diff --git a/third_party/WebKit/Source/modules/websockets/WebSocketHandshake.cpp b/third_party/WebKit/Source/modules/websockets/WebSocketHandshake.cpp index 7b4e1b2..830e8df 100644 --- a/third_party/WebKit/Source/modules/websockets/WebSocketHandshake.cpp +++ b/third_party/WebKit/Source/modules/websockets/WebSocketHandshake.cpp @@ -146,7 +146,7 @@ WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, WebSocketHandshake::~WebSocketHandshake() { - WebKit::Platform::current()->histogramEnumeration("WebCore.WebSocket.HandshakeResult", m_mode, WebSocketHandshake::ModeMax); + blink::Platform::current()->histogramEnumeration("WebCore.WebSocket.HandshakeResult", m_mode, WebSocketHandshake::ModeMax); } const KURL& WebSocketHandshake::url() const diff --git a/third_party/WebKit/Source/modules/websockets/WebSocketPerMessageDeflate.cpp b/third_party/WebKit/Source/modules/websockets/WebSocketPerMessageDeflate.cpp index ae298e6..117e627 100644 --- a/third_party/WebKit/Source/modules/websockets/WebSocketPerMessageDeflate.cpp +++ b/third_party/WebKit/Source/modules/websockets/WebSocketPerMessageDeflate.cpp @@ -137,7 +137,7 @@ bool CompressionMessageExtensionProcessor::processResponse(const HashMap<String, m_failureReason = "Received an unexpected permessage-deflate extension parameter"; return false; } - WebKit::Platform::current()->histogramEnumeration("WebCore.WebSocket.PerMessageDeflateContextTakeOverMode", mode, WebSocketDeflater::ContextTakeOverModeMax); + blink::Platform::current()->histogramEnumeration("WebCore.WebSocket.PerMessageDeflateContextTakeOverMode", mode, WebSocketDeflater::ContextTakeOverModeMax); m_compress.enable(windowBits, mode); // Since we don't request server_no_context_takeover and server_max_window_bits, they should be ignored. return true; diff --git a/third_party/WebKit/Source/platform/AsyncFileSystemCallbacks.h b/third_party/WebKit/Source/platform/AsyncFileSystemCallbacks.h index aae42e8..73d4b4d 100644 --- a/third_party/WebKit/Source/platform/AsyncFileSystemCallbacks.h +++ b/third_party/WebKit/Source/platform/AsyncFileSystemCallbacks.h @@ -68,7 +68,7 @@ public: virtual void didReadDirectoryEntries(bool hasMore) { ASSERT_NOT_REACHED(); } // Called when an AsyncFileWrter has been created successfully. - virtual void didCreateFileWriter(PassOwnPtr<WebKit::WebFileWriter>, long long length) { ASSERT_NOT_REACHED(); } + virtual void didCreateFileWriter(PassOwnPtr<blink::WebFileWriter>, long long length) { ASSERT_NOT_REACHED(); } // Called when there was an error. virtual void didFail(int code) = 0; diff --git a/third_party/WebKit/Source/platform/EventTracer.cpp b/third_party/WebKit/Source/platform/EventTracer.cpp index 19042d3..a4d9ee5 100644 --- a/third_party/WebKit/Source/platform/EventTracer.cpp +++ b/third_party/WebKit/Source/platform/EventTracer.cpp @@ -37,7 +37,7 @@ namespace WebCore { -COMPILE_ASSERT(sizeof(WebKit::Platform::TraceEventHandle) == sizeof(TraceEvent::TraceEventHandle), TraceEventHandle_types_must_be_compatible); +COMPILE_ASSERT(sizeof(blink::Platform::TraceEventHandle) == sizeof(TraceEvent::TraceEventHandle), TraceEventHandle_types_must_be_compatible); // The dummy variable is needed to avoid a crash when someone updates the state variables // before EventTracer::initialize() is called. @@ -46,33 +46,33 @@ long* traceSamplingState[3] = {&dummyTraceSamplingState, &dummyTraceSamplingStat void EventTracer::initialize() { - traceSamplingState[0] = WebKit::Platform::current()->getTraceSamplingState(0); + traceSamplingState[0] = blink::Platform::current()->getTraceSamplingState(0); // FIXME: traceSamplingState[0] can be 0 in split-dll build. http://crbug.com/256965 if (!traceSamplingState[0]) traceSamplingState[0] = &dummyTraceSamplingState; - traceSamplingState[1] = WebKit::Platform::current()->getTraceSamplingState(1); + traceSamplingState[1] = blink::Platform::current()->getTraceSamplingState(1); if (!traceSamplingState[1]) traceSamplingState[1] = &dummyTraceSamplingState; - traceSamplingState[2] = WebKit::Platform::current()->getTraceSamplingState(2); + traceSamplingState[2] = blink::Platform::current()->getTraceSamplingState(2); if (!traceSamplingState[2]) traceSamplingState[2] = &dummyTraceSamplingState; } const unsigned char* EventTracer::getTraceCategoryEnabledFlag(const char* categoryName) { - return WebKit::Platform::current()->getTraceCategoryEnabledFlag(categoryName); + return blink::Platform::current()->getTraceCategoryEnabledFlag(categoryName); } TraceEvent::TraceEventHandle EventTracer::addTraceEvent(char phase, const unsigned char* categoryEnabledFlag, const char* name, unsigned long long id, int numArgs, const char** argNames, const unsigned char* argTypes, const unsigned long long* argValues, unsigned char flags) { - return WebKit::Platform::current()->addTraceEvent(phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, flags); + return blink::Platform::current()->addTraceEvent(phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, flags); } void EventTracer::updateTraceEventDuration(TraceEvent::TraceEventHandle handle) { - WebKit::Platform::current()->updateTraceEventDuration(handle); + blink::Platform::current()->updateTraceEventDuration(handle); } } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/FileMetadata.cpp b/third_party/WebKit/Source/platform/FileMetadata.cpp index 8ed8ca6..bca28be 100644 --- a/third_party/WebKit/Source/platform/FileMetadata.cpp +++ b/third_party/WebKit/Source/platform/FileMetadata.cpp @@ -57,8 +57,8 @@ bool getFileModificationTime(const String& path, time_t& result) bool getFileMetadata(const String& path, FileMetadata& metadata) { - WebKit::WebFileInfo webFileInfo; - if (!WebKit::Platform::current()->fileUtilities()->getFileInfo(path, webFileInfo)) + blink::WebFileInfo webFileInfo; + if (!blink::Platform::current()->fileUtilities()->getFileInfo(path, webFileInfo)) return false; metadata.modificationTime = webFileInfo.modificationTime; metadata.length = webFileInfo.length; @@ -68,7 +68,7 @@ bool getFileMetadata(const String& path, FileMetadata& metadata) String directoryName(const String& path) { - return WebKit::Platform::current()->fileUtilities()->directoryName(path); + return blink::Platform::current()->fileUtilities()->directoryName(path); } } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/HostWindow.h b/third_party/WebKit/Source/platform/HostWindow.h index 77319ba..a2d64c6 100644 --- a/third_party/WebKit/Source/platform/HostWindow.h +++ b/third_party/WebKit/Source/platform/HostWindow.h @@ -29,7 +29,7 @@ #include "wtf/FastAllocBase.h" #include "wtf/Noncopyable.h" -namespace WebKit { +namespace blink { struct WebScreenInfo; } @@ -58,7 +58,7 @@ public: virtual IntPoint screenToRootView(const IntPoint&) const = 0; virtual IntRect rootViewToScreen(const IntRect&) const = 0; - virtual WebKit::WebScreenInfo screenInfo() const = 0; + virtual blink::WebScreenInfo screenInfo() const = 0; virtual void scheduleAnimation() = 0; }; diff --git a/third_party/WebKit/Source/platform/Language.cpp b/third_party/WebKit/Source/platform/Language.cpp index 5605617..535214c 100644 --- a/third_party/WebKit/Source/platform/Language.cpp +++ b/third_party/WebKit/Source/platform/Language.cpp @@ -35,7 +35,7 @@ static String platformLanguage() { DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ()); if (computedDefaultLanguage.isEmpty()) { - computedDefaultLanguage.append(WebKit::Platform::current()->defaultLocale()); + computedDefaultLanguage.append(blink::Platform::current()->defaultLocale()); ASSERT(!computedDefaultLanguage.isEmpty()); } return computedDefaultLanguage; diff --git a/third_party/WebKit/Source/platform/LinkHash.cpp b/third_party/WebKit/Source/platform/LinkHash.cpp index 844acfa..66b31d7 100644 --- a/third_party/WebKit/Source/platform/LinkHash.cpp +++ b/third_party/WebKit/Source/platform/LinkHash.cpp @@ -57,7 +57,7 @@ LinkHash visitedLinkHash(const KURL& base, const AtomicString& relative) url_canon::RawCanonOutput<2048> buffer; if (!resolveRelative(base, relative.string(), &buffer)) return 0; - return WebKit::Platform::current()->visitedLinkHash(buffer.data(), buffer.length()); + return blink::Platform::current()->visitedLinkHash(buffer.data(), buffer.length()); } } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp b/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp index 52b1c13..df2428c 100644 --- a/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp +++ b/third_party/WebKit/Source/platform/MIMETypeRegistry.cpp @@ -41,13 +41,13 @@ namespace WebCore { String MIMETypeRegistry::getMIMETypeForExtension(const String &ext) { - return WebKit::Platform::current()->mimeRegistry()->mimeTypeForExtension(ext); + return blink::Platform::current()->mimeRegistry()->mimeTypeForExtension(ext); } String MIMETypeRegistry::getWellKnownMIMETypeForExtension(const String &ext) { // This method must be thread safe and should not consult the OS/registry. - return WebKit::Platform::current()->mimeRegistry()->wellKnownMimeTypeForExtension(ext); + return blink::Platform::current()->mimeRegistry()->wellKnownMimeTypeForExtension(ext); } String MIMETypeRegistry::getMIMETypeForPath(const String& path) @@ -69,8 +69,8 @@ String MIMETypeRegistry::getMIMETypeForPath(const String& path) bool MIMETypeRegistry::isSupportedImageMIMEType(const String& mimeType) { - return WebKit::Platform::current()->mimeRegistry()->supportsImageMIMEType(mimeType) - != WebKit::WebMimeRegistry::IsNotSupported; + return blink::Platform::current()->mimeRegistry()->supportsImageMIMEType(mimeType) + != blink::WebMimeRegistry::IsNotSupported; } bool MIMETypeRegistry::isSupportedImageResourceMIMEType(const String& mimeType) @@ -89,20 +89,20 @@ bool MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(const String& mimeTyp bool MIMETypeRegistry::isSupportedJavaScriptMIMEType(const String& mimeType) { - return WebKit::Platform::current()->mimeRegistry()->supportsJavaScriptMIMEType(mimeType) - != WebKit::WebMimeRegistry::IsNotSupported; + return blink::Platform::current()->mimeRegistry()->supportsJavaScriptMIMEType(mimeType) + != blink::WebMimeRegistry::IsNotSupported; } bool MIMETypeRegistry::isSupportedNonImageMIMEType(const String& mimeType) { - return WebKit::Platform::current()->mimeRegistry()->supportsNonImageMIMEType(mimeType) - != WebKit::WebMimeRegistry::IsNotSupported; + return blink::Platform::current()->mimeRegistry()->supportsNonImageMIMEType(mimeType) + != blink::WebMimeRegistry::IsNotSupported; } bool MIMETypeRegistry::isSupportedMediaSourceMIMEType(const String& mimeType, const String& codecs) { return !mimeType.isEmpty() - && WebKit::Platform::current()->mimeRegistry()->supportsMediaSourceMIMEType(mimeType, codecs); + && blink::Platform::current()->mimeRegistry()->supportsMediaSourceMIMEType(mimeType, codecs); } bool MIMETypeRegistry::isJavaAppletMIMEType(const String& mimeType) diff --git a/third_party/WebKit/Source/platform/PlatformScreen.cpp b/third_party/WebKit/Source/platform/PlatformScreen.cpp index df049b8..64d7f6e 100644 --- a/third_party/WebKit/Source/platform/PlatformScreen.cpp +++ b/third_party/WebKit/Source/platform/PlatformScreen.cpp @@ -91,8 +91,8 @@ FloatRect screenAvailableRect(Widget* widget) void screenColorProfile(ColorProfile& toProfile) { - WebKit::WebVector<char> profile; - WebKit::Platform::current()->screenColorProfile(&profile); + blink::WebVector<char> profile; + blink::Platform::current()->screenColorProfile(&profile); toProfile.append(profile.data(), profile.size()); } diff --git a/third_party/WebKit/Source/platform/Prerender.cpp b/third_party/WebKit/Source/platform/Prerender.cpp index f23a01b..be32567 100644 --- a/third_party/WebKit/Source/platform/Prerender.cpp +++ b/third_party/WebKit/Source/platform/Prerender.cpp @@ -62,26 +62,26 @@ void Prerender::removeClient() void Prerender::add() { - WebKit::WebPrerenderingSupport* platform = WebKit::WebPrerenderingSupport::current(); + blink::WebPrerenderingSupport* platform = blink::WebPrerenderingSupport::current(); if (!platform) return; - platform->add(WebKit::WebPrerender(this)); + platform->add(blink::WebPrerender(this)); } void Prerender::cancel() { - WebKit::WebPrerenderingSupport* platform = WebKit::WebPrerenderingSupport::current(); + blink::WebPrerenderingSupport* platform = blink::WebPrerenderingSupport::current(); if (!platform) return; - platform->cancel(WebKit::WebPrerender(this)); + platform->cancel(blink::WebPrerender(this)); } void Prerender::abandon() { - WebKit::WebPrerenderingSupport* platform = WebKit::WebPrerenderingSupport::current(); + blink::WebPrerenderingSupport* platform = blink::WebPrerenderingSupport::current(); if (!platform) return; - platform->abandon(WebKit::WebPrerender(this)); + platform->abandon(blink::WebPrerender(this)); } void Prerender::didStartPrerender() diff --git a/third_party/WebKit/Source/platform/Prerender.h b/third_party/WebKit/Source/platform/Prerender.h index 028c686..88b04eb 100644 --- a/third_party/WebKit/Source/platform/Prerender.h +++ b/third_party/WebKit/Source/platform/Prerender.h @@ -42,7 +42,7 @@ #include "wtf/RefPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebPrerender; } diff --git a/third_party/WebKit/Source/platform/PurgeableBuffer.cpp b/third_party/WebKit/Source/platform/PurgeableBuffer.cpp index 2b73912..f19f51a 100644 --- a/third_party/WebKit/Source/platform/PurgeableBuffer.cpp +++ b/third_party/WebKit/Source/platform/PurgeableBuffer.cpp @@ -43,7 +43,7 @@ PassOwnPtr<PurgeableBuffer> PurgeableBuffer::create(const char* data, size_t siz if (size < minimumSize) return nullptr; - OwnPtr<WebKit::WebDiscardableMemory> memory = adoptPtr(WebKit::Platform::current()->allocateAndLockDiscardableMemory(size)); + OwnPtr<blink::WebDiscardableMemory> memory = adoptPtr(blink::Platform::current()->allocateAndLockDiscardableMemory(size)); if (!memory) return nullptr; @@ -86,7 +86,7 @@ void PurgeableBuffer::unlock() m_state = Unlocked; } -PurgeableBuffer::PurgeableBuffer(PassOwnPtr<WebKit::WebDiscardableMemory> memory, const char* data, size_t size) +PurgeableBuffer::PurgeableBuffer(PassOwnPtr<blink::WebDiscardableMemory> memory, const char* data, size_t size) : m_memory(memory) , m_size(size) , m_state(Locked) diff --git a/third_party/WebKit/Source/platform/PurgeableBuffer.h b/third_party/WebKit/Source/platform/PurgeableBuffer.h index 8c5fb13..7d05873 100644 --- a/third_party/WebKit/Source/platform/PurgeableBuffer.h +++ b/third_party/WebKit/Source/platform/PurgeableBuffer.h @@ -31,7 +31,7 @@ #include "wtf/PassOwnPtr.h" #include "platform/PlatformExport.h" -namespace WebKit { +namespace blink { class WebDiscardableMemory; } @@ -60,9 +60,9 @@ private: Purged }; - PurgeableBuffer(PassOwnPtr<WebKit::WebDiscardableMemory>, const char* data, size_t); + PurgeableBuffer(PassOwnPtr<blink::WebDiscardableMemory>, const char* data, size_t); - OwnPtr<WebKit::WebDiscardableMemory> m_memory; + OwnPtr<blink::WebDiscardableMemory> m_memory; size_t m_size; State m_state; }; diff --git a/third_party/WebKit/Source/platform/SSLKeyGenerator.cpp b/third_party/WebKit/Source/platform/SSLKeyGenerator.cpp index d3fedba..573e694 100644 --- a/third_party/WebKit/Source/platform/SSLKeyGenerator.cpp +++ b/third_party/WebKit/Source/platform/SSLKeyGenerator.cpp @@ -42,13 +42,13 @@ namespace WebCore { void getSupportedKeySizes(Locale& locale, Vector<String>& sizes) { sizes.resize(2); - sizes[0] = locale.queryString(WebKit::WebLocalizedString::KeygenMenuHighGradeKeySize); - sizes[1] = locale.queryString(WebKit::WebLocalizedString::KeygenMenuMediumGradeKeySize); + sizes[0] = locale.queryString(blink::WebLocalizedString::KeygenMenuHighGradeKeySize); + sizes[1] = locale.queryString(blink::WebLocalizedString::KeygenMenuMediumGradeKeySize); } String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const KURL& url) { - return WebKit::Platform::current()->signedPublicKeyAndChallengeString(keySizeIndex, WebKit::WebString(challengeString), WebKit::WebURL(url)); + return blink::Platform::current()->signedPublicKeyAndChallengeString(keySizeIndex, blink::WebString(challengeString), blink::WebURL(url)); } } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/SharedTimer.cpp b/third_party/WebKit/Source/platform/SharedTimer.cpp index e30d5f9..8fa3285 100644 --- a/third_party/WebKit/Source/platform/SharedTimer.cpp +++ b/third_party/WebKit/Source/platform/SharedTimer.cpp @@ -32,17 +32,17 @@ namespace WebCore { void setSharedTimerFiredFunction(void (*f)()) { - WebKit::Platform::current()->setSharedTimerFiredFunction(f); + blink::Platform::current()->setSharedTimerFiredFunction(f); } void setSharedTimerFireInterval(double fireTime) { - WebKit::Platform::current()->setSharedTimerFireInterval(fireTime); + blink::Platform::current()->setSharedTimerFireInterval(fireTime); } void stopSharedTimer() { - WebKit::Platform::current()->stopSharedTimer(); + blink::Platform::current()->stopSharedTimer(); } } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/Task.h b/third_party/WebKit/Source/platform/Task.h index 8ef2339..67a9786 100644 --- a/third_party/WebKit/Source/platform/Task.h +++ b/third_party/WebKit/Source/platform/Task.h @@ -36,7 +36,7 @@ namespace WebCore { -class Task : public WebKit::WebThread::Task { +class Task : public blink::WebThread::Task { public: explicit Task(const Closure& closure) : m_closure(closure) diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp index 7b89672..0ed211a 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp @@ -100,7 +100,7 @@ void HRTFDatabaseLoader::loadAsynchronously() if (!m_hrtfDatabase && !m_databaseLoaderThread) { // Start the asynchronous database loading process. - m_databaseLoaderThread = adoptPtr(WebKit::Platform::current()->createThread("HRTF database loader")); + m_databaseLoaderThread = adoptPtr(blink::Platform::current()->createThread("HRTF database loader")); m_databaseLoaderThread->postTask(new Task(WTF::bind(&HRTFDatabaseLoader::load, this))); } } diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h index 9b4dea9..43db086 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h +++ b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h @@ -83,7 +83,7 @@ private: // Holding a m_threadLock is required when accessing m_databaseLoaderThread since we access it from multiple threads. Mutex m_threadLock; - OwnPtr<WebKit::WebThread> m_databaseLoaderThread; + OwnPtr<blink::WebThread> m_databaseLoaderThread; float m_databaseSampleRate; }; diff --git a/third_party/WebKit/Source/platform/audio/chromium/AudioBusChromium.cpp b/third_party/WebKit/Source/platform/audio/chromium/AudioBusChromium.cpp index e6d85f2..8c458d2 100644 --- a/third_party/WebKit/Source/platform/audio/chromium/AudioBusChromium.cpp +++ b/third_party/WebKit/Source/platform/audio/chromium/AudioBusChromium.cpp @@ -36,15 +36,15 @@ namespace WebCore { PassRefPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double sampleRate) { - WebKit::WebAudioBus webAudioBus; - if (WebKit::Platform::current()->loadAudioResource(&webAudioBus, data, size, sampleRate)) + blink::WebAudioBus webAudioBus; + if (blink::Platform::current()->loadAudioResource(&webAudioBus, data, size, sampleRate)) return webAudioBus.release(); return 0; } PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float sampleRate) { - const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name); + const blink::WebData& resource = blink::Platform::current()->loadResource(name); if (resource.isEmpty()) return 0; diff --git a/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.cpp b/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.cpp index 82eaf5d..22b6830 100644 --- a/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.cpp +++ b/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.cpp @@ -59,7 +59,7 @@ AudioDestinationChromium::AudioDestinationChromium(AudioIOCallback& callback, co , m_isPlaying(false) { // Use the optimal buffer size recommended by the audio backend. - m_callbackBufferSize = WebKit::Platform::current()->audioHardwareBufferSize(); + m_callbackBufferSize = blink::Platform::current()->audioHardwareBufferSize(); #if OS(ANDROID) // The optimum low-latency hardware buffer size is usually too small on Android for WebAudio to @@ -82,7 +82,7 @@ AudioDestinationChromium::AudioDestinationChromium(AudioIOCallback& callback, co if (m_callbackBufferSize + renderBufferSize > fifoSize) return; - m_audioDevice = adoptPtr(WebKit::Platform::current()->createAudioDevice(m_callbackBufferSize, numberOfInputChannels, numberOfOutputChannels, sampleRate, this, inputDeviceId)); + m_audioDevice = adoptPtr(blink::Platform::current()->createAudioDevice(m_callbackBufferSize, numberOfInputChannels, numberOfOutputChannels, sampleRate, this, inputDeviceId)); ASSERT(m_audioDevice); // Create a FIFO to handle the possibility of the callback size @@ -127,15 +127,15 @@ void AudioDestinationChromium::stop() float AudioDestination::hardwareSampleRate() { - return static_cast<float>(WebKit::Platform::current()->audioHardwareSampleRate()); + return static_cast<float>(blink::Platform::current()->audioHardwareSampleRate()); } unsigned long AudioDestination::maxChannelCount() { - return static_cast<float>(WebKit::Platform::current()->audioHardwareOutputChannels()); + return static_cast<float>(blink::Platform::current()->audioHardwareOutputChannels()); } -void AudioDestinationChromium::render(const WebKit::WebVector<float*>& sourceData, const WebKit::WebVector<float*>& audioData, size_t numberOfFrames) +void AudioDestinationChromium::render(const blink::WebVector<float*>& sourceData, const blink::WebVector<float*>& audioData, size_t numberOfFrames) { bool isNumberOfChannelsGood = audioData.size() == m_numberOfOutputChannels; if (!isNumberOfChannelsGood) { diff --git a/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.h b/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.h index cda0aab..0af3096 100644 --- a/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.h +++ b/third_party/WebKit/Source/platform/audio/chromium/AudioDestinationChromium.h @@ -44,7 +44,7 @@ class AudioPullFIFO; // An AudioDestination using Chromium's audio system -class PLATFORM_EXPORT AudioDestinationChromium : public AudioDestination, public WebKit::WebAudioDevice::RenderCallback, public AudioSourceProvider { +class PLATFORM_EXPORT AudioDestinationChromium : public AudioDestination, public blink::WebAudioDevice::RenderCallback, public AudioSourceProvider { WTF_MAKE_NONCOPYABLE(AudioDestinationChromium); public: AudioDestinationChromium(AudioIOCallback&, const String& inputDeviceId, unsigned numberOfInputChannels, unsigned numberOfOutputChannels, float sampleRate); @@ -56,8 +56,8 @@ public: float sampleRate() const { return m_sampleRate; } - // WebKit::WebAudioDevice::RenderCallback - virtual void render(const WebKit::WebVector<float*>& sourceData, const WebKit::WebVector<float*>& audioData, size_t numberOfFrames); + // blink::WebAudioDevice::RenderCallback + virtual void render(const blink::WebVector<float*>& sourceData, const blink::WebVector<float*>& audioData, size_t numberOfFrames); // WebCore::AudioSourceProvider virtual void provideInput(AudioBus*, size_t framesToProcess); @@ -69,7 +69,7 @@ private: RefPtr<AudioBus> m_renderBus; float m_sampleRate; bool m_isPlaying; - OwnPtr<WebKit::WebAudioDevice> m_audioDevice; + OwnPtr<blink::WebAudioDevice> m_audioDevice; size_t m_callbackBufferSize; OwnPtr<AudioFIFO> m_inputFifo; diff --git a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp index 19aaabd..64b8099 100644 --- a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp @@ -49,9 +49,9 @@ #include "wtf/text/StringHash.h" #include "wtf/text/WTFString.h" -using WebKit::WebBlobData; -using WebKit::WebBlobRegistry; -using WebKit::WebThreadSafeData; +using blink::WebBlobData; +using blink::WebBlobRegistry; +using blink::WebThreadSafeData; using WTF::ThreadSpecific; namespace WebCore { @@ -104,7 +104,7 @@ public: static WebBlobRegistry* blobRegistry() { - return WebKit::Platform::current()->blobRegistry(); + return blink::Platform::current()->blobRegistry(); } typedef HashMap<String, RefPtr<SecurityOrigin> > BlobURLOriginMap; @@ -135,7 +135,7 @@ static void removeFromOriginMap(const KURL& url) void BlobRegistry::registerBlobData(const String& uuid, PassOwnPtr<BlobData> data) { - blobRegistry()->registerBlobData(uuid, WebKit::WebBlobData(data)); + blobRegistry()->registerBlobData(uuid, blink::WebBlobData(data)); } void BlobRegistry::addBlobDataRef(const String& uuid) diff --git a/third_party/WebKit/Source/platform/blob/BlobRegistry.h b/third_party/WebKit/Source/platform/blob/BlobRegistry.h index da2e6bf..c55a0f0 100644 --- a/third_party/WebKit/Source/platform/blob/BlobRegistry.h +++ b/third_party/WebKit/Source/platform/blob/BlobRegistry.h @@ -44,7 +44,7 @@ class KURL; class RawData; class SecurityOrigin; -// A bridging class for calling WebKit::WebBlobRegistry methods. +// A bridging class for calling blink::WebBlobRegistry methods. class PLATFORM_EXPORT BlobRegistry { public: // Methods for controlling Blobs. diff --git a/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.cpp b/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.cpp index 4655a38..b27a50c 100644 --- a/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.cpp +++ b/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.cpp @@ -48,13 +48,13 @@ bool ContentDecryptionModule::supportsKeySystem(const String& keySystem) PassOwnPtr<ContentDecryptionModule> ContentDecryptionModule::create(const String& keySystem) { ASSERT(!keySystem.isEmpty()); - OwnPtr<WebKit::WebContentDecryptionModule> cdm = adoptPtr(WebKit::Platform::current()->createContentDecryptionModule(keySystem)); + OwnPtr<blink::WebContentDecryptionModule> cdm = adoptPtr(blink::Platform::current()->createContentDecryptionModule(keySystem)); if (!cdm) return nullptr; return adoptPtr(new ContentDecryptionModule(cdm.release())); } -ContentDecryptionModule::ContentDecryptionModule(PassOwnPtr<WebKit::WebContentDecryptionModule> cdm) +ContentDecryptionModule::ContentDecryptionModule(PassOwnPtr<blink::WebContentDecryptionModule> cdm) : m_cdm(cdm) { ASSERT(m_cdm); diff --git a/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.h b/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.h index a4136c4..0d23318 100644 --- a/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.h +++ b/third_party/WebKit/Source/platform/drm/ContentDecryptionModule.h @@ -48,7 +48,7 @@ public: static bool supportsKeySystem(const String&); static PassOwnPtr<ContentDecryptionModule> create(const String& keySystem); - ContentDecryptionModule(PassOwnPtr<WebKit::WebContentDecryptionModule>); + ContentDecryptionModule(PassOwnPtr<blink::WebContentDecryptionModule>); ~ContentDecryptionModule(); // ContentDecryptionModule @@ -56,7 +56,7 @@ public: PassOwnPtr<ContentDecryptionModuleSession> createSession(ContentDecryptionModuleSessionClient*); private: - OwnPtr<WebKit::WebContentDecryptionModule> m_cdm; + OwnPtr<blink::WebContentDecryptionModule> m_cdm; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.cpp b/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.cpp index a639bf7..0daabfb 100644 --- a/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.cpp +++ b/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.cpp @@ -39,7 +39,7 @@ namespace WebCore { -ContentDecryptionModuleSession::ContentDecryptionModuleSession(WebKit::WebContentDecryptionModule* contentDecryptionModule, ContentDecryptionModuleSessionClient* client) +ContentDecryptionModuleSession::ContentDecryptionModuleSession(blink::WebContentDecryptionModule* contentDecryptionModule, ContentDecryptionModuleSessionClient* client) : m_client(client) { m_session = adoptPtr(contentDecryptionModule->createSession(this)); @@ -80,7 +80,7 @@ void ContentDecryptionModuleSession::keyError(MediaKeyErrorCode errorCode, unsig m_client->keyError(static_cast<ContentDecryptionModuleSessionClient::MediaKeyErrorCode>(errorCode), systemCode); } -void ContentDecryptionModuleSession::keyMessage(const unsigned char* message, size_t messageLength, const WebKit::WebURL& destinationURL) +void ContentDecryptionModuleSession::keyMessage(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) { m_client->keyMessage(message, messageLength, destinationURL); } diff --git a/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.h b/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.h index ce8a7e8..ef58745 100644 --- a/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.h +++ b/third_party/WebKit/Source/platform/drm/ContentDecryptionModuleSession.h @@ -37,7 +37,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebContentDecryptionModule; } @@ -57,12 +57,12 @@ public: virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) = 0; }; -class PLATFORM_EXPORT ContentDecryptionModuleSession : private WebKit::WebContentDecryptionModuleSession::Client { +class PLATFORM_EXPORT ContentDecryptionModuleSession : private blink::WebContentDecryptionModuleSession::Client { WTF_MAKE_NONCOPYABLE(ContentDecryptionModuleSession); public: static PassOwnPtr<ContentDecryptionModuleSession> create(ContentDecryptionModuleSessionClient*); - ContentDecryptionModuleSession(WebKit::WebContentDecryptionModule*, ContentDecryptionModuleSessionClient*); + ContentDecryptionModuleSession(blink::WebContentDecryptionModule*, ContentDecryptionModuleSessionClient*); ~ContentDecryptionModuleSession(); String sessionId() const; @@ -71,12 +71,12 @@ public: void close(); private: - // WebKit::WebContentDecryptionModuleSession::Client + // blink::WebContentDecryptionModuleSession::Client virtual void keyAdded() OVERRIDE; virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; - virtual void keyMessage(const unsigned char* message, size_t messageLength, const WebKit::WebURL& destinationURL) OVERRIDE; + virtual void keyMessage(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) OVERRIDE; - OwnPtr<WebKit::WebContentDecryptionModuleSession> m_session; + OwnPtr<blink::WebContentDecryptionModuleSession> m_session; ContentDecryptionModuleSessionClient* m_client; }; diff --git a/third_party/WebKit/Source/platform/exported/Platform.cpp b/third_party/WebKit/Source/platform/exported/Platform.cpp index bf87d3e..7973183 100644 --- a/third_party/WebKit/Source/platform/exported/Platform.cpp +++ b/third_party/WebKit/Source/platform/exported/Platform.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "public/platform/Platform.h" -namespace WebKit { +namespace blink { static Platform* s_platform = 0; @@ -50,4 +50,4 @@ Platform* Platform::current() return s_platform; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp index 00d60c3..f0a5eb6 100644 --- a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp +++ b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.cpp @@ -29,7 +29,7 @@ #include "public/platform/WebGestureCurve.h" #include "public/platform/WebGestureCurveTarget.h" -namespace WebKit { +namespace blink { PassOwnPtr<WebActiveGestureAnimation> WebActiveGestureAnimation::createAtAnimationStart(PassOwnPtr<WebGestureCurve> curve, WebGestureCurveTarget* target) { @@ -64,4 +64,4 @@ bool WebActiveGestureAnimation::animate(double time) return m_curve->apply(time - m_startTime, m_target); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h index cd8c04c..289c6aa8 100644 --- a/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h +++ b/third_party/WebKit/Source/platform/exported/WebActiveGestureAnimation.h @@ -31,7 +31,7 @@ #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { class WebGestureCurve; class WebGestureCurveTarget; @@ -59,6 +59,6 @@ private: WebGestureCurveTarget* m_target; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp index c5a55c7..84f8b1f 100644 --- a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp +++ b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp @@ -41,7 +41,7 @@ class AudioBus : public ThreadSafeRefCounted<AudioBus> { using namespace WebCore; -namespace WebKit { +namespace blink { class WebAudioBusPrivate : public AudioBus { }; @@ -148,4 +148,4 @@ PassRefPtr<AudioBus> WebAudioBus::release() #endif } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp b/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp index ef2f70b..1556633 100644 --- a/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp +++ b/third_party/WebKit/Source/platform/exported/WebAudioDevice.cpp @@ -25,7 +25,7 @@ #include "config.h" #include "public/platform/WebAudioDevice.h" -namespace WebKit { +namespace blink { void WebAudioDevice::RenderCallback::render(const WebVector<float*>& sourceData, const WebVector<float*>& destinationData, size_t numberOfFrames) { @@ -35,4 +35,4 @@ WebAudioDevice::RenderCallback::~RenderCallback() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebBlobData.cpp b/third_party/WebKit/Source/platform/exported/WebBlobData.cpp index fe6d90a..f7c5ebe 100644 --- a/third_party/WebKit/Source/platform/exported/WebBlobData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebBlobData.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebBlobData::WebBlobData() { @@ -119,4 +119,4 @@ WebBlobData::operator PassOwnPtr<BlobData>() return m_private.release(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebCString.cpp b/third_party/WebKit/Source/platform/exported/WebCString.cpp index a48abb4..1d22b03 100644 --- a/third_party/WebKit/Source/platform/exported/WebCString.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCString.cpp @@ -36,7 +36,7 @@ #include "wtf/text/CString.h" #include <string.h> -namespace WebKit { +namespace blink { int WebCString::compare(const WebCString& other) const { @@ -105,4 +105,4 @@ void WebCString::assign(WTF::CStringBuffer* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebCommon.cpp b/third_party/WebKit/Source/platform/exported/WebCommon.cpp index 227d11b..b6d4096 100644 --- a/third_party/WebKit/Source/platform/exported/WebCommon.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCommon.cpp @@ -33,7 +33,7 @@ #include "wtf/Assertions.h" -namespace WebKit { +namespace blink { void failedAssertion(const char* file, int line, const char* function, const char* assertion) { @@ -41,4 +41,4 @@ void failedAssertion(const char* file, int line, const char* function, const cha CRASH(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp index 9827c41..557abf9 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModule.cpp @@ -25,10 +25,10 @@ #include "config.h" #include "public/platform/WebContentDecryptionModule.h" -namespace WebKit { +namespace blink { WebContentDecryptionModule::~WebContentDecryptionModule() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp index 3d18f16..5ec6afe 100644 --- a/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp +++ b/third_party/WebKit/Source/platform/exported/WebContentDecryptionModuleSession.cpp @@ -25,7 +25,7 @@ #include "config.h" #include "public/platform/WebContentDecryptionModuleSession.h" -namespace WebKit { +namespace blink { WebContentDecryptionModuleSession::~WebContentDecryptionModuleSession() { @@ -35,4 +35,4 @@ WebContentDecryptionModuleSession::Client::~Client() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp index 8125487..f6553e6 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp @@ -35,7 +35,7 @@ #include "wtf/OwnPtr.h" #include "wtf/ThreadSafeRefCounted.h" -namespace WebKit { +namespace blink { class WebCryptoAlgorithmPrivate : public ThreadSafeRefCounted<WebCryptoAlgorithmPrivate> { public: @@ -157,4 +157,4 @@ void WebCryptoAlgorithm::reset() m_private.reset(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp b/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp index 7d0646c..2f63e9c 100644 --- a/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCryptoKey.cpp @@ -35,7 +35,7 @@ #include "wtf/OwnPtr.h" #include "wtf/ThreadSafeRefCounted.h" -namespace WebKit { +namespace blink { class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> { public: @@ -113,4 +113,4 @@ void WebCryptoKey::reset() m_private.reset(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebData.cpp b/third_party/WebKit/Source/platform/exported/WebData.cpp index 0861878..b849c907 100644 --- a/third_party/WebKit/Source/platform/exported/WebData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebData.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebData::reset() { @@ -82,4 +82,4 @@ WebData::operator PassRefPtr<SharedBuffer>() const return PassRefPtr<SharedBuffer>(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp b/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp index 8d2595d..6b8a26d 100644 --- a/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDeviceMotionData.cpp @@ -33,7 +33,7 @@ #include <string.h> -namespace WebKit { +namespace blink { WebDeviceMotionData::WebDeviceMotionData() { @@ -44,4 +44,4 @@ WebDeviceMotionData::WebDeviceMotionData() memset(this, 0, sizeof(*this)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp b/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp index 2e9817f..0008745 100644 --- a/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebDeviceOrientationData.cpp @@ -33,7 +33,7 @@ #include <string.h> -namespace WebKit { +namespace blink { WebDeviceOrientationData::WebDeviceOrientationData() { @@ -44,4 +44,4 @@ WebDeviceOrientationData::WebDeviceOrientationData() memset(this, 0, sizeof(*this)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp index 82a4463..b57a84f 100644 --- a/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebFileSystemCallbacksPrivate : public RefCounted<WebFileSystemCallbacksPrivate> { public: @@ -155,4 +155,4 @@ bool WebFileSystemCallbacks::shouldBlockUntilCompletion() const return m_private->callbacks()->shouldBlockUntilCompletion(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp b/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp index 0372ec1..454d317 100644 --- a/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFilterKeyframe.cpp @@ -27,7 +27,7 @@ #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { WebFilterKeyframe::WebFilterKeyframe(double time, PassOwnPtr<WebFilterOperations> value) : m_time(time) @@ -40,4 +40,4 @@ WebFilterKeyframe::~WebFilterKeyframe() m_value.reset(0); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebFloatQuad.cpp b/third_party/WebKit/Source/platform/exported/WebFloatQuad.cpp index 9bb616b..b0731b6 100644 --- a/third_party/WebKit/Source/platform/exported/WebFloatQuad.cpp +++ b/third_party/WebKit/Source/platform/exported/WebFloatQuad.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace WebKit { +namespace blink { WebRect WebFloatQuad::enclosingRect() const { @@ -48,4 +48,4 @@ WebRect WebFloatQuad::enclosingRect() const return WebRect(left, top, right - left, bottom - top); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp b/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp index 74e8d77..8379e400 100644 --- a/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp +++ b/third_party/WebKit/Source/platform/exported/WebHTTPBody.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebHTTPBodyPrivate : public FormData { }; @@ -199,4 +199,4 @@ void WebHTTPBody::ensureMutable() assign(static_cast<WebHTTPBodyPrivate*>(m_private->copy().leakRef())); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp b/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp index 4e21f45..df6eeae 100644 --- a/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebHTTPLoadInfo.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebHTTPLoadInfo::initialize() { @@ -144,4 +144,4 @@ void WebHTTPLoadInfo::setResponseHeadersText(const WebString& headersText) m_private->responseHeadersText = headersText; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp index 49d7c17..bd26060 100644 --- a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp @@ -34,7 +34,7 @@ #include "platform/Prerender.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { namespace { @@ -130,4 +130,4 @@ void WebPrerender::didSendDOMContentLoadedForPrerender() m_private->didSendDOMContentLoadedForPrerender(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp b/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp index 9f6b42c..3a4997a 100644 --- a/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp +++ b/third_party/WebKit/Source/platform/exported/WebPrerenderingSupport.cpp @@ -32,7 +32,7 @@ #include "public/platform/WebPrerenderingSupport.h" -namespace WebKit { +namespace blink { WebPrerenderingSupport* WebPrerenderingSupport::s_platform = 0; diff --git a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp index a0d53f1..8aaabdb 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebRTCICEServer::WebRTCICEServer(const PassRefPtr<RTCIceServer>& iceServer) : m_private(iceServer) @@ -101,4 +101,4 @@ WebRTCICEServer WebRTCConfiguration::server(size_t index) const return WebRTCICEServer(m_private->server(index)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp b/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp index 220b54d..2013c86 100644 --- a/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp +++ b/third_party/WebKit/Source/platform/exported/WebRTCICECandidate.cpp @@ -35,7 +35,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" -namespace WebKit { +namespace blink { class WebRTCICECandidatePrivate FINAL : public RefCounted<WebRTCICECandidatePrivate> { public: @@ -96,4 +96,4 @@ unsigned short WebRTCICECandidate::sdpMLineIndex() const return m_private->sdpMLineIndex(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebSocketStreamError.cpp b/third_party/WebKit/Source/platform/exported/WebSocketStreamError.cpp index 383df7b..ed98f3a 100644 --- a/third_party/WebKit/Source/platform/exported/WebSocketStreamError.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSocketStreamError.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebSocketStreamError::assign(int code, const WebString& message) { diff --git a/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp b/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp index 39d97c2..d96a5f8 100644 --- a/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp +++ b/third_party/WebKit/Source/platform/exported/WebSourceInfo.cpp @@ -31,7 +31,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/RefCounted.h" -namespace WebKit { +namespace blink { class WebSourceInfoPrivate FINAL : public RefCounted<WebSourceInfoPrivate> { public: @@ -103,5 +103,5 @@ WebSourceInfo::VideoFacingMode WebSourceInfo::facing() const return m_private->facing(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebString.cpp b/third_party/WebKit/Source/platform/exported/WebString.cpp index c3ed5db..789e95d 100644 --- a/third_party/WebKit/Source/platform/exported/WebString.cpp +++ b/third_party/WebKit/Source/platform/exported/WebString.cpp @@ -37,7 +37,7 @@ #include "wtf/text/StringUTF8Adaptor.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { void WebString::reset() { @@ -157,4 +157,4 @@ void WebString::assign(WTF::StringImpl* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp b/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp index 3018d65..825f30b7 100644 --- a/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp +++ b/third_party/WebKit/Source/platform/exported/WebThreadSafeData.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebThreadSafeData::reset() { @@ -72,4 +72,4 @@ WebThreadSafeData& WebThreadSafeData::operator=(const PassRefPtr<RawData>& data) return *this; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp b/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp index 10ef382..8bf333f 100644 --- a/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp +++ b/third_party/WebKit/Source/platform/exported/WebTransformKeyframe.cpp @@ -27,7 +27,7 @@ #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { WebTransformKeyframe::WebTransformKeyframe(double time, PassOwnPtr<WebTransformOperations> value) : m_time(time) @@ -51,4 +51,4 @@ const WebTransformOperations& WebTransformKeyframe::value() const } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURL.cpp b/third_party/WebKit/Source/platform/exported/WebURL.cpp index 5af208e..15694d4 100644 --- a/third_party/WebKit/Source/platform/exported/WebURL.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURL.cpp @@ -33,7 +33,7 @@ #include "weborigin/KURL.h" -namespace WebKit { +namespace blink { WebURL::WebURL(const WebCore::KURL& url) : m_string(url.string()) @@ -55,4 +55,4 @@ WebURL::operator WebCore::KURL() const return WebCore::KURL(m_string, m_parsed, m_isValid); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURLError.cpp b/third_party/WebKit/Source/platform/exported/WebURLError.cpp index f9359d65..ceb43cb 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLError.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLError.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebURLError::WebURLError(const ResourceError& error) { @@ -68,4 +68,4 @@ WebURLError::operator ResourceError() const return resourceError; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp b/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp index 17af17d..05a8d74 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLLoadTiming.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebURLLoadTiming::initialize() { @@ -189,4 +189,4 @@ WebURLLoadTiming::operator PassRefPtr<ResourceLoadTiming>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp index c1574b1..aa17169 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -347,4 +347,4 @@ void WebURLRequest::assign(WebURLRequestPrivate* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURLRequestPrivate.h b/third_party/WebKit/Source/platform/exported/WebURLRequestPrivate.h index 1c1b696..7af11b5 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLRequestPrivate.h +++ b/third_party/WebKit/Source/platform/exported/WebURLRequestPrivate.h @@ -33,7 +33,7 @@ namespace WebCore { class ResourceRequest; } -namespace WebKit { +namespace blink { class WebURLRequestPrivate { public: @@ -48,6 +48,6 @@ public: bool m_allowStoredCredentials; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp b/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp index e3e55d6..e75d4f8 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp +++ b/third_party/WebKit/Source/platform/exported/WebURLResponse.cpp @@ -43,7 +43,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -442,4 +442,4 @@ void WebURLResponse::assign(WebURLResponsePrivate* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/platform/exported/WebURLResponsePrivate.h b/third_party/WebKit/Source/platform/exported/WebURLResponsePrivate.h index e6b6c78..cb2e035 100644 --- a/third_party/WebKit/Source/platform/exported/WebURLResponsePrivate.h +++ b/third_party/WebKit/Source/platform/exported/WebURLResponsePrivate.h @@ -35,7 +35,7 @@ namespace WebCore { class ResourceResponse; } -namespace WebKit { +namespace blink { class WebURLResponsePrivate { public: @@ -47,6 +47,6 @@ public: WebCore::ResourceResponse* m_resourceResponse; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h b/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h index b43617a..ccaf7a8 100644 --- a/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h +++ b/third_party/WebKit/Source/platform/exported/WrappedResourceRequest.h @@ -34,7 +34,7 @@ #include "platform/exported/WebURLRequestPrivate.h" #include "public/platform/WebURLRequest.h" -namespace WebKit { +namespace blink { class WrappedResourceRequest : public WebURLRequest { public: @@ -75,6 +75,6 @@ private: Handle m_handle; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h b/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h index 8ad1d7b..ef49cc9 100644 --- a/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h +++ b/third_party/WebKit/Source/platform/exported/WrappedResourceResponse.h @@ -34,7 +34,7 @@ #include "platform/exported/WebURLResponsePrivate.h" #include "public/platform/WebURLResponse.h" -namespace WebKit { +namespace blink { class WrappedResourceResponse : public WebURLResponse { public: @@ -75,6 +75,6 @@ private: Handle m_handle; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/platform/graphics/media/MediaPlayer.h b/third_party/WebKit/Source/platform/graphics/media/MediaPlayer.h index 2ea6abb..d820fc2 100644 --- a/third_party/WebKit/Source/platform/graphics/media/MediaPlayer.h +++ b/third_party/WebKit/Source/platform/graphics/media/MediaPlayer.h @@ -31,7 +31,7 @@ #include "wtf/Forward.h" #include "wtf/Noncopyable.h" -namespace WebKit { class WebLayer; } +namespace blink { class WebLayer; } namespace WebCore { @@ -115,7 +115,7 @@ public: virtual void load(const String& url, PassRefPtr<HTMLMediaSource>) = 0; virtual void prepareToPlay() = 0; - virtual WebKit::WebLayer* platformLayer() const = 0; + virtual blink::WebLayer* platformLayer() const = 0; virtual void play() = 0; virtual void pause() = 0; diff --git a/third_party/WebKit/Source/platform/network/DNS.cpp b/third_party/WebKit/Source/platform/network/DNS.cpp index 606e72c..5ed8f25 100644 --- a/third_party/WebKit/Source/platform/network/DNS.cpp +++ b/third_party/WebKit/Source/platform/network/DNS.cpp @@ -34,7 +34,7 @@ namespace WebCore { void prefetchDNS(const String& hostname) { - WebKit::WebPrescientNetworking* prescientNetworking = WebKit::Platform::current()->prescientNetworking(); + blink::WebPrescientNetworking* prescientNetworking = blink::Platform::current()->prescientNetworking(); if (!prescientNetworking) return; diff --git a/third_party/WebKit/Source/platform/network/ResourceError.cpp b/third_party/WebKit/Source/platform/network/ResourceError.cpp index 92762a3..1979500 100644 --- a/third_party/WebKit/Source/platform/network/ResourceError.cpp +++ b/third_party/WebKit/Source/platform/network/ResourceError.cpp @@ -38,7 +38,7 @@ const char errorDomainWebKitInternal[] = "WebKitInternal"; ResourceError ResourceError::cancelledError(const String& failingURL) { - return WebKit::Platform::current()->cancelledError(KURL(ParsedURLString, failingURL)); + return blink::Platform::current()->cancelledError(KURL(ParsedURLString, failingURL)); } ResourceError ResourceError::copy() const diff --git a/third_party/WebKit/Source/platform/network/SocketStreamHandle.cpp b/third_party/WebKit/Source/platform/network/SocketStreamHandle.cpp index 78db010..f003e03 100644 --- a/third_party/WebKit/Source/platform/network/SocketStreamHandle.cpp +++ b/third_party/WebKit/Source/platform/network/SocketStreamHandle.cpp @@ -59,7 +59,7 @@ SocketStreamHandleInternal::~SocketStreamHandleInternal() void SocketStreamHandleInternal::connect(const KURL& url) { - m_socket = adoptPtr(WebKit::Platform::current()->createSocketStreamHandle()); + m_socket = adoptPtr(blink::Platform::current()->createSocketStreamHandle()); LOG(Network, "SocketStreamHandleInternal %p connect()", this); ASSERT(m_socket); ASSERT(m_handle); @@ -83,7 +83,7 @@ int SocketStreamHandleInternal::send(const char* data, int len) if (len <= 0) return len; - WebKit::WebData webdata(data, len); + blink::WebData webdata(data, len); if (m_socket->send(webdata)) { m_pendingAmountSent += len; LOG(Network, "SocketStreamHandleInternal %p send() Sent %d bytes", this, len); @@ -100,7 +100,7 @@ void SocketStreamHandleInternal::close() m_socket->close(); } -void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed) +void SocketStreamHandleInternal::didOpenStream(blink::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed) { LOG(Network, "SocketStreamHandleInternal %p didOpenStream() maxPendingSendAllowed=%d", this, maxPendingSendAllowed); ASSERT(maxPendingSendAllowed > 0); @@ -116,7 +116,7 @@ void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* so LOG(Network, "SocketStreamHandleInternal %p didOpenStream() m_handle or m_socket is NULL", this); } -void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* socketHandle, int amountSent) +void SocketStreamHandleInternal::didSendData(blink::WebSocketStreamHandle* socketHandle, int amountSent) { LOG(Network, "SocketStreamHandleInternal %p didSendData() amountSent=%d", this, amountSent); ASSERT(amountSent > 0); @@ -128,7 +128,7 @@ void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* sock } } -void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebData& data) +void SocketStreamHandleInternal::didReceiveData(blink::WebSocketStreamHandle* socketHandle, const blink::WebData& data) { LOG(Network, "SocketStreamHandleInternal %p didReceiveData() Received %lu bytes", this, static_cast<unsigned long>(data.size())); if (m_handle && m_socket) { @@ -138,7 +138,7 @@ void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* s } } -void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketHandle) +void SocketStreamHandleInternal::didClose(blink::WebSocketStreamHandle* socketHandle) { LOG(Network, "SocketStreamHandleInternal %p didClose()", this); if (m_handle && m_socket) { @@ -151,7 +151,7 @@ void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketH } } -void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebSocketStreamError& err) +void SocketStreamHandleInternal::didFail(blink::WebSocketStreamHandle* socketHandle, const blink::WebSocketStreamError& err) { LOG(Network, "SocketStreamHandleInternal %p didFail()", this); if (m_handle && m_socket) { diff --git a/third_party/WebKit/Source/platform/network/SocketStreamHandleInternal.h b/third_party/WebKit/Source/platform/network/SocketStreamHandleInternal.h index a7ff59b..1739a0fd 100644 --- a/third_party/WebKit/Source/platform/network/SocketStreamHandleInternal.h +++ b/third_party/WebKit/Source/platform/network/SocketStreamHandleInternal.h @@ -36,7 +36,7 @@ #include "public/platform/WebURL.h" #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { class WebData; class WebSocketStreamError; class WebSocketStreamHandle; @@ -44,7 +44,7 @@ class WebSocketStreamHandle; namespace WebCore { -class PLATFORM_EXPORT SocketStreamHandleInternal : public WebKit::WebSocketStreamHandleClient { +class PLATFORM_EXPORT SocketStreamHandleInternal : public blink::WebSocketStreamHandleClient { WTF_MAKE_NONCOPYABLE(SocketStreamHandleInternal); public: static PassOwnPtr<SocketStreamHandleInternal> create(SocketStreamHandle* handle) @@ -57,13 +57,13 @@ public: int send(const char*, int); void close(); - virtual void didOpenStream(WebKit::WebSocketStreamHandle*, int); - virtual void didSendData(WebKit::WebSocketStreamHandle*, int); - virtual void didReceiveData(WebKit::WebSocketStreamHandle*, const WebKit::WebData&); - virtual void didClose(WebKit::WebSocketStreamHandle*); - virtual void didFail(WebKit::WebSocketStreamHandle*, const WebKit::WebSocketStreamError&); + virtual void didOpenStream(blink::WebSocketStreamHandle*, int); + virtual void didSendData(blink::WebSocketStreamHandle*, int); + virtual void didReceiveData(blink::WebSocketStreamHandle*, const blink::WebData&); + virtual void didClose(blink::WebSocketStreamHandle*); + virtual void didFail(blink::WebSocketStreamHandle*, const blink::WebSocketStreamError&); - static WebKit::WebSocketStreamHandle* toWebSocketStreamHandle(SocketStreamHandle* handle) + static blink::WebSocketStreamHandle* toWebSocketStreamHandle(SocketStreamHandle* handle) { if (handle && handle->m_internal) return handle->m_internal->m_socket.get(); @@ -74,7 +74,7 @@ private: explicit SocketStreamHandleInternal(SocketStreamHandle*); SocketStreamHandle* m_handle; - OwnPtr<WebKit::WebSocketStreamHandle> m_socket; + OwnPtr<blink::WebSocketStreamHandle> m_socket; int m_maxPendingSendAllowed; int m_pendingAmountSent; }; diff --git a/third_party/WebKit/Source/platform/plugins/PluginData.cpp b/third_party/WebKit/Source/platform/plugins/PluginData.cpp index fc843b8..d2d5851 100644 --- a/third_party/WebKit/Source/platform/plugins/PluginData.cpp +++ b/third_party/WebKit/Source/platform/plugins/PluginData.cpp @@ -45,7 +45,7 @@ public: { if (!m_loaded) { PluginListBuilder builder(&m_plugins); - WebKit::Platform::current()->getPluginList(m_refresh, &builder); + blink::Platform::current()->getPluginList(m_refresh, &builder); m_loaded = true; m_refresh = false; } diff --git a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp index d1d7534..9fc70cf 100644 --- a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp +++ b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.cpp @@ -36,7 +36,7 @@ namespace WebCore { -void PluginListBuilder::addPlugin(const WebKit::WebString& name, const WebKit::WebString& description, const WebKit::WebString& fileName) +void PluginListBuilder::addPlugin(const blink::WebString& name, const blink::WebString& description, const blink::WebString& fileName) { PluginInfo info; info.name = name; @@ -45,7 +45,7 @@ void PluginListBuilder::addPlugin(const WebKit::WebString& name, const WebKit::W m_results->append(info); } -void PluginListBuilder::addMediaTypeToLastPlugin(const WebKit::WebString& name, const WebKit::WebString& description) +void PluginListBuilder::addMediaTypeToLastPlugin(const blink::WebString& name, const blink::WebString& description) { MimeClassInfo info; info.type = name; @@ -53,7 +53,7 @@ void PluginListBuilder::addMediaTypeToLastPlugin(const WebKit::WebString& name, m_results->last().mimes.append(info); } -void PluginListBuilder::addFileExtensionToLastMediaType(const WebKit::WebString& extension) +void PluginListBuilder::addFileExtensionToLastMediaType(const blink::WebString& extension) { MimeClassInfo& info = m_results->last().mimes.last(); info.extensions.append(extension); diff --git a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.h b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.h index e1f334a..14aa104 100644 --- a/third_party/WebKit/Source/platform/plugins/PluginListBuilder.h +++ b/third_party/WebKit/Source/platform/plugins/PluginListBuilder.h @@ -37,14 +37,14 @@ namespace WebCore { -class PluginListBuilder : public WebKit::WebPluginListBuilder { +class PluginListBuilder : public blink::WebPluginListBuilder { public: PluginListBuilder(Vector<WebCore::PluginInfo>* results) : m_results(results) { } // WebPluginListBuilder methods: - virtual void addPlugin(const WebKit::WebString& name, const WebKit::WebString& description, const WebKit::WebString& fileName); - virtual void addMediaTypeToLastPlugin(const WebKit::WebString& name, const WebKit::WebString& description); - virtual void addFileExtensionToLastMediaType(const WebKit::WebString& extension); + virtual void addPlugin(const blink::WebString& name, const blink::WebString& description, const blink::WebString& fileName); + virtual void addMediaTypeToLastPlugin(const blink::WebString& name, const blink::WebString& description); + virtual void addFileExtensionToLastMediaType(const blink::WebString& extension); private: Vector<PluginInfo>* m_results; diff --git a/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp b/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp index c7a73c94..572c83c 100644 --- a/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp +++ b/third_party/WebKit/Source/platform/text/BidiResolverTest.cpp @@ -212,7 +212,7 @@ TEST(BidiResolver, BidiTest_txt) // This code wants to use PathService from base/path_service.h // but we aren't allowed to depend on base/ directly from Blink yet. // Alternatively we could use: - // WebKit::Platform::current()->unitTestSupport()->webKitRootDir() + // blink::Platform::current()->unitTestSupport()->webKitRootDir() // and a relative path, but that would require running inside // webkit_unit_tests (to have a functioning Platform object). // The file we want is: diff --git a/third_party/WebKit/Source/platform/text/PlatformLocale.cpp b/third_party/WebKit/Source/platform/text/PlatformLocale.cpp index 6b191ae..60acf5a 100644 --- a/third_party/WebKit/Source/platform/text/PlatformLocale.cpp +++ b/third_party/WebKit/Source/platform/text/PlatformLocale.cpp @@ -38,8 +38,8 @@ namespace WebCore { -using WebKit::Platform; -using WebKit::WebLocalizedString; +using blink::Platform; +using blink::WebLocalizedString; class DateTimeStringBuilder : private DateTimeFormat::TokenHandler { WTF_MAKE_NONCOPYABLE(DateTimeStringBuilder); diff --git a/third_party/WebKit/Source/platform/text/PlatformLocale.h b/third_party/WebKit/Source/platform/text/PlatformLocale.h index 513abd0..8b508a3 100644 --- a/third_party/WebKit/Source/platform/text/PlatformLocale.h +++ b/third_party/WebKit/Source/platform/text/PlatformLocale.h @@ -40,9 +40,9 @@ public: static PassOwnPtr<Locale> create(const AtomicString& localeIdentifier); static Locale& defaultLocale(); - String queryString(WebKit::WebLocalizedString::Name); - String queryString(WebKit::WebLocalizedString::Name, const String& parameter); - String queryString(WebKit::WebLocalizedString::Name, const String& parameter1, const String& parameter2); + String queryString(blink::WebLocalizedString::Name); + String queryString(blink::WebLocalizedString::Name, const String& parameter); + String queryString(blink::WebLocalizedString::Name, const String& parameter1, const String& parameter2); String validationMessageTooLongText(unsigned valueLength, int maxLength); // Converts the specified number string to another number string localized diff --git a/third_party/WebKit/Source/testing/runner/AccessibilityController.cpp b/third_party/WebKit/Source/testing/runner/AccessibilityController.cpp index d853bba..0788069 100644 --- a/third_party/WebKit/Source/testing/runner/AccessibilityController.cpp +++ b/third_party/WebKit/Source/testing/runner/AccessibilityController.cpp @@ -38,7 +38,7 @@ #include "public/web/WebNode.h" #include "public/web/WebView.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -132,7 +132,7 @@ bool AccessibilityController::shouldLogAccessibilityEvents() return m_logAccessibilityEvents; } -void AccessibilityController::notificationReceived(const WebKit::WebAXObject& target, const char* notificationName) +void AccessibilityController::notificationReceived(const blink::WebAXObject& target, const char* notificationName) { // Call notification listeners on the element. WebAXObjectProxy* element = m_elements.getOrCreate(target); diff --git a/third_party/WebKit/Source/testing/runner/AccessibilityController.h b/third_party/WebKit/Source/testing/runner/AccessibilityController.h index 368b14f..2535a89 100644 --- a/third_party/WebKit/Source/testing/runner/AccessibilityController.h +++ b/third_party/WebKit/Source/testing/runner/AccessibilityController.h @@ -34,7 +34,7 @@ #include "CppBoundClass.h" #include "WebAXObjectProxy.h" -namespace WebKit { +namespace blink { class WebAXObject; class WebFrame; class WebView; @@ -49,20 +49,20 @@ public: AccessibilityController(); // Shadow to include accessibility initialization. - void bindToJavascript(WebKit::WebFrame*, const WebKit::WebString& classname); + void bindToJavascript(blink::WebFrame*, const blink::WebString& classname); void reset(); - void setFocusedElement(const WebKit::WebAXObject&); + void setFocusedElement(const blink::WebAXObject&); WebAXObjectProxy* getFocusedElement(); WebAXObjectProxy* getRootElement(); WebAXObjectProxy* getAccessibleElementById(const std::string& id); bool shouldLogAccessibilityEvents(); - void notificationReceived(const WebKit::WebAXObject& target, const char* notificationName); + void notificationReceived(const blink::WebAXObject& target, const char* notificationName); void setDelegate(WebTestDelegate* delegate) { m_delegate = delegate; } - void setWebView(WebKit::WebView* webView) { m_webView = webView; } + void setWebView(blink::WebView* webView) { m_webView = webView; } private: // If true, will log all accessibility notifications. @@ -78,17 +78,17 @@ private: void rootElementGetterCallback(CppVariant*); void accessibleElementByIdGetterCallback(const CppArgumentList&, CppVariant*); - WebAXObjectProxy* findAccessibleElementByIdRecursive(const WebKit::WebAXObject&, const WebKit::WebString& id); + WebAXObjectProxy* findAccessibleElementByIdRecursive(const blink::WebAXObject&, const blink::WebString& id); - WebKit::WebAXObject m_focusedElement; - WebKit::WebAXObject m_rootElement; + blink::WebAXObject m_focusedElement; + blink::WebAXObject m_rootElement; WebAXObjectProxyList m_elements; std::vector<CppVariant> m_notificationCallbacks; WebTestDelegate* m_delegate; - WebKit::WebView* m_webView; + blink::WebView* m_webView; }; } diff --git a/third_party/WebKit/Source/testing/runner/CppBoundClass.cpp b/third_party/WebKit/Source/testing/runner/CppBoundClass.cpp index 18dce78..2707ae4 100644 --- a/third_party/WebKit/Source/testing/runner/CppBoundClass.cpp +++ b/third_party/WebKit/Source/testing/runner/CppBoundClass.cpp @@ -47,7 +47,7 @@ #include "public/web/WebFrame.h" #include <memory> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/CppBoundClass.h b/third_party/WebKit/Source/testing/runner/CppBoundClass.h index ba6d82a..7ba65593 100644 --- a/third_party/WebKit/Source/testing/runner/CppBoundClass.h +++ b/third_party/WebKit/Source/testing/runner/CppBoundClass.h @@ -49,7 +49,7 @@ #include <memory> #include <vector> -namespace WebKit { +namespace blink { class WebFrame; class WebString; } @@ -60,7 +60,7 @@ typedef std::vector<CppVariant> CppArgumentList; // CppBoundClass lets you map Javascript method calls and property accesses // directly to C++ method calls and CppVariant* variable access. -class CppBoundClass : public WebKit::WebNonCopyable { +class CppBoundClass : public blink::WebNonCopyable { public: class PropertyCallback { public: @@ -98,7 +98,7 @@ public: // as window.<classname>. The owner of the CppBoundObject is responsible for // keeping the object around while the frame is alive, and for destroying it // afterwards. - void bindToJavascript(WebKit::WebFrame*, const WebKit::WebString& classname); + void bindToJavascript(blink::WebFrame*, const blink::WebString& classname); // Used by a test. Returns true if a method with the specified name exists, // regardless of whether a fallback is registered. diff --git a/third_party/WebKit/Source/testing/runner/CppVariant.cpp b/third_party/WebKit/Source/testing/runner/CppVariant.cpp index b801bdc..ae44ccb 100644 --- a/third_party/WebKit/Source/testing/runner/CppVariant.cpp +++ b/third_party/WebKit/Source/testing/runner/CppVariant.cpp @@ -34,7 +34,7 @@ #include "public/web/WebBindings.h" #include <limits> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/EventSender.cpp b/third_party/WebKit/Source/testing/runner/EventSender.cpp index f42f5de..c20949e 100644 --- a/third_party/WebKit/Source/testing/runner/EventSender.cpp +++ b/third_party/WebKit/Source/testing/runner/EventSender.cpp @@ -65,7 +65,7 @@ // FIXME: layout before each event? using namespace std; -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -344,8 +344,8 @@ void EventSender::reset() // The test should have finished a drag and the mouse button state. BLINK_ASSERT(currentDragData.isNull()); currentDragData.reset(); - currentDragEffect = WebKit::WebDragOperationNone; - currentDragEffectsAllowed = WebKit::WebDragOperationNone; + currentDragEffect = blink::WebDragOperationNone; + currentDragEffectsAllowed = blink::WebDragOperationNone; if (webview() && pressedButton != WebMouseEvent::ButtonNone) webview()->mouseCaptureLost(); pressedButton = WebMouseEvent::ButtonNone; @@ -502,7 +502,7 @@ void EventSender::doMouseUp(const WebMouseEvent& e) finishDragAndDrop(e, webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0)); } -void EventSender::finishDragAndDrop(const WebMouseEvent& e, WebKit::WebDragOperation dragEffect) +void EventSender::finishDragAndDrop(const WebMouseEvent& e, blink::WebDragOperation dragEffect) { WebPoint clientPoint(e.x, e.y); WebPoint screenPoint(e.globalX, e.globalY); @@ -697,7 +697,7 @@ void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result) if (code == VKEY_ESCAPE && !currentDragData.isNull()) { WebMouseEvent event; initMouseEvent(WebInputEvent::MouseDown, pressedButton, lastMousePos, &event, getCurrentEventTimeSec(m_delegate)); - finishDragAndDrop(event, WebKit::WebDragOperationNone); + finishDragAndDrop(event, blink::WebDragOperationNone); } m_delegate->clearEditCommand(); @@ -980,7 +980,7 @@ void EventSender::beginDragWithFiles(const CppArgumentList& arguments, CppVarian absoluteFilenames[i] = item.filenameData; } currentDragData.setFilesystemId(m_delegate->registerIsolatedFileSystem(absoluteFilenames)); - currentDragEffectsAllowed = WebKit::WebDragOperationCopy; + currentDragEffectsAllowed = blink::WebDragOperationCopy; // Provide a drag source. webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed, 0); @@ -1393,7 +1393,7 @@ void EventSender::gestureEvent(WebInputEvent::Type type, const CppArgumentList& if (type == WebInputEvent::GestureLongPress && !currentDragData.isNull()) { WebMouseEvent mouseEvent; initMouseEvent(WebInputEvent::MouseDown, pressedButton, point, &mouseEvent, getCurrentEventTimeSec(m_delegate)); - finishDragAndDrop(mouseEvent, WebKit::WebDragOperationNone); + finishDragAndDrop(mouseEvent, blink::WebDragOperationNone); } } diff --git a/third_party/WebKit/Source/testing/runner/EventSender.h b/third_party/WebKit/Source/testing/runner/EventSender.h index 7133459..e98d5e0 100644 --- a/third_party/WebKit/Source/testing/runner/EventSender.h +++ b/third_party/WebKit/Source/testing/runner/EventSender.h @@ -44,7 +44,7 @@ #include "public/web/WebInputEvent.h" #include <memory> -namespace WebKit { +namespace blink { class WebDragData; class WebView; struct WebContextMenuData; @@ -61,15 +61,15 @@ public: ~EventSender(); void setDelegate(WebTestDelegate* delegate) { m_delegate = delegate; } - void setWebView(WebKit::WebView* webView) { m_webView = webView; } + void setWebView(blink::WebView* webView) { m_webView = webView; } - void setContextMenuData(const WebKit::WebContextMenuData&); + void setContextMenuData(const blink::WebContextMenuData&); // Resets some static variable state. void reset(); // Simulate drag&drop system call. - void doDragDrop(const WebKit::WebDragData&, WebKit::WebDragOperationsMask); + void doDragDrop(const blink::WebDragData&, blink::WebDragOperationsMask); // Test helper for dragging out images. void dumpFilenameBeingDragged(const CppArgumentList&, CppVariant*); @@ -126,7 +126,7 @@ public: void gestureLongPress(const CppArgumentList&, CppVariant*); void gestureLongTap(const CppArgumentList&, CppVariant*); void gestureTwoFingerTap(const CppArgumentList&, CppVariant*); - void gestureEvent(WebKit::WebInputEvent::Type, const CppArgumentList&); + void gestureEvent(blink::WebInputEvent::Type, const CppArgumentList&); // Setting this to false makes EventSender not force layout() calls. // This makes it possible to test the standard WebCore event dispatch. @@ -152,7 +152,7 @@ public: WebTaskList* taskList() { return &m_taskList; } private: - WebKit::WebView* webview() { return m_webView; } + blink::WebView* webview() { return m_webView; } // Returns true if dragMode is true. bool isDragMode() { return dragMode.isBool() && dragMode.toBoolean(); } @@ -161,13 +161,13 @@ private: // Sometimes we queue up mouse move and mouse up events for drag drop // handling purposes. These methods dispatch the event. - void doMouseMove(const WebKit::WebMouseEvent&); - void doMouseUp(const WebKit::WebMouseEvent&); + void doMouseMove(const blink::WebMouseEvent&); + void doMouseUp(const blink::WebMouseEvent&); static void doLeapForward(int milliseconds); void replaySavedEvents(); // Helper to return the button type given a button code - static WebKit::WebMouseEvent::Button getButtonTypeFromButtonNumber(int); + static blink::WebMouseEvent::Button getButtonTypeFromButtonNumber(int); // Helper to extract the button number from the optional argument in // mouseDown and mouseUp @@ -177,36 +177,36 @@ private: // modifier to be passed into the generated event. bool needsShiftModifier(int); - void finishDragAndDrop(const WebKit::WebMouseEvent&, WebKit::WebDragOperation); - void updateClickCountForButton(WebKit::WebMouseEvent::Button); + void finishDragAndDrop(const blink::WebMouseEvent&, blink::WebDragOperation); + void updateClickCountForButton(blink::WebMouseEvent::Button); // Compose a touch event from the current touch points and send it. - void sendCurrentTouchEvent(const WebKit::WebInputEvent::Type); + void sendCurrentTouchEvent(const blink::WebInputEvent::Type); // Init a mouse wheel event from the given args. - void initMouseWheelEvent(const CppArgumentList&, CppVariant*, bool continuous, WebKit::WebMouseWheelEvent*); + void initMouseWheelEvent(const CppArgumentList&, CppVariant*, bool continuous, blink::WebMouseWheelEvent*); WebTaskList m_taskList; TestInterfaces* m_testInterfaces; WebTestDelegate* m_delegate; - WebKit::WebView* m_webView; + blink::WebView* m_webView; - std::auto_ptr<WebKit::WebContextMenuData> m_lastContextMenuData; + std::auto_ptr<blink::WebContextMenuData> m_lastContextMenuData; // Location of the touch point that initiated a gesture. - WebKit::WebPoint m_currentGestureLocation; + blink::WebPoint m_currentGestureLocation; // Location of last mouseMoveTo event. - static WebKit::WebPoint lastMousePos; + static blink::WebPoint lastMousePos; // Currently pressed mouse button (Left/Right/Middle or None) - static WebKit::WebMouseEvent::Button pressedButton; + static blink::WebMouseEvent::Button pressedButton; // The last button number passed to mouseDown and mouseUp. // Used to determine whether the click count continues to // increment or not. - static WebKit::WebMouseEvent::Button lastButtonType; + static blink::WebMouseEvent::Button lastButtonType; }; } diff --git a/third_party/WebKit/Source/testing/runner/GamepadController.cpp b/third_party/WebKit/Source/testing/runner/GamepadController.cpp index 85d8321..e120871 100644 --- a/third_party/WebKit/Source/testing/runner/GamepadController.cpp +++ b/third_party/WebKit/Source/testing/runner/GamepadController.cpp @@ -32,7 +32,7 @@ #include "public/testing/WebTestDelegate.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -73,11 +73,11 @@ void GamepadController::connect(const CppArgumentList& args, CppVariant* result) return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; m_gamepads.items[index].connected = true; m_gamepads.length = 0; - for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) + for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) if (m_gamepads.items[i].connected) m_gamepads.length = i + 1; m_delegate->setGamepadData(m_gamepads); @@ -91,11 +91,11 @@ void GamepadController::disconnect(const CppArgumentList& args, CppVariant* resu return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; m_gamepads.items[index].connected = false; m_gamepads.length = 0; - for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) + for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) if (m_gamepads.items[i].connected) m_gamepads.length = i + 1; m_delegate->setGamepadData(m_gamepads); @@ -109,12 +109,12 @@ void GamepadController::setId(const CppArgumentList& args, CppVariant* result) return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; std::string src = args[1].toString(); const char* p = src.c_str(); memset(m_gamepads.items[index].id, 0, sizeof(m_gamepads.items[index].id)); - for (unsigned i = 0; *p && i < WebKit::WebGamepad::idLengthCap - 1; ++i) + for (unsigned i = 0; *p && i < blink::WebGamepad::idLengthCap - 1; ++i) m_gamepads.items[index].id[i] = *p++; m_delegate->setGamepadData(m_gamepads); result->setNull(); @@ -127,10 +127,10 @@ void GamepadController::setButtonCount(const CppArgumentList& args, CppVariant* return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; int buttons = args[1].toInt32(); - if (buttons < 0 || buttons >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) + if (buttons < 0 || buttons >= static_cast<int>(blink::WebGamepad::buttonsLengthCap)) return; m_gamepads.items[index].buttonsLength = buttons; m_delegate->setGamepadData(m_gamepads); @@ -144,10 +144,10 @@ void GamepadController::setButtonData(const CppArgumentList& args, CppVariant* r return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; int button = args[1].toInt32(); - if (button < 0 || button >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) + if (button < 0 || button >= static_cast<int>(blink::WebGamepad::buttonsLengthCap)) return; double data = args[2].toDouble(); m_gamepads.items[index].buttons[button] = data; @@ -162,10 +162,10 @@ void GamepadController::setAxisCount(const CppArgumentList& args, CppVariant* re return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; int axes = args[1].toInt32(); - if (axes < 0 || axes >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) + if (axes < 0 || axes >= static_cast<int>(blink::WebGamepad::axesLengthCap)) return; m_gamepads.items[index].axesLength = axes; m_delegate->setGamepadData(m_gamepads); @@ -179,10 +179,10 @@ void GamepadController::setAxisData(const CppArgumentList& args, CppVariant* res return; } int index = args[0].toInt32(); - if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) + if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) return; int axis = args[1].toInt32(); - if (axis < 0 || axis >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) + if (axis < 0 || axis >= static_cast<int>(blink::WebGamepad::axesLengthCap)) return; double data = args[2].toDouble(); m_gamepads.items[index].axes[axis] = data; diff --git a/third_party/WebKit/Source/testing/runner/GamepadController.h b/third_party/WebKit/Source/testing/runner/GamepadController.h index 86a3b77a..bcc5ea6 100644 --- a/third_party/WebKit/Source/testing/runner/GamepadController.h +++ b/third_party/WebKit/Source/testing/runner/GamepadController.h @@ -34,7 +34,7 @@ #include "CppBoundClass.h" #include "public/platform/WebGamepads.h" -namespace WebKit { +namespace blink { class WebGamepads; class WebFrame; } @@ -47,7 +47,7 @@ class GamepadController : public CppBoundClass { public: GamepadController(); - void bindToJavascript(WebKit::WebFrame*, const WebKit::WebString& classname); + void bindToJavascript(blink::WebFrame*, const blink::WebString& classname); void setDelegate(WebTestDelegate*); void reset(); @@ -62,7 +62,7 @@ private: void setAxisData(const CppArgumentList&, CppVariant*); void fallbackCallback(const CppArgumentList&, CppVariant*); - WebKit::WebGamepads m_gamepads; + blink::WebGamepads m_gamepads; WebTestDelegate* m_delegate; }; diff --git a/third_party/WebKit/Source/testing/runner/MockColorChooser.cpp b/third_party/WebKit/Source/testing/runner/MockColorChooser.cpp index 0731396..dfcb8c9 100644 --- a/third_party/WebKit/Source/testing/runner/MockColorChooser.cpp +++ b/third_party/WebKit/Source/testing/runner/MockColorChooser.cpp @@ -33,7 +33,7 @@ #include "public/testing/WebTestDelegate.h" #include "public/testing/WebTestProxy.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -54,7 +54,7 @@ private: }; } -MockColorChooser::MockColorChooser(WebKit::WebColorChooserClient* client, WebTestDelegate* delegate, WebTestProxyBase* proxy) +MockColorChooser::MockColorChooser(blink::WebColorChooserClient* client, WebTestDelegate* delegate, WebTestProxyBase* proxy) : m_client(client) , m_delegate(delegate) , m_proxy(proxy) @@ -67,7 +67,7 @@ MockColorChooser::~MockColorChooser() m_proxy->didCloseChooser(); } -void MockColorChooser::setSelectedColor(const WebKit::WebColor) +void MockColorChooser::setSelectedColor(const blink::WebColor) { } diff --git a/third_party/WebKit/Source/testing/runner/MockColorChooser.h b/third_party/WebKit/Source/testing/runner/MockColorChooser.h index 94198d8..3ac81066 100644 --- a/third_party/WebKit/Source/testing/runner/MockColorChooser.h +++ b/third_party/WebKit/Source/testing/runner/MockColorChooser.h @@ -41,19 +41,19 @@ namespace WebTestRunner { class WebTestDelegate; class WebTestProxyBase; -class MockColorChooser : public WebKit::WebColorChooser, public WebKit::WebNonCopyable { +class MockColorChooser : public blink::WebColorChooser, public blink::WebNonCopyable { public: - MockColorChooser(WebKit::WebColorChooserClient*, WebTestDelegate*, WebTestProxyBase*); + MockColorChooser(blink::WebColorChooserClient*, WebTestDelegate*, WebTestProxyBase*); virtual ~MockColorChooser(); - // WebKit::WebColorChooser implementation. - virtual void setSelectedColor(const WebKit::WebColor) OVERRIDE; + // blink::WebColorChooser implementation. + virtual void setSelectedColor(const blink::WebColor) OVERRIDE; virtual void endChooser() OVERRIDE; void invokeDidEndChooser(); WebTaskList* taskList() { return &m_taskList; } private: - WebKit::WebColorChooserClient* m_client; + blink::WebColorChooserClient* m_client; WebTestDelegate* m_delegate; WebTestProxyBase* m_proxy; WebTaskList m_taskList; diff --git a/third_party/WebKit/Source/testing/runner/MockConstraints.cpp b/third_party/WebKit/Source/testing/runner/MockConstraints.cpp index b61d191..1340efaf 100644 --- a/third_party/WebKit/Source/testing/runner/MockConstraints.cpp +++ b/third_party/WebKit/Source/testing/runner/MockConstraints.cpp @@ -33,7 +33,7 @@ #include "public/platform/WebMediaConstraints.h" #include "public/platform/WebString.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockConstraints.h b/third_party/WebKit/Source/testing/runner/MockConstraints.h index a24b29e..a0807d0 100644 --- a/third_party/WebKit/Source/testing/runner/MockConstraints.h +++ b/third_party/WebKit/Source/testing/runner/MockConstraints.h @@ -31,7 +31,7 @@ #ifndef MockConstraints_h #define MockConstraints_h -namespace WebKit { +namespace blink { class WebMediaConstraints; class WebString; } @@ -40,7 +40,7 @@ namespace WebTestRunner { class MockConstraints { public: - static bool verifyConstraints(const WebKit::WebMediaConstraints&, WebKit::WebString* failedConstraint = 0); + static bool verifyConstraints(const blink::WebMediaConstraints&, blink::WebString* failedConstraint = 0); }; } diff --git a/third_party/WebKit/Source/testing/runner/MockGrammarCheck.cpp b/third_party/WebKit/Source/testing/runner/MockGrammarCheck.cpp index c3a64d7..ae18dec 100644 --- a/third_party/WebKit/Source/testing/runner/MockGrammarCheck.cpp +++ b/third_party/WebKit/Source/testing/runner/MockGrammarCheck.cpp @@ -36,7 +36,7 @@ #include "public/web/WebTextCheckingResult.h" #include <algorithm> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockGrammarCheck.h b/third_party/WebKit/Source/testing/runner/MockGrammarCheck.h index a183dcc..2d2fda6 100644 --- a/third_party/WebKit/Source/testing/runner/MockGrammarCheck.h +++ b/third_party/WebKit/Source/testing/runner/MockGrammarCheck.h @@ -33,7 +33,7 @@ #include <vector> -namespace WebKit { +namespace blink { class WebString; struct WebTextCheckingResult; @@ -49,7 +49,7 @@ namespace WebTestRunner { // for webkit tests, this class is not suitable for any other usages. class MockGrammarCheck { public: - static bool checkGrammarOfString(const WebKit::WebString&, std::vector<WebKit::WebTextCheckingResult>*); + static bool checkGrammarOfString(const blink::WebString&, std::vector<blink::WebTextCheckingResult>*); }; } diff --git a/third_party/WebKit/Source/testing/runner/MockSpellCheck.cpp b/third_party/WebKit/Source/testing/runner/MockSpellCheck.cpp index e3b767d..c0d969a 100644 --- a/third_party/WebKit/Source/testing/runner/MockSpellCheck.cpp +++ b/third_party/WebKit/Source/testing/runner/MockSpellCheck.cpp @@ -33,7 +33,7 @@ #include "TestCommon.h" #include "public/platform/WebCString.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockSpellCheck.h b/third_party/WebKit/Source/testing/runner/MockSpellCheck.h index 99a7a76..46af148 100644 --- a/third_party/WebKit/Source/testing/runner/MockSpellCheck.h +++ b/third_party/WebKit/Source/testing/runner/MockSpellCheck.h @@ -44,9 +44,9 @@ namespace WebTestRunner { // words in webkit tests and mark them as missspelled. // Even though this is sufficent for webkit tests, this class is not suitable // for any other usages. -class MockSpellCheck : public WebKit::WebNonCopyable { +class MockSpellCheck : public blink::WebNonCopyable { public: - static void fillSuggestionList(const WebKit::WebString& word, WebKit::WebVector<WebKit::WebString>* suggestions); + static void fillSuggestionList(const blink::WebString& word, blink::WebVector<blink::WebString>* suggestions); MockSpellCheck(); ~MockSpellCheck(); @@ -59,11 +59,11 @@ public: // the first invalid word to misspelledLength, respectively. // For example, when the given text is " zz zz", this function sets 3 to // misspelledOffset and 2 to misspelledLength, respectively. - bool spellCheckWord(const WebKit::WebString& text, int* misspelledOffset, int* misspelledLength); + bool spellCheckWord(const blink::WebString& text, int* misspelledOffset, int* misspelledLength); // Checks whether the specified text can be spell checked immediately using // the spell checker cache. - bool hasInCache(const WebKit::WebString& text); + bool hasInCache(const blink::WebString& text); private: // Initialize the internal resources if we need to initialize it. diff --git a/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.cpp b/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.cpp index 8633e02..eb61d22 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.cpp @@ -30,7 +30,7 @@ #include "MockWebAudioDevice.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.h b/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.h index 4e3f1df..a5eee58 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.h +++ b/third_party/WebKit/Source/testing/runner/MockWebAudioDevice.h @@ -37,7 +37,7 @@ namespace WebTestRunner { -class MockWebAudioDevice : public WebKit::WebAudioDevice, public WebKit::WebNonCopyable { +class MockWebAudioDevice : public blink::WebAudioDevice, public blink::WebNonCopyable { public: explicit MockWebAudioDevice(double sampleRate); virtual ~MockWebAudioDevice(); diff --git a/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.cpp b/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.cpp index 156e4bc..04711f6 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.cpp @@ -36,13 +36,13 @@ #include "public/testing/WebTestDelegate.h" #include "public/testing/WebTestRunner.h" -using namespace WebKit; +using namespace blink; namespace { class DidStartSessionTask : public WebTestRunner::WebMethodTask<WebTestRunner::MockWebMIDIAccessor> { public: - DidStartSessionTask(WebTestRunner::MockWebMIDIAccessor* object, WebKit::WebMIDIAccessorClient* client, bool result) + DidStartSessionTask(WebTestRunner::MockWebMIDIAccessor* object, blink::WebMIDIAccessorClient* client, bool result) : WebMethodTask<WebTestRunner::MockWebMIDIAccessor>(object) , m_client(client) , m_result(result) @@ -55,7 +55,7 @@ public: } private: - WebKit::WebMIDIAccessorClient* m_client; + blink::WebMIDIAccessorClient* m_client; bool m_result; }; @@ -63,7 +63,7 @@ private: namespace WebTestRunner { -MockWebMIDIAccessor::MockWebMIDIAccessor(WebKit::WebMIDIAccessorClient* client, TestInterfaces* interfaces) +MockWebMIDIAccessor::MockWebMIDIAccessor(blink::WebMIDIAccessorClient* client, TestInterfaces* interfaces) : m_client(client) , m_interfaces(interfaces) { diff --git a/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.h b/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.h index 96d6d7d..68c524c 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.h +++ b/third_party/WebKit/Source/testing/runner/MockWebMIDIAccessor.h @@ -36,7 +36,7 @@ #include "public/platform/WebNonCopyable.h" #include "public/testing/WebTask.h" -namespace WebKit { +namespace blink { class WebMIDIAccessorClient; } @@ -44,12 +44,12 @@ namespace WebTestRunner { class TestInterfaces; -class MockWebMIDIAccessor : public WebKit::WebMIDIAccessor, public WebKit::WebNonCopyable { +class MockWebMIDIAccessor : public blink::WebMIDIAccessor, public blink::WebNonCopyable { public: - explicit MockWebMIDIAccessor(WebKit::WebMIDIAccessorClient*, TestInterfaces*); + explicit MockWebMIDIAccessor(blink::WebMIDIAccessorClient*, TestInterfaces*); virtual ~MockWebMIDIAccessor(); - // WebKit::WebMIDIAccessor implementation. + // blink::WebMIDIAccessor implementation. virtual void startSession() OVERRIDE; virtual void sendMIDIData( unsigned portIndex, @@ -61,7 +61,7 @@ public: WebTaskList* taskList() { return &m_taskList; } private: - WebKit::WebMIDIAccessorClient* m_client; + blink::WebMIDIAccessorClient* m_client; WebTaskList m_taskList; TestInterfaces* m_interfaces; }; diff --git a/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.cpp b/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.cpp index 0ae58d1..b47c2eb 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.cpp @@ -39,7 +39,7 @@ #include "public/platform/WebSourceInfo.h" #include "public/platform/WebVector.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -88,7 +88,7 @@ void MockWebMediaStreamCenter::didStopLocalMediaStream(const WebMediaStream& str tracks[i].source().setReadyState(WebMediaStreamSource::ReadyStateEnded); } -bool MockWebMediaStreamCenter::didStopMediaStreamTrack(const WebKit::WebMediaStreamTrack& track) +bool MockWebMediaStreamCenter::didStopMediaStreamTrack(const blink::WebMediaStreamTrack& track) { track.source().setReadyState(WebMediaStreamSource::ReadyStateEnded); return true; diff --git a/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.h b/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.h index 59eeaa0..23bc3d2 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.h +++ b/third_party/WebKit/Source/testing/runner/MockWebMediaStreamCenter.h @@ -35,24 +35,24 @@ #include "public/platform/WebMediaStreamCenter.h" #include "public/platform/WebNonCopyable.h" -namespace WebKit { +namespace blink { class WebMediaStreamCenterClient; }; namespace WebTestRunner { -class MockWebMediaStreamCenter : public WebKit::WebMediaStreamCenter, public WebKit::WebNonCopyable { +class MockWebMediaStreamCenter : public blink::WebMediaStreamCenter, public blink::WebNonCopyable { public: - explicit MockWebMediaStreamCenter(WebKit::WebMediaStreamCenterClient*); + explicit MockWebMediaStreamCenter(blink::WebMediaStreamCenterClient*); - virtual bool getMediaStreamTrackSources(const WebKit::WebMediaStreamTrackSourcesRequest&) OVERRIDE; - virtual void didEnableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE; - virtual void didDisableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE; - virtual bool didAddMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE; - virtual bool didRemoveMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE; - virtual void didStopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE; - virtual bool didStopMediaStreamTrack(const WebKit::WebMediaStreamTrack&) OVERRIDE; - virtual void didCreateMediaStream(WebKit::WebMediaStream&) OVERRIDE; + virtual bool getMediaStreamTrackSources(const blink::WebMediaStreamTrackSourcesRequest&) OVERRIDE; + virtual void didEnableMediaStreamTrack(const blink::WebMediaStream&, const blink::WebMediaStreamTrack&) OVERRIDE; + virtual void didDisableMediaStreamTrack(const blink::WebMediaStream&, const blink::WebMediaStreamTrack&) OVERRIDE; + virtual bool didAddMediaStreamTrack(const blink::WebMediaStream&, const blink::WebMediaStreamTrack&) OVERRIDE; + virtual bool didRemoveMediaStreamTrack(const blink::WebMediaStream&, const blink::WebMediaStreamTrack&) OVERRIDE; + virtual void didStopLocalMediaStream(const blink::WebMediaStream&) OVERRIDE; + virtual bool didStopMediaStreamTrack(const blink::WebMediaStreamTrack&) OVERRIDE; + virtual void didCreateMediaStream(blink::WebMediaStream&) OVERRIDE; private: MockWebMediaStreamCenter() { } diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.cpp b/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.cpp index 11e81ce..f12daba 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.cpp @@ -30,7 +30,7 @@ #include "public/testing/WebTestDelegate.h" #include <assert.h> -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.h b/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.h index e5bac82..fa903e9 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.h +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCDTMFSenderHandler.h @@ -37,16 +37,16 @@ namespace WebTestRunner { class WebTestDelegate; -class MockWebRTCDTMFSenderHandler : public WebKit::WebRTCDTMFSenderHandler, public WebKit::WebNonCopyable { +class MockWebRTCDTMFSenderHandler : public blink::WebRTCDTMFSenderHandler, public blink::WebNonCopyable { public: - MockWebRTCDTMFSenderHandler(const WebKit::WebMediaStreamTrack&, WebTestDelegate*); + MockWebRTCDTMFSenderHandler(const blink::WebMediaStreamTrack&, WebTestDelegate*); - virtual void setClient(WebKit::WebRTCDTMFSenderHandlerClient*) OVERRIDE; + virtual void setClient(blink::WebRTCDTMFSenderHandlerClient*) OVERRIDE; - virtual WebKit::WebString currentToneBuffer() OVERRIDE; + virtual blink::WebString currentToneBuffer() OVERRIDE; virtual bool canInsertDTMF() OVERRIDE; - virtual bool insertDTMF(const WebKit::WebString& tones, long duration, long interToneGap) OVERRIDE; + virtual bool insertDTMF(const blink::WebString& tones, long duration, long interToneGap) OVERRIDE; // WebTask related methods WebTaskList* taskList() { return &m_taskList; } @@ -55,9 +55,9 @@ public: private: MockWebRTCDTMFSenderHandler(); - WebKit::WebRTCDTMFSenderHandlerClient* m_client; - WebKit::WebMediaStreamTrack m_track; - WebKit::WebString m_toneBuffer; + blink::WebRTCDTMFSenderHandlerClient* m_client; + blink::WebMediaStreamTrack m_track; + blink::WebString m_toneBuffer; WebTaskList m_taskList; WebTestDelegate* m_delegate; }; diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.cpp b/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.cpp index daa3351..45214b3 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.cpp @@ -29,7 +29,7 @@ #include "public/testing/WebTestDelegate.h" #include <assert.h> -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.h b/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.h index 3cdfbaf..6cdff0c 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.h +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCDataChannelHandler.h @@ -36,21 +36,21 @@ namespace WebTestRunner { class WebTestDelegate; -class MockWebRTCDataChannelHandler : public WebKit::WebRTCDataChannelHandler, public WebKit::WebNonCopyable { +class MockWebRTCDataChannelHandler : public blink::WebRTCDataChannelHandler, public blink::WebNonCopyable { public: - MockWebRTCDataChannelHandler(WebKit::WebString label, const WebKit::WebRTCDataChannelInit&, WebTestDelegate*); + MockWebRTCDataChannelHandler(blink::WebString label, const blink::WebRTCDataChannelInit&, WebTestDelegate*); - virtual void setClient(WebKit::WebRTCDataChannelHandlerClient*) OVERRIDE; - virtual WebKit::WebString label() OVERRIDE { return m_label; } + virtual void setClient(blink::WebRTCDataChannelHandlerClient*) OVERRIDE; + virtual blink::WebString label() OVERRIDE { return m_label; } virtual bool isReliable() OVERRIDE { return m_reliable; } virtual bool ordered() const OVERRIDE; virtual unsigned short maxRetransmitTime() const OVERRIDE; virtual unsigned short maxRetransmits() const OVERRIDE; - virtual WebKit::WebString protocol() const OVERRIDE; + virtual blink::WebString protocol() const OVERRIDE; virtual bool negotiated() const OVERRIDE; virtual unsigned short id() const OVERRIDE; virtual unsigned long bufferedAmount() OVERRIDE; - virtual bool sendStringData(const WebKit::WebString&) OVERRIDE; + virtual bool sendStringData(const blink::WebString&) OVERRIDE; virtual bool sendRawData(const char*, size_t) OVERRIDE; virtual void close() OVERRIDE; @@ -60,9 +60,9 @@ public: private: MockWebRTCDataChannelHandler(); - WebKit::WebRTCDataChannelHandlerClient* m_client; - WebKit::WebString m_label; - WebKit::WebRTCDataChannelInit m_init; + blink::WebRTCDataChannelHandlerClient* m_client; + blink::WebString m_label; + blink::WebRTCDataChannelInit m_init; bool m_reliable; WebTaskList m_taskList; WebTestDelegate* m_delegate; diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.cpp b/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.cpp index 1eafcf5..7c64661 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.cpp @@ -48,7 +48,7 @@ #include "public/platform/WebVector.h" #include "public/testing/WebTestDelegate.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -90,7 +90,7 @@ private: class RTCStatsRequestSucceededTask : public WebMethodTask<MockWebRTCPeerConnectionHandler> { public: - RTCStatsRequestSucceededTask(MockWebRTCPeerConnectionHandler* object, const WebKit::WebRTCStatsRequest& request, const WebKit::WebRTCStatsResponse& response) + RTCStatsRequestSucceededTask(MockWebRTCPeerConnectionHandler* object, const blink::WebRTCStatsRequest& request, const blink::WebRTCStatsResponse& response) : WebMethodTask<MockWebRTCPeerConnectionHandler>(object) , m_request(request) , m_response(response) @@ -103,8 +103,8 @@ public: } private: - WebKit::WebRTCStatsRequest m_request; - WebKit::WebRTCStatsResponse m_response; + blink::WebRTCStatsRequest m_request; + blink::WebRTCStatsResponse m_response; }; class RTCVoidRequestTask : public WebMethodTask<MockWebRTCPeerConnectionHandler> { @@ -291,7 +291,7 @@ void MockWebRTCPeerConnectionHandler::getStats(const WebRTCStatsRequest& request m_interfaces->delegate()->postTask(new RTCStatsRequestSucceededTask(this, request, response)); } -WebRTCDataChannelHandler* MockWebRTCPeerConnectionHandler::createDataChannel(const WebString& label, const WebKit::WebRTCDataChannelInit& init) +WebRTCDataChannelHandler* MockWebRTCPeerConnectionHandler::createDataChannel(const WebString& label, const blink::WebRTCDataChannelInit& init) { m_interfaces->delegate()->postTask(new RemoteDataChannelTask(this, m_client, m_interfaces->delegate())); diff --git a/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.h b/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.h index 1e4e823..a5e5857 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.h +++ b/third_party/WebKit/Source/testing/runner/MockWebRTCPeerConnectionHandler.h @@ -39,7 +39,7 @@ #include "public/platform/WebRTCStatsRequest.h" #include "public/testing/WebTask.h" -namespace WebKit { +namespace blink { class WebRTCPeerConnectionHandlerClient; }; @@ -47,26 +47,26 @@ namespace WebTestRunner { class TestInterfaces; -class MockWebRTCPeerConnectionHandler : public WebKit::WebRTCPeerConnectionHandler, public WebKit::WebNonCopyable { +class MockWebRTCPeerConnectionHandler : public blink::WebRTCPeerConnectionHandler, public blink::WebNonCopyable { public: - MockWebRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*, TestInterfaces*); + MockWebRTCPeerConnectionHandler(blink::WebRTCPeerConnectionHandlerClient*, TestInterfaces*); - virtual bool initialize(const WebKit::WebRTCConfiguration&, const WebKit::WebMediaConstraints&) OVERRIDE; + virtual bool initialize(const blink::WebRTCConfiguration&, const blink::WebMediaConstraints&) OVERRIDE; - virtual void createOffer(const WebKit::WebRTCSessionDescriptionRequest&, const WebKit::WebMediaConstraints&) OVERRIDE; - virtual void createAnswer(const WebKit::WebRTCSessionDescriptionRequest&, const WebKit::WebMediaConstraints&) OVERRIDE; - virtual void setLocalDescription(const WebKit::WebRTCVoidRequest&, const WebKit::WebRTCSessionDescription&) OVERRIDE; - virtual void setRemoteDescription(const WebKit::WebRTCVoidRequest&, const WebKit::WebRTCSessionDescription&) OVERRIDE; - virtual WebKit::WebRTCSessionDescription localDescription() OVERRIDE; - virtual WebKit::WebRTCSessionDescription remoteDescription() OVERRIDE; - virtual bool updateICE(const WebKit::WebRTCConfiguration&, const WebKit::WebMediaConstraints&) OVERRIDE; - virtual bool addICECandidate(const WebKit::WebRTCICECandidate&) OVERRIDE; - virtual bool addICECandidate(const WebKit::WebRTCVoidRequest&, const WebKit::WebRTCICECandidate&) OVERRIDE; - virtual bool addStream(const WebKit::WebMediaStream&, const WebKit::WebMediaConstraints&) OVERRIDE; - virtual void removeStream(const WebKit::WebMediaStream&) OVERRIDE; - virtual void getStats(const WebKit::WebRTCStatsRequest&) OVERRIDE; - virtual WebKit::WebRTCDataChannelHandler* createDataChannel(const WebKit::WebString& label, const WebKit::WebRTCDataChannelInit&) OVERRIDE; - virtual WebKit::WebRTCDTMFSenderHandler* createDTMFSender(const WebKit::WebMediaStreamTrack&) OVERRIDE; + virtual void createOffer(const blink::WebRTCSessionDescriptionRequest&, const blink::WebMediaConstraints&) OVERRIDE; + virtual void createAnswer(const blink::WebRTCSessionDescriptionRequest&, const blink::WebMediaConstraints&) OVERRIDE; + virtual void setLocalDescription(const blink::WebRTCVoidRequest&, const blink::WebRTCSessionDescription&) OVERRIDE; + virtual void setRemoteDescription(const blink::WebRTCVoidRequest&, const blink::WebRTCSessionDescription&) OVERRIDE; + virtual blink::WebRTCSessionDescription localDescription() OVERRIDE; + virtual blink::WebRTCSessionDescription remoteDescription() OVERRIDE; + virtual bool updateICE(const blink::WebRTCConfiguration&, const blink::WebMediaConstraints&) OVERRIDE; + virtual bool addICECandidate(const blink::WebRTCICECandidate&) OVERRIDE; + virtual bool addICECandidate(const blink::WebRTCVoidRequest&, const blink::WebRTCICECandidate&) OVERRIDE; + virtual bool addStream(const blink::WebMediaStream&, const blink::WebMediaConstraints&) OVERRIDE; + virtual void removeStream(const blink::WebMediaStream&) OVERRIDE; + virtual void getStats(const blink::WebRTCStatsRequest&) OVERRIDE; + virtual blink::WebRTCDataChannelHandler* createDataChannel(const blink::WebString& label, const blink::WebRTCDataChannelInit&) OVERRIDE; + virtual blink::WebRTCDTMFSenderHandler* createDTMFSender(const blink::WebMediaStreamTrack&) OVERRIDE; virtual void stop() OVERRIDE; // WebTask related methods @@ -75,11 +75,11 @@ public: private: MockWebRTCPeerConnectionHandler() { } - WebKit::WebRTCPeerConnectionHandlerClient* m_client; + blink::WebRTCPeerConnectionHandlerClient* m_client; bool m_stopped; WebTaskList m_taskList; - WebKit::WebRTCSessionDescription m_localDescription; - WebKit::WebRTCSessionDescription m_remoteDescription; + blink::WebRTCSessionDescription m_localDescription; + blink::WebRTCSessionDescription m_remoteDescription; int m_streamCount; TestInterfaces* m_interfaces; }; diff --git a/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.cpp b/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.cpp index b21a24d..8b0e778 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.cpp @@ -32,7 +32,7 @@ #if ENABLE_INPUT_SPEECH -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.h b/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.h index 0606e22..e0d6b59 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.h +++ b/third_party/WebKit/Source/testing/runner/MockWebSpeechInputController.h @@ -36,7 +36,7 @@ #include <string> #include <vector> -namespace WebKit { +namespace blink { class WebSecurityOrigin; class WebSpeechInputListener; class WebString; @@ -46,18 +46,18 @@ namespace WebTestRunner { class WebTestDelegate; -class MockWebSpeechInputController : public WebKit::WebSpeechInputController, public WebKit::WebNonCopyable { +class MockWebSpeechInputController : public blink::WebSpeechInputController, public blink::WebNonCopyable { public: - explicit MockWebSpeechInputController(WebKit::WebSpeechInputListener*); + explicit MockWebSpeechInputController(blink::WebSpeechInputListener*); ~MockWebSpeechInputController(); - void addMockRecognitionResult(const WebKit::WebString& result, double confidence, const WebKit::WebString& language); + void addMockRecognitionResult(const blink::WebString& result, double confidence, const blink::WebString& language); void setDumpRect(bool); void clearResults(); void setDelegate(WebTestDelegate*); // WebSpeechInputController implementation: - virtual bool startRecognition(int requestId, const WebKit::WebRect& elementRect, const WebKit::WebString& language, const WebKit::WebString& grammar, const WebKit::WebSecurityOrigin&) OVERRIDE; + virtual bool startRecognition(int requestId, const blink::WebRect& elementRect, const blink::WebString& language, const blink::WebString& grammar, const blink::WebSecurityOrigin&) OVERRIDE; virtual void cancelRecognition(int requestId) OVERRIDE; virtual void stopRecording(int requestId) OVERRIDE; @@ -75,18 +75,18 @@ private: virtual void runIfValid() OVERRIDE; }; - WebKit::WebSpeechInputListener* m_listener; + blink::WebSpeechInputListener* m_listener; WebTaskList m_taskList; SpeechTask* m_speechTask; bool m_recording; int m_requestId; - WebKit::WebRect m_requestRect; + blink::WebRect m_requestRect; std::string m_language; - std::map<std::string, std::vector<WebKit::WebSpeechInputResult> > m_recognitionResults; - std::vector<WebKit::WebSpeechInputResult> m_resultsForEmptyLanguage; + std::map<std::string, std::vector<blink::WebSpeechInputResult> > m_recognitionResults; + std::vector<blink::WebSpeechInputResult> m_resultsForEmptyLanguage; bool m_dumpRect; WebTestDelegate* m_delegate; diff --git a/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.cpp b/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.cpp index 29e4727..a1a65dd 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.cpp @@ -29,7 +29,7 @@ #include "public/web/WebSpeechRecognitionResult.h" #include "public/web/WebSpeechRecognizerClient.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.h b/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.h index 5796996..e36dce7 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.h +++ b/third_party/WebKit/Source/testing/runner/MockWebSpeechRecognizer.h @@ -33,7 +33,7 @@ #include <deque> #include <vector> -namespace WebKit { +namespace blink { class WebSpeechRecognitionHandle; class WebSpeechRecognitionParams; class WebSpeechRecognizerClient; @@ -43,7 +43,7 @@ namespace WebTestRunner { class WebTestDelegate; -class MockWebSpeechRecognizer : public WebKit::WebSpeechRecognizer, public WebKit::WebNonCopyable { +class MockWebSpeechRecognizer : public blink::WebSpeechRecognizer, public blink::WebNonCopyable { public: MockWebSpeechRecognizer(); ~MockWebSpeechRecognizer(); @@ -51,18 +51,18 @@ public: void setDelegate(WebTestDelegate*); // WebSpeechRecognizer implementation: - virtual void start(const WebKit::WebSpeechRecognitionHandle&, const WebKit::WebSpeechRecognitionParams&, WebKit::WebSpeechRecognizerClient*) OVERRIDE; - virtual void stop(const WebKit::WebSpeechRecognitionHandle&, WebKit::WebSpeechRecognizerClient*) OVERRIDE; - virtual void abort(const WebKit::WebSpeechRecognitionHandle&, WebKit::WebSpeechRecognizerClient*) OVERRIDE; + virtual void start(const blink::WebSpeechRecognitionHandle&, const blink::WebSpeechRecognitionParams&, blink::WebSpeechRecognizerClient*) OVERRIDE; + virtual void stop(const blink::WebSpeechRecognitionHandle&, blink::WebSpeechRecognizerClient*) OVERRIDE; + virtual void abort(const blink::WebSpeechRecognitionHandle&, blink::WebSpeechRecognizerClient*) OVERRIDE; // Methods accessed by layout tests: - void addMockResult(const WebKit::WebString& transcript, float confidence); - void setError(const WebKit::WebString& error, const WebKit::WebString& message); + void addMockResult(const blink::WebString& transcript, float confidence); + void setError(const blink::WebString& error, const blink::WebString& message); bool wasAborted() const { return m_wasAborted; } // Methods accessed from Task objects: - WebKit::WebSpeechRecognizerClient* client() { return m_client; } - WebKit::WebSpeechRecognitionHandle& handle() { return m_handle; } + blink::WebSpeechRecognizerClient* client() { return m_client; } + blink::WebSpeechRecognitionHandle& handle() { return m_handle; } WebTaskList* taskList() { return &m_taskList; } class Task { @@ -79,9 +79,9 @@ private: void clearTaskQueue(); WebTaskList m_taskList; - WebKit::WebSpeechRecognitionHandle m_handle; - WebKit::WebSpeechRecognizerClient* m_client; - std::vector<WebKit::WebString> m_mockTranscripts; + blink::WebSpeechRecognitionHandle m_handle; + blink::WebSpeechRecognizerClient* m_client; + std::vector<blink::WebString> m_mockTranscripts; std::vector<float> m_mockConfidences; bool m_wasAborted; diff --git a/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.cpp b/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.cpp index 6e8b37b..ae156d2 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.cpp +++ b/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.cpp @@ -34,7 +34,7 @@ #include "public/platform/WebString.h" #include "public/testing/WebTestDelegate.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.h b/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.h index e872816..8cb16b4 100644 --- a/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.h +++ b/third_party/WebKit/Source/testing/runner/MockWebValidationMessageClient.h @@ -39,16 +39,16 @@ namespace WebTestRunner { class WebTestDelegate; -class MockWebValidationMessageClient : public WebKit::WebValidationMessageClient, public WebKit::WebNonCopyable { +class MockWebValidationMessageClient : public blink::WebValidationMessageClient, public blink::WebNonCopyable { public: MockWebValidationMessageClient(); virtual ~MockWebValidationMessageClient(); void setDelegate(WebTestDelegate*); private: - virtual void showValidationMessage(const WebKit::WebRect&, const WebKit::WebString&, const WebKit::WebString&, WebKit::WebTextDirection) OVERRIDE; + virtual void showValidationMessage(const blink::WebRect&, const blink::WebString&, const blink::WebString&, blink::WebTextDirection) OVERRIDE; virtual void hideValidationMessage() OVERRIDE; - virtual void moveValidationMessage(const WebKit::WebRect&) OVERRIDE; + virtual void moveValidationMessage(const blink::WebRect&) OVERRIDE; WebTestDelegate* m_delegate; }; diff --git a/third_party/WebKit/Source/testing/runner/NotificationPresenter.cpp b/third_party/WebKit/Source/testing/runner/NotificationPresenter.cpp index 2d8a39e..c19ea39 100644 --- a/third_party/WebKit/Source/testing/runner/NotificationPresenter.cpp +++ b/third_party/WebKit/Source/testing/runner/NotificationPresenter.cpp @@ -40,7 +40,7 @@ #include "public/web/WebSecurityOrigin.h" #include <url/gurl.h> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -141,7 +141,7 @@ void NotificationPresenter::cancel(const WebNotification& notification) m_activeNotifications.erase(id); } -void NotificationPresenter::objectDestroyed(const WebKit::WebNotification& notification) +void NotificationPresenter::objectDestroyed(const blink::WebNotification& notification) { WebString identifier = identifierForNotification(notification); string id(identifier.utf8()); diff --git a/third_party/WebKit/Source/testing/runner/NotificationPresenter.h b/third_party/WebKit/Source/testing/runner/NotificationPresenter.h index 241151d..8c42642 100644 --- a/third_party/WebKit/Source/testing/runner/NotificationPresenter.h +++ b/third_party/WebKit/Source/testing/runner/NotificationPresenter.h @@ -43,7 +43,7 @@ namespace WebTestRunner { class WebTestDelegate; // A class that implements WebNotificationPresenter for the TestRunner library. -class NotificationPresenter : public WebKit::WebNotificationPresenter, public WebKit::WebNonCopyable { +class NotificationPresenter : public blink::WebNotificationPresenter, public blink::WebNonCopyable { public: NotificationPresenter(); virtual ~NotificationPresenter(); @@ -51,20 +51,20 @@ public: void setDelegate(WebTestDelegate* delegate) { m_delegate = delegate; } // Called by the TestRunner to simulate a user granting permission. - void grantPermission(const WebKit::WebString& origin); + void grantPermission(const blink::WebString& origin); // Called by the TestRunner to simulate a user clicking on a notification. - bool simulateClick(const WebKit::WebString& notificationIdentifier); + bool simulateClick(const blink::WebString& notificationIdentifier); // Called by the TestRunner to cancel all active notications. void cancelAllActiveNotifications(); - // WebKit::WebNotificationPresenter interface - virtual bool show(const WebKit::WebNotification&); - virtual void cancel(const WebKit::WebNotification&); - virtual void objectDestroyed(const WebKit::WebNotification&); - virtual Permission checkPermission(const WebKit::WebSecurityOrigin&); - virtual void requestPermission(const WebKit::WebSecurityOrigin&, WebKit::WebNotificationPermissionCallback*); + // blink::WebNotificationPresenter interface + virtual bool show(const blink::WebNotification&); + virtual void cancel(const blink::WebNotification&); + virtual void objectDestroyed(const blink::WebNotification&); + virtual Permission checkPermission(const blink::WebSecurityOrigin&); + virtual void requestPermission(const blink::WebSecurityOrigin&, blink::WebNotificationPermissionCallback*); void reset() { m_allowedOrigins.clear(); } @@ -75,7 +75,7 @@ private: std::set<std::string> m_allowedOrigins; // Map of active notifications. - std::map<std::string, WebKit::WebNotification> m_activeNotifications; + std::map<std::string, blink::WebNotification> m_activeNotifications; // Map of active replacement IDs to the titles of those notifications std::map<std::string, std::string> m_replacements; diff --git a/third_party/WebKit/Source/testing/runner/SpellCheckClient.cpp b/third_party/WebKit/Source/testing/runner/SpellCheckClient.cpp index 88d646e..78d11e2 100644 --- a/third_party/WebKit/Source/testing/runner/SpellCheckClient.cpp +++ b/third_party/WebKit/Source/testing/runner/SpellCheckClient.cpp @@ -35,7 +35,7 @@ #include "public/web/WebTextCheckingCompletion.h" #include "public/web/WebTextCheckingResult.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -72,7 +72,7 @@ void SpellCheckClient::setDelegate(WebTestDelegate* delegate) m_delegate = delegate; } -// WebKit::WebSpellCheckClient +// blink::WebSpellCheckClient void SpellCheckClient::spellCheck(const WebString& text, int& misspelledOffset, int& misspelledLength, WebVector<WebString>* optionalSuggestions) { // Check the spelling of the given text. diff --git a/third_party/WebKit/Source/testing/runner/SpellCheckClient.h b/third_party/WebKit/Source/testing/runner/SpellCheckClient.h index f46287f..290c8fd 100644 --- a/third_party/WebKit/Source/testing/runner/SpellCheckClient.h +++ b/third_party/WebKit/Source/testing/runner/SpellCheckClient.h @@ -40,7 +40,7 @@ namespace WebTestRunner { class WebTestDelegate; -class SpellCheckClient : public WebKit::WebSpellCheckClient, public WebKit::WebNonCopyable { +class SpellCheckClient : public blink::WebSpellCheckClient, public blink::WebNonCopyable { public: SpellCheckClient(); virtual ~SpellCheckClient(); @@ -50,14 +50,14 @@ public: WebTaskList* taskList() { return &m_taskList; } MockSpellCheck* mockSpellCheck() { return &m_spellcheck; } - // WebKit::WebSpellCheckClient implementation. - virtual void spellCheck(const WebKit::WebString&, int& offset, int& length, WebKit::WebVector<WebKit::WebString>* optionalSuggestions); - virtual void checkTextOfParagraph(const WebKit::WebString&, WebKit::WebTextCheckingTypeMask, WebKit::WebVector<WebKit::WebTextCheckingResult>*); - virtual void requestCheckingOfText(const WebKit::WebString&, - const WebKit::WebVector<uint32_t>&, - const WebKit::WebVector<unsigned>&, - WebKit::WebTextCheckingCompletion*); - virtual WebKit::WebString autoCorrectWord(const WebKit::WebString&); + // blink::WebSpellCheckClient implementation. + virtual void spellCheck(const blink::WebString&, int& offset, int& length, blink::WebVector<blink::WebString>* optionalSuggestions); + virtual void checkTextOfParagraph(const blink::WebString&, blink::WebTextCheckingTypeMask, blink::WebVector<blink::WebTextCheckingResult>*); + virtual void requestCheckingOfText(const blink::WebString&, + const blink::WebVector<uint32_t>&, + const blink::WebVector<unsigned>&, + blink::WebTextCheckingCompletion*); + virtual blink::WebString autoCorrectWord(const blink::WebString&); private: void finishLastTextCheck(); @@ -65,8 +65,8 @@ private: // The mock spellchecker used in spellCheck(). MockSpellCheck m_spellcheck; - WebKit::WebString m_lastRequestedTextCheckString; - WebKit::WebTextCheckingCompletion* m_lastRequestedTextCheckingCompletion; + blink::WebString m_lastRequestedTextCheckString; + blink::WebTextCheckingCompletion* m_lastRequestedTextCheckingCompletion; WebTaskList m_taskList; diff --git a/third_party/WebKit/Source/testing/runner/TestInterfaces.cpp b/third_party/WebKit/Source/testing/runner/TestInterfaces.cpp index 8756149..56a3fb4 100644 --- a/third_party/WebKit/Source/testing/runner/TestInterfaces.cpp +++ b/third_party/WebKit/Source/testing/runner/TestInterfaces.cpp @@ -44,7 +44,7 @@ #include "public/web/WebView.h" #include <string> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -57,7 +57,7 @@ TestInterfaces::TestInterfaces() , m_testRunner(new TestRunner(this)) , m_delegate(0) { - WebKit::setLayoutTestMode(true); + blink::setLayoutTestMode(true); // NOTE: please don't put feature specific enable flags here, // instead add them to RuntimeEnabledFeatures.in diff --git a/third_party/WebKit/Source/testing/runner/TestInterfaces.h b/third_party/WebKit/Source/testing/runner/TestInterfaces.h index cb28f31..990ec93 100644 --- a/third_party/WebKit/Source/testing/runner/TestInterfaces.h +++ b/third_party/WebKit/Source/testing/runner/TestInterfaces.h @@ -42,7 +42,7 @@ #include "WebTestThemeEngineMac.h" #endif -namespace WebKit { +namespace blink { class WebFrame; class WebThemeEngine; class WebURL; @@ -59,18 +59,18 @@ class TextInputController; class WebTestDelegate; class WebTestProxyBase; -class TestInterfaces : public WebKit::WebNonCopyable { +class TestInterfaces : public blink::WebNonCopyable { public: TestInterfaces(); ~TestInterfaces(); - void setWebView(WebKit::WebView*, WebTestProxyBase*); + void setWebView(blink::WebView*, WebTestProxyBase*); void setDelegate(WebTestDelegate*); - void bindTo(WebKit::WebFrame*); + void bindTo(blink::WebFrame*); void resetTestHelperControllers(); void resetAll(); void setTestIsRunning(bool); - void configureForTestWithURL(const WebKit::WebURL&, bool generatePixels); + void configureForTestWithURL(const blink::WebURL&, bool generatePixels); void windowOpened(WebTestProxyBase*); void windowClosed(WebTestProxyBase*); @@ -81,7 +81,7 @@ public: WebTestDelegate* delegate(); WebTestProxyBase* proxy(); const std::vector<WebTestProxyBase*>& windowList(); - WebKit::WebThemeEngine* themeEngine(); + blink::WebThemeEngine* themeEngine(); private: std::auto_ptr<AccessibilityController> m_accessibilityController; diff --git a/third_party/WebKit/Source/testing/runner/TestPlugin.cpp b/third_party/WebKit/Source/testing/runner/TestPlugin.cpp index c93b097..2350919 100644 --- a/third_party/WebKit/Source/testing/runner/TestPlugin.cpp +++ b/third_party/WebKit/Source/testing/runner/TestPlugin.cpp @@ -37,7 +37,7 @@ #include "public/web/WebTouchPoint.h" #include "public/web/WebUserGestureIndicator.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -276,7 +276,7 @@ void TestPlugin::updateGeometry(const WebRect& frameRect, const WebRect& clipRec m_mailboxChanged = true; } -bool TestPlugin::prepareMailbox(WebKit::WebExternalTextureMailbox* mailbox, WebKit::WebExternalBitmap*) +bool TestPlugin::prepareMailbox(blink::WebExternalTextureMailbox* mailbox, blink::WebExternalBitmap*) { if (!m_mailboxChanged) return false; @@ -285,7 +285,7 @@ bool TestPlugin::prepareMailbox(WebKit::WebExternalTextureMailbox* mailbox, WebK return true; } -void TestPlugin::mailboxReleased(const WebKit::WebExternalTextureMailbox&) +void TestPlugin::mailboxReleased(const blink::WebExternalTextureMailbox&) { } diff --git a/third_party/WebKit/Source/testing/runner/TestPlugin.h b/third_party/WebKit/Source/testing/runner/TestPlugin.h index 6664239..6ef4c6b 100644 --- a/third_party/WebKit/Source/testing/runner/TestPlugin.h +++ b/third_party/WebKit/Source/testing/runner/TestPlugin.h @@ -39,7 +39,7 @@ namespace WebTestRunner { class WebTestDelegate; -// A fake implemention of WebKit::WebPlugin for testing purposes. +// A fake implemention of blink::WebPlugin for testing purposes. // // It uses WebGraphicsContext3D to paint a scene consisiting of a primitive // over a background. The primitive and background can be customized using @@ -51,40 +51,40 @@ class WebTestDelegate; // // Whether the plugin accepts touch events or not can be customized using the // 'accepts-touch' plugin parameter (defaults to false). -class TestPlugin : public WebKit::WebPlugin, public WebKit::WebExternalTextureLayerClient, public WebKit::WebNonCopyable { +class TestPlugin : public blink::WebPlugin, public blink::WebExternalTextureLayerClient, public blink::WebNonCopyable { public: - static TestPlugin* create(WebKit::WebFrame*, const WebKit::WebPluginParams&, WebTestDelegate*); + static TestPlugin* create(blink::WebFrame*, const blink::WebPluginParams&, WebTestDelegate*); virtual ~TestPlugin(); - static const WebKit::WebString& mimeType(); + static const blink::WebString& mimeType(); // WebPlugin methods: - virtual bool initialize(WebKit::WebPluginContainer*); + virtual bool initialize(blink::WebPluginContainer*); virtual void destroy(); virtual NPObject* scriptableObject() { return 0; } virtual bool canProcessDrag() const { return m_canProcessDrag; } - virtual void paint(WebKit::WebCanvas*, const WebKit::WebRect&) { } - virtual void updateGeometry(const WebKit::WebRect& frameRect, const WebKit::WebRect& clipRect, const WebKit::WebVector<WebKit::WebRect>& cutOutsRects, bool isVisible); + virtual void paint(blink::WebCanvas*, const blink::WebRect&) { } + virtual void updateGeometry(const blink::WebRect& frameRect, const blink::WebRect& clipRect, const blink::WebVector<blink::WebRect>& cutOutsRects, bool isVisible); virtual void updateFocus(bool) { } virtual void updateVisibility(bool) { } virtual bool acceptsInputEvents() { return true; } - virtual bool handleInputEvent(const WebKit::WebInputEvent&, WebKit::WebCursorInfo&); - virtual bool handleDragStatusUpdate(WebKit::WebDragStatus, const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebPoint& position, const WebKit::WebPoint& screenPosition); - virtual void didReceiveResponse(const WebKit::WebURLResponse&) { } + virtual bool handleInputEvent(const blink::WebInputEvent&, blink::WebCursorInfo&); + virtual bool handleDragStatusUpdate(blink::WebDragStatus, const blink::WebDragData&, blink::WebDragOperationsMask, const blink::WebPoint& position, const blink::WebPoint& screenPosition); + virtual void didReceiveResponse(const blink::WebURLResponse&) { } virtual void didReceiveData(const char* data, int dataLength) { } virtual void didFinishLoading() { } - virtual void didFailLoading(const WebKit::WebURLError&) { } - virtual void didFinishLoadingFrameRequest(const WebKit::WebURL&, void* notifyData) { } - virtual void didFailLoadingFrameRequest(const WebKit::WebURL&, void* notifyData, const WebKit::WebURLError&) { } + virtual void didFailLoading(const blink::WebURLError&) { } + virtual void didFinishLoadingFrameRequest(const blink::WebURL&, void* notifyData) { } + virtual void didFailLoadingFrameRequest(const blink::WebURL&, void* notifyData, const blink::WebURLError&) { } virtual bool isPlaceholder() { return false; } // WebExternalTextureLayerClient methods: - virtual WebKit::WebGraphicsContext3D* context() { return 0; } - virtual bool prepareMailbox(WebKit::WebExternalTextureMailbox*, WebKit::WebExternalBitmap*); - virtual void mailboxReleased(const WebKit::WebExternalTextureMailbox&); + virtual blink::WebGraphicsContext3D* context() { return 0; } + virtual bool prepareMailbox(blink::WebExternalTextureMailbox*, blink::WebExternalBitmap*); + virtual void mailboxReleased(const blink::WebExternalTextureMailbox&); private: - TestPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&, WebTestDelegate*); + TestPlugin(blink::WebFrame*, const blink::WebPluginParams&, WebTestDelegate*); enum Primitive { PrimitiveNone, @@ -116,10 +116,10 @@ private: }; // Functions for parsing plugin parameters. - Primitive parsePrimitive(const WebKit::WebString&); - void parseColor(const WebKit::WebString&, unsigned color[3]); - float parseOpacity(const WebKit::WebString&); - bool parseBoolean(const WebKit::WebString&); + Primitive parsePrimitive(const blink::WebString&); + void parseColor(const blink::WebString&, unsigned color[3]); + float parseOpacity(const blink::WebString&); + bool parseBoolean(const blink::WebString&); // Functions for loading and drawing scene. bool initScene(); @@ -131,20 +131,20 @@ private: unsigned loadShader(unsigned type, const std::string& source); unsigned loadProgram(const std::string& vertexSource, const std::string& fragmentSource); - WebKit::WebFrame* m_frame; + blink::WebFrame* m_frame; WebTestDelegate* m_delegate; - WebKit::WebPluginContainer* m_container; + blink::WebPluginContainer* m_container; - WebKit::WebRect m_rect; - WebKit::WebGraphicsContext3D* m_context; + blink::WebRect m_rect; + blink::WebGraphicsContext3D* m_context; unsigned m_colorTexture; - WebKit::WebExternalTextureMailbox m_mailbox; + blink::WebExternalTextureMailbox m_mailbox; bool m_mailboxChanged; unsigned m_framebuffer; Scene m_scene; - std::auto_ptr<WebKit::WebExternalTextureLayer> m_layer; + std::auto_ptr<blink::WebExternalTextureLayer> m_layer; - WebKit::WebPluginContainer::TouchEventRequestType m_touchEventRequest; + blink::WebPluginContainer::TouchEventRequestType m_touchEventRequest; // Requests touch events from the WebPluginContainerImpl multiple times to tickle webkit.org/b/108381 bool m_reRequestTouchEvents; bool m_printEventDetails; diff --git a/third_party/WebKit/Source/testing/runner/TestRunner.cpp b/third_party/WebKit/Source/testing/runner/TestRunner.cpp index 27c95d8..1406112 100644 --- a/third_party/WebKit/Source/testing/runner/TestRunner.cpp +++ b/third_party/WebKit/Source/testing/runner/TestRunner.cpp @@ -69,7 +69,7 @@ #include "public/web/linux/WebFontRendering.h" #endif -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -729,7 +729,7 @@ bool TestRunner::isPointerLocked() return m_pointerLocked; } -void TestRunner::setToolTipText(const WebKit::WebString& text) +void TestRunner::setToolTipText(const blink::WebString& text) { m_tooltipText.set(text.utf8()); } @@ -739,7 +739,7 @@ bool TestRunner::midiAccessorResult() return m_midiAccessorResult; } -TestRunner::TestPageOverlay::TestPageOverlay(WebKit::WebView* webView) : m_webView(webView) +TestRunner::TestPageOverlay::TestPageOverlay(blink::WebView* webView) : m_webView(webView) { } @@ -747,7 +747,7 @@ TestRunner::TestPageOverlay::~TestPageOverlay() { } -void TestRunner::TestPageOverlay::paintPageOverlay(WebKit::WebCanvas* canvas) +void TestRunner::TestPageOverlay::paintPageOverlay(blink::WebCanvas* canvas) { SkRect rect = SkRect::MakeWH(m_webView->size().width, m_webView->size().height); SkPaint paint; @@ -939,7 +939,7 @@ public: bool run(WebTestDelegate*, WebView* webView) { webView->mainFrame()->loadHTMLString( - WebKit::WebData(m_html.data(), m_html.length()), m_baseURL, m_unreachableURL); + blink::WebData(m_html.data(), m_html.length()), m_baseURL, m_unreachableURL); return true; } @@ -1249,7 +1249,7 @@ void TestRunner::addOriginAccessWhitelistEntry(const CppArgumentList& arguments, || !arguments[2].isString() || !arguments[3].isBool()) return; - WebKit::WebURL url(GURL(arguments[0].toString())); + blink::WebURL url(GURL(arguments[0].toString())); if (!url.isValid()) return; @@ -1268,7 +1268,7 @@ void TestRunner::removeOriginAccessWhitelistEntry(const CppArgumentList& argumen || !arguments[2].isString() || !arguments[3].isBool()) return; - WebKit::WebURL url(GURL(arguments[0].toString())); + blink::WebURL url(GURL(arguments[0].toString())); if (!url.isValid()) return; @@ -1420,13 +1420,13 @@ void TestRunner::setTextDirection(const CppArgumentList& arguments, CppVariant* // Map a direction name to a WebTextDirection value. std::string directionName = arguments[0].toString(); - WebKit::WebTextDirection direction; + blink::WebTextDirection direction; if (directionName == "auto") - direction = WebKit::WebTextDirectionDefault; + direction = blink::WebTextDirectionDefault; else if (directionName == "rtl") - direction = WebKit::WebTextDirectionRightToLeft; + direction = blink::WebTextDirectionRightToLeft; else if (directionName == "ltr") - direction = WebKit::WebTextDirectionLeftToRight; + direction = blink::WebTextDirectionLeftToRight; else return; @@ -1477,11 +1477,11 @@ void TestRunner::enableAutoResizeMode(const CppArgumentList& arguments, CppVaria } int minWidth = cppVariantToInt32(arguments[0]); int minHeight = cppVariantToInt32(arguments[1]); - WebKit::WebSize minSize(minWidth, minHeight); + blink::WebSize minSize(minWidth, minHeight); int maxWidth = cppVariantToInt32(arguments[2]); int maxHeight = cppVariantToInt32(arguments[3]); - WebKit::WebSize maxSize(maxWidth, maxHeight); + blink::WebSize maxSize(maxWidth, maxHeight); m_delegate->enableAutoResizeMode(minSize, maxSize); result->set(true); @@ -1495,7 +1495,7 @@ void TestRunner::disableAutoResizeMode(const CppArgumentList& arguments, CppVari } int newWidth = cppVariantToInt32(arguments[0]); int newHeight = cppVariantToInt32(arguments[1]); - WebKit::WebSize newSize(newWidth, newHeight); + blink::WebSize newSize(newWidth, newHeight); m_delegate->disableAutoResizeMode(newSize); result->set(true); diff --git a/third_party/WebKit/Source/testing/runner/TestRunner.h b/third_party/WebKit/Source/testing/runner/TestRunner.h index 6bead3b..b12cdd9 100644 --- a/third_party/WebKit/Source/testing/runner/TestRunner.h +++ b/third_party/WebKit/Source/testing/runner/TestRunner.h @@ -48,7 +48,7 @@ #include <set> #include <string> -namespace WebKit { +namespace blink { class WebArrayBufferView; class WebNotificationPresenter; class WebPageOverlay; @@ -70,7 +70,7 @@ public: virtual ~TestRunner(); void setDelegate(WebTestDelegate*); - void setWebView(WebKit::WebView*, WebTestProxyBase*); + void setWebView(blink::WebView*, WebTestProxyBase*); void reset(); @@ -82,9 +82,9 @@ public: // WebTestRunner implementation. virtual bool shouldGeneratePixelResults() OVERRIDE; virtual bool shouldDumpAsAudio() const OVERRIDE; - virtual const WebKit::WebArrayBufferView* audioData() const OVERRIDE; + virtual const blink::WebArrayBufferView* audioData() const OVERRIDE; virtual bool shouldDumpBackForwardList() const OVERRIDE; - virtual WebKit::WebPermissionClient* webPermissions() const OVERRIDE; + virtual blink::WebPermissionClient* webPermissions() const OVERRIDE; // Methods used by WebTestProxyBase. bool shouldDumpSelectionRect() const; @@ -119,19 +119,19 @@ public: bool deferMainResourceDataLoad() const; bool shouldStayOnPageAfterHandlingBeforeUnload() const; const std::set<std::string>* httpHeadersToClear() const; - void setTopLoadingFrame(WebKit::WebFrame*, bool); - WebKit::WebFrame* topLoadingFrame() const; + void setTopLoadingFrame(blink::WebFrame*, bool); + blink::WebFrame* topLoadingFrame() const; void policyDelegateDone(); bool policyDelegateEnabled() const; bool policyDelegateIsPermissive() const; bool policyDelegateShouldNotifyDone() const; bool shouldInterceptPostMessage() const; bool shouldDumpResourcePriorities() const; - WebKit::WebNotificationPresenter* notificationPresenter() const; + blink::WebNotificationPresenter* notificationPresenter() const; bool requestPointerLock(); void requestPointerUnlock(); bool isPointerLocked(); - void setToolTipText(const WebKit::WebString&); + void setToolTipText(const blink::WebString&); bool midiAccessorResult(); @@ -141,7 +141,7 @@ public: virtual ~WorkItem() { } // Returns true if this started a load. - virtual bool run(WebTestDelegate*, WebKit::WebView*) = 0; + virtual bool run(WebTestDelegate*, blink::WebView*) = 0; }; private: @@ -532,13 +532,13 @@ private: private: CallbackMethodType m_callback; }; - class TestPageOverlay : public WebKit::WebPageOverlay { + class TestPageOverlay : public blink::WebPageOverlay { public: - explicit TestPageOverlay(WebKit::WebView*); - virtual void paintPageOverlay(WebKit::WebCanvas*) OVERRIDE; + explicit TestPageOverlay(blink::WebView*); + virtual void paintPageOverlay(blink::WebCanvas*) OVERRIDE; virtual ~TestPageOverlay(); private: - WebKit::WebView* m_webView; + blink::WebView* m_webView; }; void didAcquirePointerLockInternal(); void didNotAcquirePointerLockInternal(); @@ -546,7 +546,7 @@ private: bool cppVariantToBool(const CppVariant&); int32_t cppVariantToInt32(const CppVariant&); - WebKit::WebString cppVariantToWebString(const CppVariant&); + blink::WebString cppVariantToWebString(const CppVariant&); void printErrorMessage(const std::string&); @@ -579,7 +579,7 @@ private: WorkQueue m_workQueue; - WebKit::WebURL m_userStyleSheetLocation; + blink::WebURL m_userStyleSheetLocation; // globalFlag is used by a number of layout tests in http/tests/security/dataURL. CppVariant m_globalFlag; @@ -706,19 +706,19 @@ private: std::set<std::string> m_httpHeadersToClear; // WAV audio data is stored here. - WebKit::WebArrayBufferView m_audioData; + blink::WebArrayBufferView m_audioData; // Used for test timeouts. WebTaskList m_taskList; TestInterfaces* m_testInterfaces; WebTestDelegate* m_delegate; - WebKit::WebView* m_webView; + blink::WebView* m_webView; TestPageOverlay* m_pageOverlay; WebTestProxyBase* m_proxy; // This is non-0 IFF a load is in progress. - WebKit::WebFrame* m_topLoadingFrame; + blink::WebFrame* m_topLoadingFrame; // WebPermissionClient mock object. std::auto_ptr<WebPermissions> m_webPermissions; diff --git a/third_party/WebKit/Source/testing/runner/TextInputController.cpp b/third_party/WebKit/Source/testing/runner/TextInputController.cpp index c25cfab..4b875ea 100644 --- a/third_party/WebKit/Source/testing/runner/TextInputController.cpp +++ b/third_party/WebKit/Source/testing/runner/TextInputController.cpp @@ -41,7 +41,7 @@ #include "public/web/WebView.h" #include <string> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/TextInputController.h b/third_party/WebKit/Source/testing/runner/TextInputController.h index 864d0ed..60ce666 100644 --- a/third_party/WebKit/Source/testing/runner/TextInputController.h +++ b/third_party/WebKit/Source/testing/runner/TextInputController.h @@ -37,7 +37,7 @@ #include "CppBoundClass.h" -namespace WebKit { +namespace blink { class WebView; } @@ -47,7 +47,7 @@ class TextInputController : public CppBoundClass { public: TextInputController(); - void setWebView(WebKit::WebView* webView) { m_webView = webView; } + void setWebView(blink::WebView* webView) { m_webView = webView; } void insertText(const CppArgumentList&, CppVariant*); void doCommand(const CppArgumentList&, CppVariant*); @@ -60,7 +60,7 @@ public: void setComposition(const CppArgumentList&, CppVariant*); private: - WebKit::WebView* m_webView; + blink::WebView* m_webView; }; } diff --git a/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp b/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp index 6a87c22..90df8d2 100644 --- a/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp +++ b/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp @@ -37,7 +37,7 @@ #include "public/platform/WebString.h" #include "public/web/WebAXObject.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -563,7 +563,7 @@ WebAXObjectProxy* WebAXObjectProxy::getChildAtIndex(unsigned index) return m_factory->getOrCreate(accessibilityObject().childAt(index)); } -bool WebAXObjectProxy::isEqual(const WebKit::WebAXObject& other) +bool WebAXObjectProxy::isEqual(const blink::WebAXObject& other) { return accessibilityObject().equals(other); } diff --git a/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.h b/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.h index 336f957..6ccc0b7 100644 --- a/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.h +++ b/third_party/WebKit/Source/testing/runner/WebAXObjectProxy.h @@ -42,19 +42,19 @@ public: class Factory { public: virtual ~Factory() { } - virtual WebAXObjectProxy* getOrCreate(const WebKit::WebAXObject&) = 0; + virtual WebAXObjectProxy* getOrCreate(const blink::WebAXObject&) = 0; }; - WebAXObjectProxy(const WebKit::WebAXObject&, Factory*); + WebAXObjectProxy(const blink::WebAXObject&, Factory*); virtual WebAXObjectProxy* getChildAtIndex(unsigned); virtual bool isRoot() const { return false; } - virtual bool isEqual(const WebKit::WebAXObject&); + virtual bool isEqual(const blink::WebAXObject&); virtual void notificationReceived(const char *notificationName); protected: - const WebKit::WebAXObject& accessibilityObject() const { return m_accessibilityObject; } + const blink::WebAXObject& accessibilityObject() const { return m_accessibilityObject; } Factory* factory() const { return m_factory; } @@ -133,7 +133,7 @@ private: void fallbackCallback(const CppArgumentList&, CppVariant*); - WebKit::WebAXObject m_accessibilityObject; + blink::WebAXObject m_accessibilityObject; Factory* m_factory; std::vector<CppVariant> m_notificationCallbacks; }; @@ -141,7 +141,7 @@ private: class RootWebAXObjectProxy : public WebAXObjectProxy { public: - RootWebAXObjectProxy(const WebKit::WebAXObject&, Factory*); + RootWebAXObjectProxy(const blink::WebAXObject&, Factory*); virtual WebAXObjectProxy* getChildAtIndex(unsigned); virtual bool isRoot() const { return true; } @@ -157,8 +157,8 @@ public: virtual ~WebAXObjectProxyList(); void clear(); - virtual WebAXObjectProxy* getOrCreate(const WebKit::WebAXObject&); - WebAXObjectProxy* createRoot(const WebKit::WebAXObject&); + virtual WebAXObjectProxy* getOrCreate(const blink::WebAXObject&); + WebAXObjectProxy* createRoot(const blink::WebAXObject&); private: typedef std::vector<WebAXObjectProxy*> ElementList; diff --git a/third_party/WebKit/Source/testing/runner/WebPermissions.cpp b/third_party/WebKit/Source/testing/runner/WebPermissions.cpp index d345801..2dd8d49 100644 --- a/third_party/WebKit/Source/testing/runner/WebPermissions.cpp +++ b/third_party/WebKit/Source/testing/runner/WebPermissions.cpp @@ -49,7 +49,7 @@ WebPermissions::~WebPermissions() { } -bool WebPermissions::allowImage(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& imageURL) +bool WebPermissions::allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL) { bool allowed = enabledPerSettings && m_imagesAllowed; if (m_dumpCallbacks && m_delegate) @@ -57,7 +57,7 @@ bool WebPermissions::allowImage(WebKit::WebFrame*, bool enabledPerSettings, cons return allowed; } -bool WebPermissions::allowScriptFromSource(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& scriptURL) +bool WebPermissions::allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL) { bool allowed = enabledPerSettings && m_scriptsAllowed; if (m_dumpCallbacks && m_delegate) @@ -65,22 +65,22 @@ bool WebPermissions::allowScriptFromSource(WebKit::WebFrame*, bool enabledPerSet return allowed; } -bool WebPermissions::allowStorage(WebKit::WebFrame*, bool) +bool WebPermissions::allowStorage(blink::WebFrame*, bool) { return m_storageAllowed; } -bool WebPermissions::allowPlugins(WebKit::WebFrame*, bool enabledPerSettings) +bool WebPermissions::allowPlugins(blink::WebFrame*, bool enabledPerSettings) { return enabledPerSettings && m_pluginsAllowed; } -bool WebPermissions::allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&) +bool WebPermissions::allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&) { return enabledPerSettings || m_displayingInsecureContentAllowed; } -bool WebPermissions::allowRunningInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&) +bool WebPermissions::allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&) { return enabledPerSettings || m_runningInsecureContentAllowed; } diff --git a/third_party/WebKit/Source/testing/runner/WebPermissions.h b/third_party/WebKit/Source/testing/runner/WebPermissions.h index 1bdcc8e..18ce384 100644 --- a/third_party/WebKit/Source/testing/runner/WebPermissions.h +++ b/third_party/WebKit/Source/testing/runner/WebPermissions.h @@ -38,18 +38,18 @@ namespace WebTestRunner { class WebTestDelegate; -class WebPermissions : public WebKit::WebPermissionClient, public WebKit::WebNonCopyable { +class WebPermissions : public blink::WebPermissionClient, public blink::WebNonCopyable { public: WebPermissions(); virtual ~WebPermissions(); // Override WebPermissionClient methods. - virtual bool allowImage(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& imageURL); - virtual bool allowScriptFromSource(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebURL& scriptURL); - virtual bool allowStorage(WebKit::WebFrame*, bool local); - virtual bool allowPlugins(WebKit::WebFrame*, bool enabledPerSettings); - virtual bool allowDisplayingInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&); - virtual bool allowRunningInsecureContent(WebKit::WebFrame*, bool enabledPerSettings, const WebKit::WebSecurityOrigin&, const WebKit::WebURL&); + virtual bool allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL); + virtual bool allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL); + virtual bool allowStorage(blink::WebFrame*, bool local); + virtual bool allowPlugins(blink::WebFrame*, bool enabledPerSettings); + virtual bool allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&); + virtual bool allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&); // Hooks to set the different policies. void setImagesAllowed(bool); diff --git a/third_party/WebKit/Source/testing/runner/WebPreferences.cpp b/third_party/WebKit/Source/testing/runner/WebPreferences.cpp index d6ad7ee..5e3ff15 100644 --- a/third_party/WebKit/Source/testing/runner/WebPreferences.cpp +++ b/third_party/WebKit/Source/testing/runner/WebPreferences.cpp @@ -30,7 +30,7 @@ #include "public/testing/WebPreferences.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/WebTestInterfaces.cpp b/third_party/WebKit/Source/testing/runner/WebTestInterfaces.cpp index fc9c4d2..09556ab 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestInterfaces.cpp +++ b/third_party/WebKit/Source/testing/runner/WebTestInterfaces.cpp @@ -37,7 +37,7 @@ #include "TestInterfaces.h" #include "TestRunner.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/WebTestProxy.cpp b/third_party/WebKit/Source/testing/runner/WebTestProxy.cpp index 16f9ada..ed7ba16 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestProxy.cpp +++ b/third_party/WebKit/Source/testing/runner/WebTestProxy.cpp @@ -72,7 +72,7 @@ #include <cctype> #include "skia/ext/platform_canvas.h" -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { @@ -132,9 +132,9 @@ void printRangeDescription(WebTestDelegate* delegate, const WebRange& range) string textAffinityDescription(WebTextAffinity affinity) { switch (affinity) { - case WebKit::WebTextAffinityUpstream: + case blink::WebTextAffinityUpstream: return "NSSelectionAffinityUpstream"; - case WebKit::WebTextAffinityDownstream: + case blink::WebTextAffinityDownstream: return "NSSelectionAffinityDownstream"; } return "(UNKNOWN AFFINITY)"; @@ -271,17 +271,17 @@ const char* illegalString = "illegal value"; const char* webNavigationTypeToString(WebNavigationType type) { switch (type) { - case WebKit::WebNavigationTypeLinkClicked: + case blink::WebNavigationTypeLinkClicked: return linkClickedString; - case WebKit::WebNavigationTypeFormSubmitted: + case blink::WebNavigationTypeFormSubmitted: return formSubmittedString; - case WebKit::WebNavigationTypeBackForward: + case blink::WebNavigationTypeBackForward: return backForwardString; - case WebKit::WebNavigationTypeReload: + case blink::WebNavigationTypeReload: return reloadString; - case WebKit::WebNavigationTypeFormResubmitted: + case blink::WebNavigationTypeFormResubmitted: return formResubmittedString; - case WebKit::WebNavigationTypeOther: + case blink::WebNavigationTypeOther: return otherString; } return illegalString; @@ -522,13 +522,13 @@ WebValidationMessageClient* WebTestProxyBase::validationMessageClient() return m_validationMessageClient.get(); } -WebColorChooser* WebTestProxyBase::createColorChooser(WebColorChooserClient* client, const WebKit::WebColor& color) +WebColorChooser* WebTestProxyBase::createColorChooser(WebColorChooserClient* client, const blink::WebColor& color) { // This instance is deleted by WebCore::ColorInputType return new MockColorChooser(client, m_delegate, this); } -bool WebTestProxyBase::runFileChooser(const WebKit::WebFileChooserParams&, WebKit::WebFileChooserCompletion*) +bool WebTestProxyBase::runFileChooser(const blink::WebFileChooserParams&, blink::WebFileChooserCompletion*) { m_delegate->printMessage("Mock: Opening a file chooser.\n"); // FIXME: Add ability to set file names to a file upload control. @@ -707,7 +707,7 @@ void WebTestProxyBase::displayRepaintMask() void WebTestProxyBase::display() { - const WebKit::WebSize& size = webWidget()->size(); + const blink::WebSize& size = webWidget()->size(); WebRect rect(0, 0, size.width, size.height); m_paintRect = rect; paintInvalidatedRegion(); @@ -822,92 +822,92 @@ void WebTestProxyBase::didAutoResize(const WebSize&) invalidateAll(); } -void WebTestProxyBase::postAccessibilityEvent(const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) +void WebTestProxyBase::postAccessibilityEvent(const blink::WebAXObject& obj, blink::WebAXEvent event) { - if (event == WebKit::WebAXEventFocus) + if (event == blink::WebAXEventFocus) m_testInterfaces->accessibilityController()->setFocusedElement(obj); const char* eventName = 0; switch (event) { - case WebKit::WebAXEventActiveDescendantChanged: + case blink::WebAXEventActiveDescendantChanged: eventName = "ActiveDescendantChanged"; break; - case WebKit::WebAXEventAlert: + case blink::WebAXEventAlert: eventName = "Alert"; break; - case WebKit::WebAXEventAriaAttributeChanged: + case blink::WebAXEventAriaAttributeChanged: eventName = "AriaAttributeChanged"; break; - case WebKit::WebAXEventAutocorrectionOccured: + case blink::WebAXEventAutocorrectionOccured: eventName = "AutocorrectionOccured"; break; - case WebKit::WebAXEventBlur: + case blink::WebAXEventBlur: eventName = "Blur"; break; - case WebKit::WebAXEventCheckedStateChanged: + case blink::WebAXEventCheckedStateChanged: eventName = "CheckedStateChanged"; break; - case WebKit::WebAXEventChildrenChanged: + case blink::WebAXEventChildrenChanged: eventName = "ChildrenChanged"; break; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: eventName = "Focus"; break; - case WebKit::WebAXEventHide: + case blink::WebAXEventHide: eventName = "Hide"; break; - case WebKit::WebAXEventInvalidStatusChanged: + case blink::WebAXEventInvalidStatusChanged: eventName = "InvalidStatusChanged"; break; - case WebKit::WebAXEventLayoutComplete: + case blink::WebAXEventLayoutComplete: eventName = "LayoutComplete"; break; - case WebKit::WebAXEventLiveRegionChanged: + case blink::WebAXEventLiveRegionChanged: eventName = "LiveRegionChanged"; break; - case WebKit::WebAXEventLoadComplete: + case blink::WebAXEventLoadComplete: eventName = "LoadComplete"; break; - case WebKit::WebAXEventLocationChanged: + case blink::WebAXEventLocationChanged: eventName = "LocationChanged"; break; - case WebKit::WebAXEventMenuListItemSelected: + case blink::WebAXEventMenuListItemSelected: eventName = "MenuListItemSelected"; break; - case WebKit::WebAXEventMenuListValueChanged: + case blink::WebAXEventMenuListValueChanged: eventName = "MenuListValueChanged"; break; - case WebKit::WebAXEventRowCollapsed: + case blink::WebAXEventRowCollapsed: eventName = "RowCollapsed"; break; - case WebKit::WebAXEventRowCountChanged: + case blink::WebAXEventRowCountChanged: eventName = "RowCountChanged"; break; - case WebKit::WebAXEventRowExpanded: + case blink::WebAXEventRowExpanded: eventName = "RowExpanded"; break; - case WebKit::WebAXEventScrolledToAnchor: + case blink::WebAXEventScrolledToAnchor: eventName = "ScrolledToAnchor"; break; - case WebKit::WebAXEventSelectedChildrenChanged: + case blink::WebAXEventSelectedChildrenChanged: eventName = "SelectedChildrenChanged"; break; - case WebKit::WebAXEventSelectedTextChanged: + case blink::WebAXEventSelectedTextChanged: eventName = "SelectedTextChanged"; break; - case WebKit::WebAXEventShow: + case blink::WebAXEventShow: eventName = "Show"; break; - case WebKit::WebAXEventTextChanged: + case blink::WebAXEventTextChanged: eventName = "TextChanged"; break; - case WebKit::WebAXEventTextInserted: + case blink::WebAXEventTextInserted: eventName = "TextInserted"; break; - case WebKit::WebAXEventTextRemoved: + case blink::WebAXEventTextRemoved: eventName = "TextRemoved"; break; - case WebKit::WebAXEventValueChanged: + case blink::WebAXEventValueChanged: eventName = "ValueChanged"; break; } @@ -918,9 +918,9 @@ void WebTestProxyBase::postAccessibilityEvent(const WebKit::WebAXObject& obj, We string message("AccessibilityNotification - "); message += eventName; - WebKit::WebNode node = obj.node(); + blink::WebNode node = obj.node(); if (!node.isNull() && node.isElementNode()) { - WebKit::WebElement element = node.to<WebKit::WebElement>(); + blink::WebElement element = node.to<blink::WebElement>(); if (element.hasAttribute("id")) { message += " - id:"; message += element.getAttribute("id").utf8().data(); @@ -1199,7 +1199,7 @@ void WebTestProxyBase::didDispatchPingLoader(WebFrame*, const WebURL& url) m_delegate->printMessage(string("PingLoader dispatched to '") + URLDescription(url).c_str() + "'.\n"); } -void WebTestProxyBase::willRequestResource(WebFrame* frame, const WebKit::WebCachedURLRequest& request) +void WebTestProxyBase::willRequestResource(WebFrame* frame, const blink::WebCachedURLRequest& request) { if (m_testInterfaces->testRunner()->shouldDumpResourceRequestCallbacks()) { printFrameDescription(m_delegate, frame); @@ -1214,7 +1214,7 @@ void WebTestProxyBase::didCreateDataSource(WebFrame*, WebDataSource* ds) ds->setDeferMainResourceDataLoad(false); } -void WebTestProxyBase::willSendRequest(WebFrame*, unsigned identifier, WebKit::WebURLRequest& request, const WebKit::WebURLResponse& redirectResponse) +void WebTestProxyBase::willSendRequest(WebFrame*, unsigned identifier, blink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) { // Need to use GURL for host() and SchemeIs() GURL url = request.url(); @@ -1271,7 +1271,7 @@ void WebTestProxyBase::willSendRequest(WebFrame*, unsigned identifier, WebKit::W request.setURL(m_delegate->rewriteLayoutTestsURL(request.url().spec())); } -void WebTestProxyBase::didReceiveResponse(WebFrame*, unsigned identifier, const WebKit::WebURLResponse& response) +void WebTestProxyBase::didReceiveResponse(WebFrame*, unsigned identifier, const blink::WebURLResponse& response) { if (m_testInterfaces->testRunner()->shouldDumpResourceLoadCallbacks()) { if (m_resourceIdentifierMap.find(identifier) == m_resourceIdentifierMap.end()) @@ -1293,7 +1293,7 @@ void WebTestProxyBase::didReceiveResponse(WebFrame*, unsigned identifier, const } } -void WebTestProxyBase::didChangeResourcePriority(WebFrame*, unsigned identifier, const WebKit::WebURLRequest::Priority& priority) +void WebTestProxyBase::didChangeResourcePriority(WebFrame*, unsigned identifier, const blink::WebURLRequest::Priority& priority) { if (m_testInterfaces->testRunner()->shouldDumpResourcePriorities()) { if (m_resourceIdentifierMap.find(identifier) == m_resourceIdentifierMap.end()) @@ -1398,9 +1398,9 @@ WebNavigationPolicy WebTestProxyBase::decidePolicyForNavigation(WebFrame*, WebDa m_delegate->printMessage(string("Policy delegate: attempt to load ") + URLDescription(request.url()) + " with navigation type '" + webNavigationTypeToString(type) + "'\n"); if (m_testInterfaces->testRunner()->policyDelegateIsPermissive()) - result = WebKit::WebNavigationPolicyCurrentTab; + result = blink::WebNavigationPolicyCurrentTab; else - result = WebKit::WebNavigationPolicyIgnore; + result = blink::WebNavigationPolicyIgnore; if (m_testInterfaces->testRunner()->policyDelegateShouldNotifyDone()) m_testInterfaces->testRunner()->policyDelegateDone(); diff --git a/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.cpp b/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.cpp index ba67bfb..b680db0 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.cpp +++ b/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.cpp @@ -45,7 +45,7 @@ #include <algorithm> -using namespace WebKit; +using namespace blink; using namespace std; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.h b/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.h index 7c32432..f1a65e9 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.h +++ b/third_party/WebKit/Source/testing/runner/WebTestThemeControlWin.h @@ -48,7 +48,7 @@ class SkCanvas; namespace WebTestRunner { -class WebTestThemeControlWin : public WebKit::WebNonCopyable { +class WebTestThemeControlWin : public blink::WebNonCopyable { public: // This list of states mostly mirrors the list in WebCore/platform/ThemeTypes.h // but is maintained separately since that isn't public and also to minimize diff --git a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineMac.h b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineMac.h index 7175748..9dbaef1 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineMac.h +++ b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineMac.h @@ -35,28 +35,28 @@ namespace WebTestRunner { -class WebTestThemeEngineMac : public WebKit::WebThemeEngine, public WebKit::WebNonCopyable { +class WebTestThemeEngineMac : public blink::WebThemeEngine, public blink::WebNonCopyable { public: virtual void paintScrollbarThumb( - WebKit::WebCanvas*, - WebKit::WebThemeEngine::State, - WebKit::WebThemeEngine::Size, - const WebKit::WebRect&, - const WebKit::WebThemeEngine::ScrollbarInfo&); + blink::WebCanvas*, + blink::WebThemeEngine::State, + blink::WebThemeEngine::Size, + const blink::WebRect&, + const blink::WebThemeEngine::ScrollbarInfo&); private: virtual void paintHIThemeScrollbarThumb( - WebKit::WebCanvas*, - WebKit::WebThemeEngine::State, - WebKit::WebThemeEngine::Size, - const WebKit::WebRect&, - const WebKit::WebThemeEngine::ScrollbarInfo&); + blink::WebCanvas*, + blink::WebThemeEngine::State, + blink::WebThemeEngine::Size, + const blink::WebRect&, + const blink::WebThemeEngine::ScrollbarInfo&); virtual void paintNSScrollerScrollbarThumb( - WebKit::WebCanvas*, - WebKit::WebThemeEngine::State, - WebKit::WebThemeEngine::Size, - const WebKit::WebRect&, - const WebKit::WebThemeEngine::ScrollbarInfo&); + blink::WebCanvas*, + blink::WebThemeEngine::State, + blink::WebThemeEngine::Size, + const blink::WebRect&, + const blink::WebThemeEngine::ScrollbarInfo&); }; } diff --git a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.cpp b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.cpp index f71a310..7792e61 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.cpp +++ b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.cpp @@ -41,7 +41,7 @@ #include <vsstyle.h> #include <windows.h> -using namespace WebKit; +using namespace blink; namespace WebTestRunner { @@ -726,7 +726,7 @@ void WebTestThemeEngineWin::paintTrackbar(WebCanvas* canvas, int part, int state } -void WebTestThemeEngineWin::paintProgressBar(WebKit::WebCanvas* canvas, const WebKit::WebRect& barRect, const WebKit::WebRect& valueRect, bool determinate, double) +void WebTestThemeEngineWin::paintProgressBar(blink::WebCanvas* canvas, const blink::WebRect& barRect, const blink::WebRect& valueRect, bool determinate, double) { WebTestThemeControlWin::Type ctype = WebTestThemeControlWin::ProgressBarType; WebTestThemeControlWin::State cstate = determinate ? WebTestThemeControlWin::NormalState : WebTestThemeControlWin::IndeterminateState; @@ -734,9 +734,9 @@ void WebTestThemeEngineWin::paintProgressBar(WebKit::WebCanvas* canvas, const We } -WebKit::WebSize WebTestThemeEngineWin::getSize(int part) +blink::WebSize WebTestThemeEngineWin::getSize(int part) { - return WebKit::WebSize(); + return blink::WebSize(); } } diff --git a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.h b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.h index 33eb449..5e5fa6f 100644 --- a/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.h +++ b/third_party/WebKit/Source/testing/runner/WebTestThemeEngineWin.h @@ -52,50 +52,50 @@ namespace WebTestRunner { -class WebTestThemeEngineWin : public WebKit::WebThemeEngine, public WebKit::WebNonCopyable { +class WebTestThemeEngineWin : public blink::WebThemeEngine, public blink::WebNonCopyable { public: WebTestThemeEngineWin() { } // WebThemeEngine methods: virtual void paintButton( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&); virtual void paintMenuList( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&); virtual void paintScrollbarArrow( - WebKit::WebCanvas*, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int state, int classicState, + const blink::WebRect&); virtual void paintScrollbarThumb( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&); virtual void paintScrollbarTrack( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&, const WebKit::WebRect& alignRect); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&, const blink::WebRect& alignRect); virtual void paintSpinButton( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&); virtual void paintTextField( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&, WebKit::WebColor, bool fillContentArea, + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&, blink::WebColor, bool fillContentArea, bool drawEdges); virtual void paintTrackbar( - WebKit::WebCanvas*, int part, int state, int classicState, - const WebKit::WebRect&); + blink::WebCanvas*, int part, int state, int classicState, + const blink::WebRect&); virtual void paintProgressBar( - WebKit::WebCanvas*, const WebKit::WebRect& barRect, - const WebKit::WebRect& valueRect, + blink::WebCanvas*, const blink::WebRect& barRect, + const blink::WebRect& valueRect, bool determinate, double time); - virtual WebKit::WebSize getSize(int part); + virtual blink::WebSize getSize(int part); }; } diff --git a/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.cpp b/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.cpp index eb0caba..6e1c0c6 100644 --- a/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.cpp +++ b/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.cpp @@ -41,7 +41,7 @@ #include "public/web/WebMediaStreamRegistry.h" #include "public/web/WebUserMediaRequest.h" -using namespace WebKit; +using namespace blink; namespace WebTestRunner { diff --git a/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.h b/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.h index 2c8a071..5a6a461 100644 --- a/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.h +++ b/third_party/WebKit/Source/testing/runner/WebUserMediaClientMock.h @@ -43,13 +43,13 @@ namespace WebTestRunner { class WebTestDelegate; -class WebUserMediaClientMock : public WebKit::WebUserMediaClient, public WebKit::WebNonCopyable { +class WebUserMediaClientMock : public blink::WebUserMediaClient, public blink::WebNonCopyable { public: explicit WebUserMediaClientMock(WebTestDelegate*); ~WebUserMediaClientMock() { } - virtual void requestUserMedia(const WebKit::WebUserMediaRequest&) OVERRIDE; - virtual void cancelUserMediaRequest(const WebKit::WebUserMediaRequest&) OVERRIDE; + virtual void requestUserMedia(const blink::WebUserMediaRequest&) OVERRIDE; + virtual void cancelUserMediaRequest(const blink::WebUserMediaRequest&) OVERRIDE; // Task related methods WebTaskList* taskList() { return &m_taskList; } diff --git a/third_party/WebKit/Source/web/ApplicationCacheHost.cpp b/third_party/WebKit/Source/web/ApplicationCacheHost.cpp index edf9b2d..2d54564 100644 --- a/third_party/WebKit/Source/web/ApplicationCacheHost.cpp +++ b/third_party/WebKit/Source/web/ApplicationCacheHost.cpp @@ -51,7 +51,7 @@ #include "platform/exported/WrappedResourceResponse.h" #include "weborigin/SecurityOrigin.h" -using namespace WebKit; +using namespace blink; namespace WebCore { @@ -174,7 +174,7 @@ ApplicationCacheHost::CacheInfo ApplicationCacheHost::applicationCacheInfo() if (!m_internal) return CacheInfo(KURL(), 0, 0, 0); - WebKit::WebApplicationCacheHost::CacheInfo webInfo; + blink::WebApplicationCacheHost::CacheInfo webInfo; m_internal->m_outerHost->getAssociatedCacheInfo(&webInfo); return CacheInfo(webInfo.manifestURL, webInfo.creationTime, webInfo.updateTime, webInfo.totalSize); } @@ -184,7 +184,7 @@ void ApplicationCacheHost::fillResourceList(ResourceInfoList* resources) if (!m_internal) return; - WebKit::WebVector<WebKit::WebApplicationCacheHost::ResourceInfo> webResources; + blink::WebVector<blink::WebApplicationCacheHost::ResourceInfo> webResources; m_internal->m_outerHost->getResourceList(&webResources); for (size_t i = 0; i < webResources.size(); ++i) { resources->append(ResourceInfo( diff --git a/third_party/WebKit/Source/web/ApplicationCacheHostInternal.h b/third_party/WebKit/Source/web/ApplicationCacheHostInternal.h index de98089..25956aa 100644 --- a/third_party/WebKit/Source/web/ApplicationCacheHostInternal.h +++ b/third_party/WebKit/Source/web/ApplicationCacheHostInternal.h @@ -39,12 +39,12 @@ namespace WebCore { -class ApplicationCacheHostInternal : public WebKit::WebApplicationCacheHostClient { +class ApplicationCacheHostInternal : public blink::WebApplicationCacheHostClient { public: ApplicationCacheHostInternal(ApplicationCacheHost* host) : m_innerHost(host) { - WebKit::WebFrameImpl* webFrame = WebKit::WebFrameImpl::fromFrame(host->m_documentLoader->frame()); + blink::WebFrameImpl* webFrame = blink::WebFrameImpl::fromFrame(host->m_documentLoader->frame()); ASSERT(webFrame); m_outerHost = adoptPtr(webFrame->client()->createApplicationCacheHost(webFrame, this)); } @@ -54,17 +54,17 @@ public: // FIXME: Prod the inspector to update it's notion of what cache the page is using. } - virtual void notifyEventListener(WebKit::WebApplicationCacheHost::EventID eventID) + virtual void notifyEventListener(blink::WebApplicationCacheHost::EventID eventID) { m_innerHost->notifyApplicationCache(static_cast<ApplicationCacheHost::EventID>(eventID), 0, 0); } - virtual void notifyProgressEventListener(const WebKit::WebURL&, int progressTotal, int progressDone) + virtual void notifyProgressEventListener(const blink::WebURL&, int progressTotal, int progressDone) { m_innerHost->notifyApplicationCache(ApplicationCacheHost::PROGRESS_EVENT, progressTotal, progressDone); } - static WebKit::WebApplicationCacheHost* toWebApplicationCacheHost(ApplicationCacheHost* innerHost) + static blink::WebApplicationCacheHost* toWebApplicationCacheHost(ApplicationCacheHost* innerHost) { if (innerHost && innerHost->m_internal) return innerHost->m_internal->m_outerHost.get(); @@ -74,7 +74,7 @@ public: private: friend class ApplicationCacheHost; ApplicationCacheHost* m_innerHost; - OwnPtr<WebKit::WebApplicationCacheHost> m_outerHost; + OwnPtr<blink::WebApplicationCacheHost> m_outerHost; }; } diff --git a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp index 644ced4..ecca8b93 100644 --- a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp +++ b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp @@ -132,10 +132,10 @@ #include "wtf/text/StringImpl.h" #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ - COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums) + COMPILE_ASSERT(int(blink::webkit_name) == int(WebCore::webcore_name), mismatching_enums) #define COMPILE_ASSERT_MATCHING_UINT64(webkit_name, webcore_name) \ - COMPILE_ASSERT(WebKit::webkit_name == WebCore::webcore_name, mismatching_enums) + COMPILE_ASSERT(blink::webkit_name == WebCore::webcore_name, mismatching_enums) // These constants are in WTF, bring them into WebCore so the ASSERT still works for them! namespace WebCore { diff --git a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp index 9b9aabe..74103cb 100644 --- a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp +++ b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp @@ -54,7 +54,7 @@ using namespace WebCore; using namespace WTF; -namespace WebKit { +namespace blink { namespace { @@ -304,7 +304,7 @@ AssociatedURLLoader::~AssociatedURLLoader() } #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \ - COMPILE_ASSERT(static_cast<int>(WebKit::webkit_name) == static_cast<int>(WebCore::webcore_name), mismatching_enums) + COMPILE_ASSERT(static_cast<int>(blink::webkit_name) == static_cast<int>(WebCore::webcore_name), mismatching_enums) COMPILE_ASSERT_MATCHING_ENUM(WebURLLoaderOptions::CrossOriginRequestPolicyDeny, DenyCrossOriginRequests); COMPILE_ASSERT_MATCHING_ENUM(WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl, UseAccessControl); @@ -370,4 +370,4 @@ void AssociatedURLLoader::setDefersLoading(bool defersLoading) m_loader->setDefersLoading(defersLoading); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/AssociatedURLLoader.h b/third_party/WebKit/Source/web/AssociatedURLLoader.h index 7007a5d8..2f0c92a 100644 --- a/third_party/WebKit/Source/web/AssociatedURLLoader.h +++ b/third_party/WebKit/Source/web/AssociatedURLLoader.h @@ -39,7 +39,7 @@ namespace WebCore { class DocumentThreadableLoader; } -namespace WebKit { +namespace blink { class WebFrameImpl; @@ -67,6 +67,6 @@ private: RefPtr<WebCore::DocumentThreadableLoader> m_loader; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/AutofillPopupMenuClient.cpp b/third_party/WebKit/Source/web/AutofillPopupMenuClient.cpp index f6efddc..f0be9fd 100644 --- a/third_party/WebKit/Source/web/AutofillPopupMenuClient.cpp +++ b/third_party/WebKit/Source/web/AutofillPopupMenuClient.cpp @@ -49,7 +49,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { AutofillPopupMenuClient::AutofillPopupMenuClient() : m_selectedIndex(-1) @@ -347,4 +347,4 @@ RenderStyle* AutofillPopupMenuClient::textFieldStyle() const return style; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/AutofillPopupMenuClient.h b/third_party/WebKit/Source/web/AutofillPopupMenuClient.h index 6286319..bf41e17 100644 --- a/third_party/WebKit/Source/web/AutofillPopupMenuClient.h +++ b/third_party/WebKit/Source/web/AutofillPopupMenuClient.h @@ -40,7 +40,7 @@ class PopupMenuStyle; class RenderStyle; } -namespace WebKit { +namespace blink { class WebString; class WebViewImpl; template <typename T> class WebVector; @@ -140,6 +140,6 @@ private: bool m_useLegacyBehavior; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/BackForwardClientImpl.cpp b/third_party/WebKit/Source/web/BackForwardClientImpl.cpp index ce314e6..173fb86 100644 --- a/third_party/WebKit/Source/web/BackForwardClientImpl.cpp +++ b/third_party/WebKit/Source/web/BackForwardClientImpl.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { BackForwardClientImpl::BackForwardClientImpl(WebViewImpl* webView) : m_webView(webView) @@ -71,4 +71,4 @@ int BackForwardClientImpl::backForwardListCount() } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/BackForwardClientImpl.h b/third_party/WebKit/Source/web/BackForwardClientImpl.h index 1b4a199..fcb713c 100644 --- a/third_party/WebKit/Source/web/BackForwardClientImpl.h +++ b/third_party/WebKit/Source/web/BackForwardClientImpl.h @@ -34,7 +34,7 @@ #include "core/history/HistoryItem.h" #include "core/page/BackForwardClient.h" -namespace WebKit { +namespace blink { class WebViewImpl; class BackForwardClientImpl : public WebCore::BackForwardClient { @@ -51,6 +51,6 @@ private: WebViewImpl* m_webView; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp index bc9c51a..48bf9e0 100644 --- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp +++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp @@ -106,9 +106,9 @@ using namespace WebCore; -namespace WebKit { +namespace blink { -// Converts a WebCore::PopupContainerType to a WebKit::WebPopupType. +// Converts a WebCore::PopupContainerType to a blink::WebPopupType. static WebPopupType convertPopupType(PopupContainer::PopupType type) { switch (type) { @@ -122,7 +122,7 @@ static WebPopupType convertPopupType(PopupContainer::PopupType type) } } -// Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAXEvent +// Converts a WebCore::AXObjectCache::AXNotification to a blink::WebAXEvent static WebAXEvent toWebAXEvent(AXObjectCache::AXNotification notification) { // These enums have the same values; enforced in AssertMatchingEnums.cpp. @@ -922,7 +922,7 @@ bool ChromeClientImpl::shouldRunModalDialogDuringPageDismissal(const DialogType& int dismissal = static_cast<int>(dismissalType) - 1; // Exclude NoDismissal. ASSERT_WITH_SECURITY_IMPLICATION(0 <= dismissal && dismissal < static_cast<int>(arraysize(kDismissals))); - WebKit::Platform::current()->histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals)); + blink::Platform::current()->histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals)); String message = String("Blocked ") + kDialogs[dialog] + "('" + dialogMessage + "') during " + kDismissals[dismissal] + "."; m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMessage::LevelError, message)); @@ -1006,4 +1006,4 @@ void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche } #endif -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.h b/third_party/WebKit/Source/web/ChromeClientImpl.h index d308b26..f670723 100644 --- a/third_party/WebKit/Source/web/ChromeClientImpl.h +++ b/third_party/WebKit/Source/web/ChromeClientImpl.h @@ -55,7 +55,7 @@ class DateTimeChooserClient; struct WindowFeatures; } -namespace WebKit { +namespace blink { class WebColorChooser; class WebColorChooserClient; class WebViewImpl; @@ -224,6 +224,6 @@ inline ChromeClientImpl* toChromeClientImpl(WebCore::ChromeClient& client) return static_cast<ChromeClientImpl*>(&client); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp b/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp index 34d3473..da01819 100644 --- a/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp +++ b/third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Keep in sync with Actions in colorSuggestionPicker.js. enum ColorPickerPopupAction { diff --git a/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/third_party/WebKit/Source/web/ColorChooserPopupUIController.h index 302cbec..ed575da 100644 --- a/third_party/WebKit/Source/web/ColorChooserPopupUIController.h +++ b/third_party/WebKit/Source/web/ColorChooserPopupUIController.h @@ -35,7 +35,7 @@ class ColorChooserClient; class PagePopup; } -namespace WebKit { +namespace blink { class ColorChooserPopupUIController : public ColorChooserUIController, public WebCore::PagePopupClient { diff --git a/third_party/WebKit/Source/web/ColorChooserUIController.cpp b/third_party/WebKit/Source/web/ColorChooserUIController.cpp index 997db07..7ea5e26 100644 --- a/third_party/WebKit/Source/web/ColorChooserUIController.cpp +++ b/third_party/WebKit/Source/web/ColorChooserUIController.cpp @@ -34,7 +34,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { ColorChooserUIController::ColorChooserUIController(ChromeClientImpl* chromeClient, ColorChooserClient* client) @@ -83,4 +83,4 @@ void ColorChooserUIController::openColorChooser() m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor>(m_client->currentColor().rgb())); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ColorChooserUIController.h b/third_party/WebKit/Source/web/ColorChooserUIController.h index 32be87b..98ebcce 100644 --- a/third_party/WebKit/Source/web/ColorChooserUIController.h +++ b/third_party/WebKit/Source/web/ColorChooserUIController.h @@ -35,7 +35,7 @@ namespace WebCore { class ColorChooserClient; } -namespace WebKit { +namespace blink { class ChromeClientImpl; class WebColorChooser; diff --git a/third_party/WebKit/Source/web/CompositionUnderlineBuilder.h b/third_party/WebKit/Source/web/CompositionUnderlineBuilder.h index 6ed7455..bc64371 100644 --- a/third_party/WebKit/Source/web/CompositionUnderlineBuilder.h +++ b/third_party/WebKit/Source/web/CompositionUnderlineBuilder.h @@ -36,7 +36,7 @@ #include "public/platform/WebVector.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { // This class is used for converting from WebCompositionUnderline to // WebCore::CompositionUnderline. @@ -48,6 +48,6 @@ public: WebCore::Color(u.color), u.thick) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.cpp b/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.cpp index 55dca85..063907a 100644 --- a/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.cpp +++ b/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { CompositionUnderlineVectorBuilder::CompositionUnderlineVectorBuilder( const WebVector<WebCompositionUnderline>& underlines) @@ -46,4 +46,4 @@ CompositionUnderlineVectorBuilder::CompositionUnderlineVectorBuilder( append(CompositionUnderlineBuilder(underlines[i])); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.h b/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.h index 7a6c8ae..427f48c 100644 --- a/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.h +++ b/third_party/WebKit/Source/web/CompositionUnderlineVectorBuilder.h @@ -36,7 +36,7 @@ #include "public/platform/WebVector.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { // This classes are used for converting from std::vector<WebCompositionUnderline> // to Vector<WebCore::CompositionUnderline>. @@ -48,6 +48,6 @@ public: const WebVector<WebCompositionUnderline>&); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp b/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp index 4d1edf4..4bdfc2f 100644 --- a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp +++ b/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class ContextFeaturesCache : public DocumentSupplement { public: @@ -150,4 +150,4 @@ bool ContextFeaturesClientImpl::askIfIsEnabled(Document* document, ContextFeatur } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.h b/third_party/WebKit/Source/web/ContextFeaturesClientImpl.h index 626984e..3bba59b 100644 --- a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.h +++ b/third_party/WebKit/Source/web/ContextFeaturesClientImpl.h @@ -33,7 +33,7 @@ #include "core/dom/ContextFeatures.h" -namespace WebKit { +namespace blink { class WebPermissionClient; @@ -53,6 +53,6 @@ private: WebPermissionClient* m_client; }; -} // namespace WebKit +} // namespace blink #endif // ContextFeaturesClientImpl_h diff --git a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp index 3ef936b..c2bac49 100644 --- a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp +++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp @@ -79,7 +79,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Figure out the URL of a page or subframe. Returns |page_type| as the type, // which indicates page or subframe, or ContextNodeType::NONE if the URL could not @@ -421,4 +421,4 @@ void ContextMenuClientImpl::populateCustomMenuItems(const WebCore::ContextMenu* populateSubMenuItems(defaultMenu->items(), data->customItems); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ContextMenuClientImpl.h b/third_party/WebKit/Source/web/ContextMenuClientImpl.h index 5b0875c..24e3ed7 100644 --- a/third_party/WebKit/Source/web/ContextMenuClientImpl.h +++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.h @@ -33,7 +33,7 @@ #include "core/page/ContextMenuClient.h" -namespace WebKit { +namespace blink { class WebViewImpl; struct WebContextMenuData; @@ -49,6 +49,6 @@ private: WebViewImpl* m_webView; }; -} // namespace WebKit +} // namespace blink #endif // ContextMenuClientImpl_h diff --git a/third_party/WebKit/Source/web/DOMUtilitiesPrivate.cpp b/third_party/WebKit/Source/web/DOMUtilitiesPrivate.cpp index 3c8c112..d12f5ad 100644 --- a/third_party/WebKit/Source/web/DOMUtilitiesPrivate.cpp +++ b/third_party/WebKit/Source/web/DOMUtilitiesPrivate.cpp @@ -40,7 +40,7 @@ using namespace WebCore; using namespace WebCore::HTMLNames; -namespace WebKit { +namespace blink { bool elementHasLegalLinkAttribute(const Element* element, const QualifiedName& attrName) { @@ -61,4 +61,4 @@ bool elementHasLegalLinkAttribute(const Element* element, const QualifiedName& a return false; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/DOMUtilitiesPrivate.h b/third_party/WebKit/Source/web/DOMUtilitiesPrivate.h index 86f4a11..cf26f09 100644 --- a/third_party/WebKit/Source/web/DOMUtilitiesPrivate.h +++ b/third_party/WebKit/Source/web/DOMUtilitiesPrivate.h @@ -37,7 +37,7 @@ class QualifiedName; } // This file is an aggregate of useful WebCore operations. -namespace WebKit { +namespace blink { // For img, script, iframe, frame element, when attribute name is src, // for link, a, area element, when attribute name is href, @@ -49,6 +49,6 @@ namespace WebKit { bool elementHasLegalLinkAttribute(const WebCore::Element* element, const WebCore::QualifiedName& attrName); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/DatabaseObserver.cpp b/third_party/WebKit/Source/web/DatabaseObserver.cpp index cb69b89..76e6f08 100644 --- a/third_party/WebKit/Source/web/DatabaseObserver.cpp +++ b/third_party/WebKit/Source/web/DatabaseObserver.cpp @@ -47,7 +47,7 @@ #include "modules/webdatabase/DatabaseContext.h" #include "platform/CrossThreadCopier.h" -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/web/DateTimeChooserImpl.cpp b/third_party/WebKit/Source/web/DateTimeChooserImpl.cpp index 31751f5..d41e0bc 100644 --- a/third_party/WebKit/Source/web/DateTimeChooserImpl.cpp +++ b/third_party/WebKit/Source/web/DateTimeChooserImpl.cpp @@ -46,7 +46,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { DateTimeChooserImpl::DateTimeChooserImpl(ChromeClientImpl* chromeClient, WebCore::DateTimeChooserClient* client, const WebCore::DateTimeChooserParameters& parameters) : m_chromeClient(chromeClient) @@ -183,6 +183,6 @@ void DateTimeChooserImpl::didClosePopup() m_client->didEndChooser(); } -} // namespace WebKit +} // namespace blink #endif // ENABLE(INPUT_MULTIPLE_FIELDS_UI) diff --git a/third_party/WebKit/Source/web/DateTimeChooserImpl.h b/third_party/WebKit/Source/web/DateTimeChooserImpl.h index 4c6607d..eef8a7f 100644 --- a/third_party/WebKit/Source/web/DateTimeChooserImpl.h +++ b/third_party/WebKit/Source/web/DateTimeChooserImpl.h @@ -40,7 +40,7 @@ class PagePopup; class DateTimeChooserClient; } -namespace WebKit { +namespace blink { class ChromeClientImpl; diff --git a/third_party/WebKit/Source/web/DragClientImpl.cpp b/third_party/WebKit/Source/web/DragClientImpl.cpp index 7597adc..3cd65ea7 100644 --- a/third_party/WebKit/Source/web/DragClientImpl.cpp +++ b/third_party/WebKit/Source/web/DragClientImpl.cpp @@ -48,7 +48,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { DragDestinationAction DragClientImpl::actionMaskForDrag(DragData*) { @@ -88,4 +88,4 @@ void DragClientImpl::startDrag(DragImage* dragImage, m_webView->startDragging(frame, dragData, dragOperationMask, image, offsetPoint); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/DragClientImpl.h b/third_party/WebKit/Source/web/DragClientImpl.h index 241258c..0d8a640 100644 --- a/third_party/WebKit/Source/web/DragClientImpl.h +++ b/third_party/WebKit/Source/web/DragClientImpl.h @@ -42,7 +42,7 @@ class IntPoint; class KURL; } -namespace WebKit { +namespace blink { class WebViewImpl; class DragClientImpl : public WebCore::DragClient { @@ -62,6 +62,6 @@ private: WebViewImpl* m_webView; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/EditorClientImpl.cpp b/third_party/WebKit/Source/web/EditorClientImpl.cpp index c00e081..ef1f639 100644 --- a/third_party/WebKit/Source/web/EditorClientImpl.cpp +++ b/third_party/WebKit/Source/web/EditorClientImpl.cpp @@ -64,7 +64,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Arbitrary depth limit for the undo stack, to keep it from using // unbounded memory. This is the maximum number of distinct undoable diff --git a/third_party/WebKit/Source/web/EditorClientImpl.h b/third_party/WebKit/Source/web/EditorClientImpl.h index 8f76d81..5ffcf26 100644 --- a/third_party/WebKit/Source/web/EditorClientImpl.h +++ b/third_party/WebKit/Source/web/EditorClientImpl.h @@ -42,7 +42,7 @@ class Frame; class HTMLInputElement; } -namespace WebKit { +namespace blink { class WebViewImpl; class WebTextCheckingCompletionImpl; @@ -119,6 +119,6 @@ private: int m_spellCheckThisFieldStatus; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/EventListenerWrapper.cpp b/third_party/WebKit/Source/web/EventListenerWrapper.cpp index b121614..7cb3cc2 100644 --- a/third_party/WebKit/Source/web/EventListenerWrapper.cpp +++ b/third_party/WebKit/Source/web/EventListenerWrapper.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { EventListenerWrapper::EventListenerWrapper(WebDOMEventListener* webDOMEventListener) : EventListener(EventListener::NativeEventListenerType) @@ -71,4 +71,4 @@ void EventListenerWrapper::webDOMEventListenerDeleted() m_webDOMEventListener = 0; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/EventListenerWrapper.h b/third_party/WebKit/Source/web/EventListenerWrapper.h index 4ac82fd..8b77270 100644 --- a/third_party/WebKit/Source/web/EventListenerWrapper.h +++ b/third_party/WebKit/Source/web/EventListenerWrapper.h @@ -37,7 +37,7 @@ namespace WebCore { class ExecutionContext; } -namespace WebKit { +namespace blink { class WebDOMEventListener; @@ -57,6 +57,6 @@ private: WebDOMEventListener* m_webDOMEventListener; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp b/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp index b1215aa..44208db 100644 --- a/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp +++ b/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebDateTimeChooserCompletionImpl : public WebDateTimeChooserCompletion { public: diff --git a/third_party/WebKit/Source/web/ExternalDateTimeChooser.h b/third_party/WebKit/Source/web/ExternalDateTimeChooser.h index 12f7bab..f82823d 100644 --- a/third_party/WebKit/Source/web/ExternalDateTimeChooser.h +++ b/third_party/WebKit/Source/web/ExternalDateTimeChooser.h @@ -33,7 +33,7 @@ namespace WebCore { class DateTimeChooserClient; } -namespace WebKit { +namespace blink { class ChromeClientImpl; class WebString; diff --git a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp index 5ae6736..0875643 100644 --- a/third_party/WebKit/Source/web/ExternalPopupMenu.cpp +++ b/third_party/WebKit/Source/web/ExternalPopupMenu.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { ExternalPopupMenu::ExternalPopupMenu(Frame& frame, PopupMenuClient* popupMenuClient, WebViewClient* webViewClient) : m_popupMenuClient(popupMenuClient) diff --git a/third_party/WebKit/Source/web/ExternalPopupMenu.h b/third_party/WebKit/Source/web/ExternalPopupMenu.h index a87a3697..3bfdaff 100644 --- a/third_party/WebKit/Source/web/ExternalPopupMenu.h +++ b/third_party/WebKit/Source/web/ExternalPopupMenu.h @@ -45,7 +45,7 @@ class IntSize; class PopupMenuClient; } -namespace WebKit { +namespace blink { class WebExternalPopupMenu; class WebViewClient; @@ -85,6 +85,6 @@ private: WebExternalPopupMenu* m_webExternalPopupMenu; }; -} // namespace WebKit +} // namespace blink #endif // ExternalPopupMenu_h diff --git a/third_party/WebKit/Source/web/FindInPageCoordinates.cpp b/third_party/WebKit/Source/web/FindInPageCoordinates.cpp index 6019a79..e8abc96 100644 --- a/third_party/WebKit/Source/web/FindInPageCoordinates.cpp +++ b/third_party/WebKit/Source/web/FindInPageCoordinates.cpp @@ -47,7 +47,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static const RenderBlock* enclosingScrollableAncestor(const RenderObject* renderer) { @@ -137,4 +137,4 @@ FloatRect findInPageRectFromRange(Range* range) return findInPageRectFromAbsoluteRect(RenderObject::absoluteBoundingBoxRectForRange(range), range->firstNode()->renderer()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/FindInPageCoordinates.h b/third_party/WebKit/Source/web/FindInPageCoordinates.h index de1ba91..13ba4cf 100644 --- a/third_party/WebKit/Source/web/FindInPageCoordinates.h +++ b/third_party/WebKit/Source/web/FindInPageCoordinates.h @@ -38,7 +38,7 @@ class Range; class RenderObject; } -namespace WebKit { +namespace blink { // Find-in-page coordinate conversion methods. // @@ -56,6 +56,6 @@ namespace WebKit { WebCore::FloatRect findInPageRectFromAbsoluteRect(const WebCore::FloatRect&, const WebCore::RenderObject*); WebCore::FloatRect findInPageRectFromRange(WebCore::Range*); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp index 75a67ff..2813a93 100644 --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp @@ -98,7 +98,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { FrameLoaderClientImpl::FrameLoaderClientImpl(WebFrameImpl* frame) : m_webFrame(frame) @@ -315,7 +315,7 @@ void FrameLoaderClientImpl::dispatchDidChangeResourcePriority(unsigned long iden ResourceLoadPriority priority) { if (m_webFrame->client()) - m_webFrame->client()->didChangeResourcePriority(m_webFrame, identifier, static_cast<WebKit::WebURLRequest::Priority>(priority)); + m_webFrame->client()->didChangeResourcePriority(m_webFrame, identifier, static_cast<blink::WebURLRequest::Priority>(priority)); } // Called when a particular resource load completes @@ -567,7 +567,7 @@ String FrameLoaderClientImpl::userAgent(const KURL& url) if (!override.isEmpty()) return override; - return WebKit::Platform::current()->userAgent(url); + return blink::Platform::current()->userAgent(url); } String FrameLoaderClientImpl::doNotTrackValue() @@ -784,4 +784,4 @@ void FrameLoaderClientImpl::didStopAllLoaders() m_webFrame->client()->didAbortLoading(m_webFrame); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h index 53c687b..c1c4d0e 100644 --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h @@ -37,7 +37,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebFrameImpl; class WebPluginContainerImpl; @@ -172,6 +172,6 @@ inline FrameLoaderClientImpl* toFrameLoaderClientImpl(WebCore::FrameLoaderClient return static_cast<FrameLoaderClientImpl*>(client); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/FullscreenController.cpp b/third_party/WebKit/Source/web/FullscreenController.cpp index bfc561b..651ef36 100644 --- a/third_party/WebKit/Source/web/FullscreenController.cpp +++ b/third_party/WebKit/Source/web/FullscreenController.cpp @@ -43,7 +43,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassOwnPtr<FullscreenController> FullscreenController::create(WebViewImpl* webViewImpl) { diff --git a/third_party/WebKit/Source/web/FullscreenController.h b/third_party/WebKit/Source/web/FullscreenController.h index 08a56d1..5f00369 100644 --- a/third_party/WebKit/Source/web/FullscreenController.h +++ b/third_party/WebKit/Source/web/FullscreenController.h @@ -40,7 +40,7 @@ class Element; class Frame; } -namespace WebKit { +namespace blink { class WebViewImpl; class FullscreenController { diff --git a/third_party/WebKit/Source/web/GeolocationClientProxy.cpp b/third_party/WebKit/Source/web/GeolocationClientProxy.cpp index 94ee7cf..cd4c955 100644 --- a/third_party/WebKit/Source/web/GeolocationClientProxy.cpp +++ b/third_party/WebKit/Source/web/GeolocationClientProxy.cpp @@ -33,7 +33,7 @@ #include "modules/geolocation/Geolocation.h" #include "modules/geolocation/GeolocationPosition.h" -namespace WebKit { +namespace blink { GeolocationClientProxy::GeolocationClientProxy(WebGeolocationClient* client) : m_client(client) diff --git a/third_party/WebKit/Source/web/GeolocationClientProxy.h b/third_party/WebKit/Source/web/GeolocationClientProxy.h index 4fa9711..4876753 100644 --- a/third_party/WebKit/Source/web/GeolocationClientProxy.h +++ b/third_party/WebKit/Source/web/GeolocationClientProxy.h @@ -34,7 +34,7 @@ namespace WebCore { class GeolocationPosition; } -namespace WebKit { +namespace blink { class WebGeolocationClient; class GeolocationClientProxy : public WebCore::GeolocationClient { @@ -56,6 +56,6 @@ private: RefPtr<WebCore::GeolocationPosition> m_lastPosition; }; -} // namespace WebKit +} // namespace blink #endif // GeolocationClientProxy_h diff --git a/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.cpp b/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.cpp index 6064367..1a3e9cd 100644 --- a/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.cpp +++ b/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.cpp @@ -31,7 +31,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { GraphicsLayerFactoryChromium::GraphicsLayerFactoryChromium(WebViewImpl* webView) : m_webView(webView) @@ -49,4 +49,4 @@ PassOwnPtr<GraphicsLayer> GraphicsLayerFactoryChromium::createGraphicsLayer(Grap return layer.release(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.h b/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.h index 920a718..1e479d78 100644 --- a/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.h +++ b/third_party/WebKit/Source/web/GraphicsLayerFactoryChromium.h @@ -28,7 +28,7 @@ #include "core/platform/graphics/GraphicsLayerFactory.h" -namespace WebKit { +namespace blink { class WebViewImpl; class GraphicsLayerFactoryChromium : public WebCore::GraphicsLayerFactory { @@ -44,6 +44,6 @@ private: WebViewImpl* m_webView; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/IDBCursorBackendProxy.cpp b/third_party/WebKit/Source/web/IDBCursorBackendProxy.cpp index 79fafb2..ce7df07 100644 --- a/third_party/WebKit/Source/web/IDBCursorBackendProxy.cpp +++ b/third_party/WebKit/Source/web/IDBCursorBackendProxy.cpp @@ -34,7 +34,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebIDBCursor> idbCursor) { @@ -65,4 +65,4 @@ void IDBCursorBackendProxy::postSuccessHandlerCallback() m_idbCursor->postSuccessHandlerCallback(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/IDBCursorBackendProxy.h b/third_party/WebKit/Source/web/IDBCursorBackendProxy.h index 08f2ebb..ebe83e5 100644 --- a/third_party/WebKit/Source/web/IDBCursorBackendProxy.h +++ b/third_party/WebKit/Source/web/IDBCursorBackendProxy.h @@ -33,7 +33,7 @@ #include "wtf/RefPtr.h" #include "modules/indexeddb/IDBCursorBackendInterface.h" -namespace WebKit { +namespace blink { class IDBCursorBackendProxy : public WebCore::IDBCursorBackendInterface { public: @@ -50,6 +50,6 @@ private: OwnPtr<WebIDBCursor> m_idbCursor; }; -} // namespace WebKit +} // namespace blink #endif // IDBCursorBackendProxy_h diff --git a/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.cpp b/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.cpp index 0680198..88ece6f6 100644 --- a/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.cpp +++ b/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.cpp @@ -42,7 +42,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseBackendProxy::create(PassOwnPtr<WebIDBDatabase> database) { @@ -151,4 +151,4 @@ void IDBDatabaseBackendProxy::close(PassRefPtr<IDBDatabaseCallbacks>) m_webIDBDatabase->close(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.h b/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.h index 745da6a..64665ce 100644 --- a/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.h +++ b/third_party/WebKit/Source/web/IDBDatabaseBackendProxy.h @@ -31,7 +31,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebIDBDatabase; @@ -66,6 +66,6 @@ private: OwnPtr<WebIDBDatabase> m_webIDBDatabase; }; -} // namespace WebKit +} // namespace blink #endif // IDBDatabaseBackendProxy_h diff --git a/third_party/WebKit/Source/web/IDBFactoryBackendProxy.cpp b/third_party/WebKit/Source/web/IDBFactoryBackendProxy.cpp index 845a77e..8e08cd6 100644 --- a/third_party/WebKit/Source/web/IDBFactoryBackendProxy.cpp +++ b/third_party/WebKit/Source/web/IDBFactoryBackendProxy.cpp @@ -54,7 +54,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendProxy::create() { @@ -63,7 +63,7 @@ PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendProxy::create() IDBFactoryBackendProxy::IDBFactoryBackendProxy() { - m_webIDBFactory = WebKit::Platform::current()->idbFactory(); + m_webIDBFactory = blink::Platform::current()->idbFactory(); } IDBFactoryBackendProxy::~IDBFactoryBackendProxy() @@ -122,4 +122,4 @@ void IDBFactoryBackendProxy::deleteDatabase(const String& name, PassRefPtr<IDBCa m_webIDBFactory->deleteDatabase(name, new WebIDBCallbacksImpl(callbacks), databaseIdentifier); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/IDBFactoryBackendProxy.h b/third_party/WebKit/Source/web/IDBFactoryBackendProxy.h index c4529dd..8cc60b3 100644 --- a/third_party/WebKit/Source/web/IDBFactoryBackendProxy.h +++ b/third_party/WebKit/Source/web/IDBFactoryBackendProxy.h @@ -36,7 +36,7 @@ namespace WebCore { class ExecutionContext; } -namespace WebKit { +namespace blink { class WebIDBFactory; class WebSecurityOrigin; @@ -58,6 +58,6 @@ private: WebIDBFactory* m_webIDBFactory; }; -} // namespace WebKit +} // namespace blink #endif // IDBFactoryBackendProxy_h diff --git a/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.cpp b/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.cpp index 1c7318a..5921520 100644 --- a/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.cpp +++ b/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.cpp @@ -35,7 +35,7 @@ #include "platform/graphics/media/InbandTextTrackPrivateClient.h" #include "public/platform/WebString.h" -namespace WebKit { +namespace blink { InbandTextTrackPrivateImpl::InbandTextTrackPrivateImpl(WebInbandTextTrack* track) : m_track(track) @@ -79,4 +79,4 @@ void InbandTextTrackPrivateImpl::addWebVTTCue( client()->addWebVTTCue(this, start, end, id, content, settings); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.h b/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.h index 6f60c56..f84acf7 100644 --- a/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.h +++ b/third_party/WebKit/Source/web/InbandTextTrackPrivateImpl.h @@ -38,7 +38,7 @@ namespace WebCore { class InbandTextTrackPrivateClient; } -namespace WebKit { +namespace blink { class WebInbandTextTrack; diff --git a/third_party/WebKit/Source/web/InspectorClientImpl.cpp b/third_party/WebKit/Source/web/InspectorClientImpl.cpp index 4162490..d9d8415 100644 --- a/third_party/WebKit/Source/web/InspectorClientImpl.cpp +++ b/third_party/WebKit/Source/web/InspectorClientImpl.cpp @@ -46,7 +46,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { InspectorClientImpl::InspectorClientImpl(WebViewImpl* webView) : m_inspectedWebView(webView) @@ -171,4 +171,4 @@ WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent() return static_cast<WebDevToolsAgentImpl*>(m_inspectedWebView->devToolsAgent()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/InspectorClientImpl.h b/third_party/WebKit/Source/web/InspectorClientImpl.h index 12aa056..be67d47 100644 --- a/third_party/WebKit/Source/web/InspectorClientImpl.h +++ b/third_party/WebKit/Source/web/InspectorClientImpl.h @@ -36,7 +36,7 @@ #include "core/inspector/InspectorFrontendChannel.h" #include "wtf/OwnPtr.h" -namespace WebKit { +namespace blink { class WebDevToolsAgentClient; class WebDevToolsAgentImpl; @@ -84,6 +84,6 @@ private: WebViewImpl* m_inspectedWebView; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/InspectorFrontendClientImpl.cpp b/third_party/WebKit/Source/web/InspectorFrontendClientImpl.cpp index 636ad95..887d035 100644 --- a/third_party/WebKit/Source/web/InspectorFrontendClientImpl.cpp +++ b/third_party/WebKit/Source/web/InspectorFrontendClientImpl.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { InspectorFrontendClientImpl::InspectorFrontendClientImpl(Page* frontendPage, WebDevToolsFrontendClient* client, WebDevToolsFrontendImpl* frontend) : m_frontendPage(frontendPage) @@ -136,4 +136,4 @@ bool InspectorFrontendClientImpl::isUnderTest() return m_client->isUnderTest(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/InspectorFrontendClientImpl.h b/third_party/WebKit/Source/web/InspectorFrontendClientImpl.h index 0b9ae71..3fbf6cb 100644 --- a/third_party/WebKit/Source/web/InspectorFrontendClientImpl.h +++ b/third_party/WebKit/Source/web/InspectorFrontendClientImpl.h @@ -39,7 +39,7 @@ class InspectorFrontendHost; class Page; } -namespace WebKit { +namespace blink { class WebDevToolsFrontendClient; class WebDevToolsFrontendImpl; @@ -67,6 +67,6 @@ private: RefPtr<WebCore::InspectorFrontendHost> m_frontendHost; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/LinkHighlight.cpp b/third_party/WebKit/Source/web/LinkHighlight.cpp index 8489b0d..4f32739 100644 --- a/third_party/WebKit/Source/web/LinkHighlight.cpp +++ b/third_party/WebKit/Source/web/LinkHighlight.cpp @@ -52,7 +52,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebViewImpl; @@ -269,7 +269,7 @@ void LinkHighlight::startHighlightAnimationIfNeeded() if (extraDurationRequired) curve->add(WebFloatKeyframe(extraDurationRequired, startOpacity)); // For layout tests we don't fade out. - curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, WebKit::layoutTestMode() ? startOpacity : 0)); + curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, blink::layoutTestMode() ? startOpacity : 0)); OwnPtr<WebAnimation> animation = adoptPtr(compositorSupport->createAnimation(*curve, WebAnimation::TargetPropertyOpacity)); diff --git a/third_party/WebKit/Source/web/LinkHighlight.h b/third_party/WebKit/Source/web/LinkHighlight.h index 597698e..f53a4eb 100644 --- a/third_party/WebKit/Source/web/LinkHighlight.h +++ b/third_party/WebKit/Source/web/LinkHighlight.h @@ -41,7 +41,7 @@ class RenderLayer; class Node; } -namespace WebKit { +namespace blink { struct WebFloatRect; struct WebRect; @@ -95,6 +95,6 @@ private: double m_startTime; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp index 7712792..69d412c 100644 --- a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp +++ b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp @@ -46,7 +46,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassOwnPtr<FileSystemClient> LocalFileSystemClient::create() { @@ -61,7 +61,7 @@ bool LocalFileSystemClient::allowFileSystem(ExecutionContext* context) { Document* document = toDocument(context); WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); - WebKit::WebViewImpl* webView = webFrame->viewImpl(); + blink::WebViewImpl* webView = webFrame->viewImpl(); return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(webFrame); } @@ -70,4 +70,4 @@ LocalFileSystemClient::LocalFileSystemClient() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/LocalFileSystemClient.h b/third_party/WebKit/Source/web/LocalFileSystemClient.h index 7d4758d..d72ef9b 100644 --- a/third_party/WebKit/Source/web/LocalFileSystemClient.h +++ b/third_party/WebKit/Source/web/LocalFileSystemClient.h @@ -34,7 +34,7 @@ #include "modules/filesystem/FileSystemClient.h" #include "wtf/Forward.h" -namespace WebKit { +namespace blink { class LocalFileSystemClient : public WebCore::FileSystemClient { public: @@ -48,6 +48,6 @@ private: LocalFileSystemClient(); }; -} // namespace WebKit +} // namespace blink #endif // LocalFileSystemClient_h diff --git a/third_party/WebKit/Source/web/MIDIClientProxy.cpp b/third_party/WebKit/Source/web/MIDIClientProxy.cpp index ef4b2fe..0aad37c 100644 --- a/third_party/WebKit/Source/web/MIDIClientProxy.cpp +++ b/third_party/WebKit/Source/web/MIDIClientProxy.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client) : m_client(client) @@ -61,4 +61,4 @@ void MIDIClientProxy::cancelSysExPermissionRequest(MIDIAccess* access) m_client->cancelSysExPermissionRequest(WebMIDIPermissionRequest(access)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/MIDIClientProxy.h b/third_party/WebKit/Source/web/MIDIClientProxy.h index b6d1e37..be3e7a7 100644 --- a/third_party/WebKit/Source/web/MIDIClientProxy.h +++ b/third_party/WebKit/Source/web/MIDIClientProxy.h @@ -38,7 +38,7 @@ namespace WebCore { class MIDIAccess; } -namespace WebKit { +namespace blink { class WebMIDIClient; class WebViewImpl; @@ -55,6 +55,6 @@ private: WebMIDIClient* m_client; }; -} // namespace WebKit +} // namespace blink #endif // MIDIClientProxy_h diff --git a/third_party/WebKit/Source/web/MediaSourcePrivateImpl.cpp b/third_party/WebKit/Source/web/MediaSourcePrivateImpl.cpp index c2f9338..7a66792d 100644 --- a/third_party/WebKit/Source/web/MediaSourcePrivateImpl.cpp +++ b/third_party/WebKit/Source/web/MediaSourcePrivateImpl.cpp @@ -41,9 +41,9 @@ #include "wtf/PassOwnPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { -MediaSourcePrivateImpl::MediaSourcePrivateImpl(PassOwnPtr<WebKit::WebMediaSource> webMediaSource) +MediaSourcePrivateImpl::MediaSourcePrivateImpl(PassOwnPtr<blink::WebMediaSource> webMediaSource) : m_webMediaSource(webMediaSource) { } diff --git a/third_party/WebKit/Source/web/MediaSourcePrivateImpl.h b/third_party/WebKit/Source/web/MediaSourcePrivateImpl.h index 8fe7de8..2f34414 100644 --- a/third_party/WebKit/Source/web/MediaSourcePrivateImpl.h +++ b/third_party/WebKit/Source/web/MediaSourcePrivateImpl.h @@ -34,7 +34,7 @@ #include "core/platform/graphics/MediaSourcePrivate.h" #include "wtf/OwnPtr.h" -namespace WebKit { +namespace blink { class WebMediaSource; @@ -52,7 +52,7 @@ public: virtual void unmarkEndOfStream() OVERRIDE; private: - OwnPtr<WebKit::WebMediaSource> m_webMediaSource; + OwnPtr<blink::WebMediaSource> m_webMediaSource; }; } diff --git a/third_party/WebKit/Source/web/NotificationPresenterImpl.cpp b/third_party/WebKit/Source/web/NotificationPresenterImpl.cpp index 59b2dcd..04b7a7b 100644 --- a/third_party/WebKit/Source/web/NotificationPresenterImpl.cpp +++ b/third_party/WebKit/Source/web/NotificationPresenterImpl.cpp @@ -41,7 +41,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { #if ENABLE(LEGACY_NOTIFICATIONS) class VoidCallbackClient : public WebNotificationPermissionCallback { @@ -136,4 +136,4 @@ void NotificationPresenterImpl::requestPermission(ExecutionContext* context, WTF m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new NotificationPermissionCallbackClient(m_presenter, context->securityOrigin(), callback)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/NotificationPresenterImpl.h b/third_party/WebKit/Source/web/NotificationPresenterImpl.h index a116ffa..e472235 100644 --- a/third_party/WebKit/Source/web/NotificationPresenterImpl.h +++ b/third_party/WebKit/Source/web/NotificationPresenterImpl.h @@ -37,7 +37,7 @@ #include "wtf/HashMap.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebNotificationPresenter; @@ -65,6 +65,6 @@ private: WebNotificationPresenter* m_presenter; }; -} // namespace WebKit +} // namespace blink #endif // NotificationPresenterImpl_h diff --git a/third_party/WebKit/Source/web/PageOverlay.cpp b/third_party/WebKit/Source/web/PageOverlay.cpp index 83cfc85..1445a57 100644 --- a/third_party/WebKit/Source/web/PageOverlay.cpp +++ b/third_party/WebKit/Source/web/PageOverlay.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -162,4 +162,4 @@ void PageOverlay::invalidateWebFrame() } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/PageOverlay.h b/third_party/WebKit/Source/web/PageOverlay.h index aadaf9d..241c838 100644 --- a/third_party/WebKit/Source/web/PageOverlay.h +++ b/third_party/WebKit/Source/web/PageOverlay.h @@ -38,7 +38,7 @@ class GraphicsLayer; class GraphicsLayerClient; } -namespace WebKit { +namespace blink { class OverlayGraphicsLayerClientImpl; class WebPageOverlay; class WebViewImpl; @@ -73,6 +73,6 @@ private: int m_zOrder; }; -} // namespace WebKit +} // namespace blink #endif // PageOverlay_h diff --git a/third_party/WebKit/Source/web/PageOverlayList.cpp b/third_party/WebKit/Source/web/PageOverlayList.cpp index fb88f76..5aec281 100644 --- a/third_party/WebKit/Source/web/PageOverlayList.cpp +++ b/third_party/WebKit/Source/web/PageOverlayList.cpp @@ -33,7 +33,7 @@ #include "WebPageOverlay.h" #include "WebViewImpl.h" -namespace WebKit { +namespace blink { PassOwnPtr<PageOverlayList> PageOverlayList::create(WebViewImpl* viewImpl) { @@ -136,4 +136,4 @@ size_t PageOverlayList::findGraphicsLayer(WebCore::GraphicsLayer* layer) return WTF::kNotFound; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/PageOverlayList.h b/third_party/WebKit/Source/web/PageOverlayList.h index 022d336..c30fef4 100644 --- a/third_party/WebKit/Source/web/PageOverlayList.h +++ b/third_party/WebKit/Source/web/PageOverlayList.h @@ -38,7 +38,7 @@ class GraphicsContext; class GraphicsLayer; } -namespace WebKit { +namespace blink { class PageOverlay; class WebPageOverlay; class WebViewImpl; @@ -73,6 +73,6 @@ private: PageOverlays m_pageOverlays; }; -} // namespace WebKit +} // namespace blink #endif // PageOverlayList_h diff --git a/third_party/WebKit/Source/web/PageScaleConstraintsSet.cpp b/third_party/WebKit/Source/web/PageScaleConstraintsSet.cpp index 19ec04f..db8176d 100644 --- a/third_party/WebKit/Source/web/PageScaleConstraintsSet.cpp +++ b/third_party/WebKit/Source/web/PageScaleConstraintsSet.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static const float defaultMinimumScale = 0.25f; static const float defaultMaximumScale = 5.0f; diff --git a/third_party/WebKit/Source/web/PageScaleConstraintsSet.h b/third_party/WebKit/Source/web/PageScaleConstraintsSet.h index dc90dcf..b31d4e4 100644 --- a/third_party/WebKit/Source/web/PageScaleConstraintsSet.h +++ b/third_party/WebKit/Source/web/PageScaleConstraintsSet.h @@ -35,7 +35,7 @@ #include "core/page/PageScaleConstraints.h" #include "platform/geometry/IntSize.h" -namespace WebKit { +namespace blink { // This class harmonizes the viewport (particularly page scale) constraints from // the meta viewport tag and other sources. diff --git a/third_party/WebKit/Source/web/PageWidgetDelegate.cpp b/third_party/WebKit/Source/web/PageWidgetDelegate.cpp index 84be34c..3a3ffb6 100644 --- a/third_party/WebKit/Source/web/PageWidgetDelegate.cpp +++ b/third_party/WebKit/Source/web/PageWidgetDelegate.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static inline FrameView* mainFrameView(Page* page) { diff --git a/third_party/WebKit/Source/web/PageWidgetDelegate.h b/third_party/WebKit/Source/web/PageWidgetDelegate.h index 7943de8..42cf03e 100644 --- a/third_party/WebKit/Source/web/PageWidgetDelegate.h +++ b/third_party/WebKit/Source/web/PageWidgetDelegate.h @@ -41,7 +41,7 @@ class Frame; class Page; } -namespace WebKit { +namespace blink { class PageOverlayList; class WebGestureEvent; diff --git a/third_party/WebKit/Source/web/PinchViewports.cpp b/third_party/WebKit/Source/web/PinchViewports.cpp index 0c104a0..02d1ced 100644 --- a/third_party/WebKit/Source/web/PinchViewports.cpp +++ b/third_party/WebKit/Source/web/PinchViewports.cpp @@ -48,7 +48,7 @@ using WebCore::GraphicsLayer; -namespace WebKit { +namespace blink { PassOwnPtr<PinchViewports> PinchViewports::create(WebViewImpl* owner) { @@ -213,4 +213,4 @@ String PinchViewports::debugName(const GraphicsLayer* graphicsLayer) return name; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/PinchViewports.h b/third_party/WebKit/Source/web/PinchViewports.h index 15f90f8..7b33491 100644 --- a/third_party/WebKit/Source/web/PinchViewports.h +++ b/third_party/WebKit/Source/web/PinchViewports.h @@ -45,7 +45,7 @@ class IntRect; class IntSize; } -namespace WebKit { +namespace blink { class WebLayerTreeView; class WebScrollbarLayer; @@ -75,7 +75,7 @@ public: private: explicit PinchViewports(WebViewImpl* owner); - void setupScrollbar(WebKit::WebScrollbar::Orientation); + void setupScrollbar(blink::WebScrollbar::Orientation); WebViewImpl* m_owner; OwnPtr<WebCore::GraphicsLayer> m_innerViewportContainerLayer; @@ -87,6 +87,6 @@ private: OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarVertical; }; -} // namespace WebKit +} // namespace blink #endif // PinchViewports_h diff --git a/third_party/WebKit/Source/web/PrerendererClientImpl.cpp b/third_party/WebKit/Source/web/PrerendererClientImpl.cpp index c7a7018..ee1179a 100644 --- a/third_party/WebKit/Source/web/PrerendererClientImpl.cpp +++ b/third_party/WebKit/Source/web/PrerendererClientImpl.cpp @@ -39,7 +39,7 @@ #include "public/platform/WebPrerender.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { PrerendererClientImpl::PrerendererClientImpl(WebPrerendererClient* client) : m_client(client) diff --git a/third_party/WebKit/Source/web/PrerendererClientImpl.h b/third_party/WebKit/Source/web/PrerendererClientImpl.h index 05bf024..8f3f7c5 100644 --- a/third_party/WebKit/Source/web/PrerendererClientImpl.h +++ b/third_party/WebKit/Source/web/PrerendererClientImpl.h @@ -40,7 +40,7 @@ namespace WebCore { class Prerender; } -namespace WebKit { +namespace blink { class WebPrerendererClient; diff --git a/third_party/WebKit/Source/web/ScrollbarGroup.cpp b/third_party/WebKit/Source/web/ScrollbarGroup.cpp index e2f232f..e23141c 100644 --- a/third_party/WebKit/Source/web/ScrollbarGroup.cpp +++ b/third_party/WebKit/Source/web/ScrollbarGroup.cpp @@ -34,7 +34,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { ScrollbarGroup::ScrollbarGroup(FrameView* frameView, const IntRect& frameRect) : m_frameView(frameView) @@ -292,4 +292,4 @@ int ScrollbarGroup::pageStep(ScrollbarOrientation orientation) const return std::max(pageStep, 1); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ScrollbarGroup.h b/third_party/WebKit/Source/web/ScrollbarGroup.h index e99815c..8306430 100644 --- a/third_party/WebKit/Source/web/ScrollbarGroup.h +++ b/third_party/WebKit/Source/web/ScrollbarGroup.h @@ -34,7 +34,7 @@ namespace WebCore { class FrameView; } -namespace WebKit { +namespace blink { class WebPluginScrollbarImpl; @@ -85,6 +85,6 @@ private: WebPluginScrollbarImpl* m_verticalScrollbar; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp index b6f954a..914f9ea 100644 --- a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp +++ b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp @@ -56,7 +56,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Callback class that keeps the SharedWorker and WebSharedWorker objects alive while loads are potentially happening, and also translates load errors into error events on the worker. class SharedWorkerScriptLoader : private WorkerScriptLoaderClient, private WebSharedWorker::ConnectListener { @@ -130,7 +130,7 @@ void SharedWorkerScriptLoader::notifyFinished() } else { InspectorInstrumentation::scriptImported(m_worker->executionContext(), m_scriptLoader->identifier(), m_scriptLoader->script()); // Pass the script off to the worker, then send a connect event. - m_webWorker->startWorkerContext(m_url, m_name, m_worker->executionContext()->userAgent(m_url), m_scriptLoader->script(), m_worker->executionContext()->contentSecurityPolicy()->deprecatedHeader(), static_cast<WebKit::WebContentSecurityPolicyType>(m_worker->executionContext()->contentSecurityPolicy()->deprecatedHeaderType()), m_responseAppCacheID); + m_webWorker->startWorkerContext(m_url, m_name, m_worker->executionContext()->userAgent(m_url), m_scriptLoader->script(), m_worker->executionContext()->contentSecurityPolicy()->deprecatedHeader(), static_cast<blink::WebContentSecurityPolicyType>(m_worker->executionContext()->contentSecurityPolicy()->deprecatedHeaderType()), m_responseAppCacheID); sendConnect(); } } @@ -186,4 +186,4 @@ SharedWorkerRepositoryClientImpl::SharedWorkerRepositoryClientImpl(WebSharedWork { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.h b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.h index feabe6d..5403c9d 100644 --- a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.h +++ b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.h @@ -36,7 +36,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebSharedWorkerRepositoryClient; @@ -59,6 +59,6 @@ private: WebSharedWorkerRepositoryClient* m_client; }; -} // namespace WebKit +} // namespace blink #endif // SharedWorkerRepositoryClientImpl_h diff --git a/third_party/WebKit/Source/web/SourceBufferPrivateImpl.cpp b/third_party/WebKit/Source/web/SourceBufferPrivateImpl.cpp index a756a1e..8f263f9 100644 --- a/third_party/WebKit/Source/web/SourceBufferPrivateImpl.cpp +++ b/third_party/WebKit/Source/web/SourceBufferPrivateImpl.cpp @@ -33,7 +33,7 @@ #include "WebSourceBuffer.h" -namespace WebKit { +namespace blink { SourceBufferPrivateImpl::SourceBufferPrivateImpl(PassOwnPtr<WebSourceBuffer> sourceBuffer) : m_sourceBuffer(sourceBuffer) diff --git a/third_party/WebKit/Source/web/SourceBufferPrivateImpl.h b/third_party/WebKit/Source/web/SourceBufferPrivateImpl.h index b7caf61..27769ed 100644 --- a/third_party/WebKit/Source/web/SourceBufferPrivateImpl.h +++ b/third_party/WebKit/Source/web/SourceBufferPrivateImpl.h @@ -35,7 +35,7 @@ #include "wtf/OwnPtr.h" #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { class WebSourceBuffer; diff --git a/third_party/WebKit/Source/web/SpeechInputClientImpl.cpp b/third_party/WebKit/Source/web/SpeechInputClientImpl.cpp index 7738964..2c8e4fa 100644 --- a/third_party/WebKit/Source/web/SpeechInputClientImpl.cpp +++ b/third_party/WebKit/Source/web/SpeechInputClientImpl.cpp @@ -42,7 +42,7 @@ #if ENABLE(INPUT_SPEECH) -namespace WebKit { +namespace blink { PassOwnPtr<SpeechInputClientImpl> SpeechInputClientImpl::create(WebViewClient* client) { @@ -103,6 +103,6 @@ void SpeechInputClientImpl::setRecognitionResult(int requestId, const WebSpeechI m_listener->setRecognitionResult(requestId, webcoreResults); } -} // namespace WebKit +} // namespace blink #endif // ENABLE(INPUT_SPEECH) diff --git a/third_party/WebKit/Source/web/SpeechInputClientImpl.h b/third_party/WebKit/Source/web/SpeechInputClientImpl.h index e258211..21426d2 100644 --- a/third_party/WebKit/Source/web/SpeechInputClientImpl.h +++ b/third_party/WebKit/Source/web/SpeechInputClientImpl.h @@ -44,7 +44,7 @@ class SecurityOrigin; class SpeechInputListener; } -namespace WebKit { +namespace blink { class WebSpeechInputController; class WebViewClient; @@ -74,7 +74,7 @@ private: WebCore::SpeechInputListener* m_listener; }; -} // namespace WebKit +} // namespace blink #endif // ENABLE(INPUT_SPEECH) diff --git a/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp b/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp index 3ae6d91..288d527 100644 --- a/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp +++ b/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { SpeechRecognitionClientProxy::~SpeechRecognitionClientProxy() { @@ -146,4 +146,4 @@ SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h b/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h index 67c90f9..63a45da 100644 --- a/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h +++ b/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.h @@ -32,7 +32,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebSpeechRecognizer; class WebString; @@ -67,6 +67,6 @@ private: WebSpeechRecognizer* m_recognizer; }; -}; // namespace WebKit +}; // namespace blink #endif // SpeechRecognitionClientProxy_h diff --git a/third_party/WebKit/Source/web/StorageAreaProxy.cpp b/third_party/WebKit/Source/web/StorageAreaProxy.cpp index de26f06..e669b1f 100644 --- a/third_party/WebKit/Source/web/StorageAreaProxy.cpp +++ b/third_party/WebKit/Source/web/StorageAreaProxy.cpp @@ -51,7 +51,7 @@ namespace WebCore { -StorageAreaProxy::StorageAreaProxy(PassOwnPtr<WebKit::WebStorageArea> storageArea, StorageType storageType) +StorageAreaProxy::StorageAreaProxy(PassOwnPtr<blink::WebStorageArea> storageArea, StorageType storageType) : m_storageArea(storageArea) , m_storageType(storageType) , m_canAccessStorageCachedResult(false) @@ -96,9 +96,9 @@ void StorageAreaProxy::setItem(const String& key, const String& value, Exception es.throwSecurityError(ExceptionMessages::failedToExecute("setItem", "Storage", "access is denied for this document.")); return; } - WebKit::WebStorageArea::Result result = WebKit::WebStorageArea::ResultOK; + blink::WebStorageArea::Result result = blink::WebStorageArea::ResultOK; m_storageArea->setItem(key, value, frame->document()->url(), result); - if (result != WebKit::WebStorageArea::ResultOK) + if (result != blink::WebStorageArea::ResultOK) es.throwDOMException(QuotaExceededError, ExceptionMessages::failedToExecute("setItem", "Storage", "Setting the value of '" + key + "' exceeded the quota.")); } @@ -135,8 +135,8 @@ bool StorageAreaProxy::canAccessStorage(Frame* frame) return false; if (m_canAccessStorageCachedFrame == frame) return m_canAccessStorageCachedResult; - WebKit::WebFrameImpl* webFrame = WebKit::WebFrameImpl::fromFrame(frame); - WebKit::WebViewImpl* webView = webFrame->viewImpl(); + blink::WebFrameImpl* webFrame = blink::WebFrameImpl::fromFrame(frame); + blink::WebViewImpl* webView = webFrame->viewImpl(); bool result = !webView->permissionClient() || webView->permissionClient()->allowStorage(webFrame, m_storageType == LocalStorage); m_canAccessStorageCachedFrame = frame; m_canAccessStorageCachedResult = result; @@ -149,7 +149,7 @@ size_t StorageAreaProxy::memoryBytesUsedByCache() } void StorageAreaProxy::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, - SecurityOrigin* securityOrigin, const KURL& pageURL, WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess) + SecurityOrigin* securityOrigin, const KURL& pageURL, blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess) { // FIXME: This looks suspicious. Why doesn't this use allPages instead? const HashSet<Page*>& pages = PageGroup::sharedGroup()->pages(); @@ -163,7 +163,7 @@ void StorageAreaProxy::dispatchLocalStorageEvent(const String& key, const String } } -static Page* findPageWithSessionStorageNamespace(const WebKit::WebStorageNamespace& sessionNamespace) +static Page* findPageWithSessionStorageNamespace(const blink::WebStorageNamespace& sessionNamespace) { // FIXME: This looks suspicious. Why doesn't this use allPages instead? const HashSet<Page*>& pages = PageGroup::sharedGroup()->pages(); @@ -177,8 +177,8 @@ static Page* findPageWithSessionStorageNamespace(const WebKit::WebStorageNamespa } void StorageAreaProxy::dispatchSessionStorageEvent(const String& key, const String& oldValue, const String& newValue, - SecurityOrigin* securityOrigin, const KURL& pageURL, const WebKit::WebStorageNamespace& sessionNamespace, - WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess) + SecurityOrigin* securityOrigin, const KURL& pageURL, const blink::WebStorageNamespace& sessionNamespace, + blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess) { Page* page = findPageWithSessionStorageNamespace(sessionNamespace); if (!page) @@ -192,7 +192,7 @@ void StorageAreaProxy::dispatchSessionStorageEvent(const String& key, const Stri InspectorInstrumentation::didDispatchDOMStorageEvent(page, key, oldValue, newValue, SessionStorage, securityOrigin); } -bool StorageAreaProxy::isEventSource(Storage* storage, WebKit::WebStorageArea* sourceAreaInstance) +bool StorageAreaProxy::isEventSource(Storage* storage, blink::WebStorageArea* sourceAreaInstance) { ASSERT(storage); StorageAreaProxy* areaProxy = static_cast<StorageAreaProxy*>(storage->area()); diff --git a/third_party/WebKit/Source/web/StorageAreaProxy.h b/third_party/WebKit/Source/web/StorageAreaProxy.h index 4646825..ba4ec45 100644 --- a/third_party/WebKit/Source/web/StorageAreaProxy.h +++ b/third_party/WebKit/Source/web/StorageAreaProxy.h @@ -28,7 +28,7 @@ #include "core/storage/StorageArea.h" -namespace WebKit { +namespace blink { class WebStorageArea; class WebStorageNamespace; } @@ -44,7 +44,7 @@ class Storage; class StorageAreaProxy : public StorageArea { public: - StorageAreaProxy(PassOwnPtr<WebKit::WebStorageArea>, StorageType); + StorageAreaProxy(PassOwnPtr<blink::WebStorageArea>, StorageType); virtual ~StorageAreaProxy(); // The HTML5 DOM Storage API @@ -62,16 +62,16 @@ public: static void dispatchLocalStorageEvent( const String& key, const String& oldValue, const String& newValue, - SecurityOrigin*, const KURL& pageURL, WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess); + SecurityOrigin*, const KURL& pageURL, blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess); static void dispatchSessionStorageEvent( const String& key, const String& oldValue, const String& newValue, - SecurityOrigin*, const KURL& pageURL, const WebKit::WebStorageNamespace&, - WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess); + SecurityOrigin*, const KURL& pageURL, const blink::WebStorageNamespace&, + blink::WebStorageArea* sourceAreaInstance, bool originatedInProcess); private: - static bool isEventSource(Storage*, WebKit::WebStorageArea* sourceAreaInstance); + static bool isEventSource(Storage*, blink::WebStorageArea* sourceAreaInstance); - OwnPtr<WebKit::WebStorageArea> m_storageArea; + OwnPtr<blink::WebStorageArea> m_storageArea; StorageType m_storageType; mutable bool m_canAccessStorageCachedResult; mutable Frame* m_canAccessStorageCachedFrame; diff --git a/third_party/WebKit/Source/web/StorageNamespaceProxy.cpp b/third_party/WebKit/Source/web/StorageNamespaceProxy.cpp index 9f6ecdb..6940fdb 100644 --- a/third_party/WebKit/Source/web/StorageNamespaceProxy.cpp +++ b/third_party/WebKit/Source/web/StorageNamespaceProxy.cpp @@ -45,19 +45,19 @@ namespace WebCore { PassOwnPtr<StorageArea> StorageNamespace::localStorageArea(SecurityOrigin* origin) { ASSERT(isMainThread()); - static WebKit::WebStorageNamespace* localStorageNamespace = 0; + static blink::WebStorageNamespace* localStorageNamespace = 0; if (!localStorageNamespace) - localStorageNamespace = WebKit::Platform::current()->createLocalStorageNamespace(); + localStorageNamespace = blink::Platform::current()->createLocalStorageNamespace(); return adoptPtr(new StorageAreaProxy(adoptPtr(localStorageNamespace->createStorageArea(origin->toString())), LocalStorage)); } PassOwnPtr<StorageNamespace> StorageNamespace::sessionStorageNamespace(Page* page) { - WebKit::WebViewClient* webViewClient = WebKit::WebViewImpl::fromPage(page)->client(); + blink::WebViewClient* webViewClient = blink::WebViewImpl::fromPage(page)->client(); return adoptPtr(new StorageNamespaceProxy(adoptPtr(webViewClient->createSessionStorageNamespace()))); } -StorageNamespaceProxy::StorageNamespaceProxy(PassOwnPtr<WebKit::WebStorageNamespace> storageNamespace) +StorageNamespaceProxy::StorageNamespaceProxy(PassOwnPtr<blink::WebStorageNamespace> storageNamespace) : m_storageNamespace(storageNamespace) { } @@ -71,7 +71,7 @@ PassOwnPtr<StorageArea> StorageNamespaceProxy::storageArea(SecurityOrigin* origi return adoptPtr(new StorageAreaProxy(adoptPtr(m_storageNamespace->createStorageArea(origin->toString())), SessionStorage)); } -bool StorageNamespaceProxy::isSameNamespace(const WebKit::WebStorageNamespace& sessionNamespace) +bool StorageNamespaceProxy::isSameNamespace(const blink::WebStorageNamespace& sessionNamespace) { return m_storageNamespace && m_storageNamespace->isSameNamespace(sessionNamespace); } diff --git a/third_party/WebKit/Source/web/StorageNamespaceProxy.h b/third_party/WebKit/Source/web/StorageNamespaceProxy.h index b76f9c5..f69ed15 100644 --- a/third_party/WebKit/Source/web/StorageNamespaceProxy.h +++ b/third_party/WebKit/Source/web/StorageNamespaceProxy.h @@ -29,7 +29,7 @@ #include "core/storage/StorageArea.h" #include "core/storage/StorageNamespace.h" -namespace WebKit { class WebStorageNamespace; } +namespace blink { class WebStorageNamespace; } namespace WebCore { @@ -37,14 +37,14 @@ namespace WebCore { // SessionStorage, never LocalStorage. class StorageNamespaceProxy : public StorageNamespace { public: - explicit StorageNamespaceProxy(PassOwnPtr<WebKit::WebStorageNamespace>); + explicit StorageNamespaceProxy(PassOwnPtr<blink::WebStorageNamespace>); virtual ~StorageNamespaceProxy(); virtual PassOwnPtr<StorageArea> storageArea(SecurityOrigin*); - bool isSameNamespace(const WebKit::WebStorageNamespace&); + bool isSameNamespace(const blink::WebStorageNamespace&); private: - OwnPtr<WebKit::WebStorageNamespace> m_storageNamespace; + OwnPtr<blink::WebStorageNamespace> m_storageNamespace; }; } // namespace WebCore diff --git a/third_party/WebKit/Source/web/StorageQuotaChromium.cpp b/third_party/WebKit/Source/web/StorageQuotaChromium.cpp index 22ea4f7..bb7740d 100644 --- a/third_party/WebKit/Source/web/StorageQuotaChromium.cpp +++ b/third_party/WebKit/Source/web/StorageQuotaChromium.cpp @@ -43,7 +43,7 @@ #include "modules/quota/WebStorageQuotaCallbacksImpl.h" #include "wtf/Threading.h" -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/web/UserMediaClientImpl.cpp b/third_party/WebKit/Source/web/UserMediaClientImpl.cpp index bba5c19..31e2756 100644 --- a/third_party/WebKit/Source/web/UserMediaClientImpl.cpp +++ b/third_party/WebKit/Source/web/UserMediaClientImpl.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { UserMediaClientImpl::UserMediaClientImpl(WebViewImpl* webView) : m_client(webView->client() ? webView->client()->userMediaClient() : 0) @@ -59,4 +59,4 @@ void UserMediaClientImpl::cancelUserMediaRequest(UserMediaRequest* request) m_client->cancelUserMediaRequest(WebUserMediaRequest(request)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/UserMediaClientImpl.h b/third_party/WebKit/Source/web/UserMediaClientImpl.h index 47878c9..5f268cc 100644 --- a/third_party/WebKit/Source/web/UserMediaClientImpl.h +++ b/third_party/WebKit/Source/web/UserMediaClientImpl.h @@ -39,7 +39,7 @@ namespace WebCore { class UserMediaRequest; } -namespace WebKit { +namespace blink { class WebUserMediaClient; class WebViewImpl; @@ -58,6 +58,6 @@ private: WebUserMediaClient* m_client; }; -} // namespace WebKit +} // namespace blink #endif // UserMediaClientImpl_h diff --git a/third_party/WebKit/Source/web/ValidationMessageClientImpl.cpp b/third_party/WebKit/Source/web/ValidationMessageClientImpl.cpp index dc0864d..ceaab76 100644 --- a/third_party/WebKit/Source/web/ValidationMessageClientImpl.cpp +++ b/third_party/WebKit/Source/web/ValidationMessageClientImpl.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { ValidationMessageClientImpl::ValidationMessageClientImpl(WebViewImpl& webView, WebValidationMessageClient* client) : m_webView(webView) diff --git a/third_party/WebKit/Source/web/ValidationMessageClientImpl.h b/third_party/WebKit/Source/web/ValidationMessageClientImpl.h index 491477f..85d21f1 100644 --- a/third_party/WebKit/Source/web/ValidationMessageClientImpl.h +++ b/third_party/WebKit/Source/web/ValidationMessageClientImpl.h @@ -35,7 +35,7 @@ namespace WebCore { class FrameView; } -namespace WebKit { +namespace blink { class WebValidationMessageClient; class WebViewImpl; diff --git a/third_party/WebKit/Source/web/ViewportAnchor.cpp b/third_party/WebKit/Source/web/ViewportAnchor.cpp index 430a830..0c8f9c2 100644 --- a/third_party/WebKit/Source/web/ViewportAnchor.cpp +++ b/third_party/WebKit/Source/web/ViewportAnchor.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -124,4 +124,4 @@ IntPoint ViewportAnchor::computeOrigin(const IntSize& currentViewSize) const return flooredIntPoint(anchorPoint - anchorOffsetFromOrigin); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/ViewportAnchor.h b/third_party/WebKit/Source/web/ViewportAnchor.h index 51d6700..e816a97 100644 --- a/third_party/WebKit/Source/web/ViewportAnchor.h +++ b/third_party/WebKit/Source/web/ViewportAnchor.h @@ -43,7 +43,7 @@ class IntSize; class Node; } -namespace WebKit { +namespace blink { // ViewportAnchor provides a way to anchor a viewport origin to a DOM node. // In particular, the user supplies the current viewport (in CSS coordinates) @@ -73,6 +73,6 @@ private: WebCore::FloatSize m_anchorInNodeCoords; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebAXObject.cpp b/third_party/WebKit/Source/web/WebAXObject.cpp index 2eb2a5e..af98cf27 100644 --- a/third_party/WebKit/Source/web/WebAXObject.cpp +++ b/third_party/WebKit/Source/web/WebAXObject.cpp @@ -55,14 +55,14 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebAXObject::reset() { m_private.reset(); } -void WebAXObject::assign(const WebKit::WebAXObject& other) +void WebAXObject::assign(const blink::WebAXObject& other) { m_private = other.m_private; } @@ -608,7 +608,7 @@ bool WebAXObject::press() const WebAXRole WebAXObject::role() const { if (isDetached()) - return WebKit::WebAXRoleUnknown; + return blink::WebAXRoleUnknown; return static_cast<WebAXRole>(m_private->roleValue()); } @@ -1073,4 +1073,4 @@ WebAXObject::operator WTF::PassRefPtr<WebCore::AXObject>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebArrayBufferView.cpp b/third_party/WebKit/Source/web/WebArrayBufferView.cpp index 044ace4..95dab2a 100644 --- a/third_party/WebKit/Source/web/WebArrayBufferView.cpp +++ b/third_party/WebKit/Source/web/WebArrayBufferView.cpp @@ -34,7 +34,7 @@ using namespace WTF; -namespace WebKit { +namespace blink { void WebArrayBufferView::assign(const WebArrayBufferView& other) { @@ -85,4 +85,4 @@ WebArrayBufferView::operator PassRefPtr<ArrayBufferView>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebBindings.cpp b/third_party/WebKit/Source/web/WebBindings.cpp index f5b6b53..fd7a821 100644 --- a/third_party/WebKit/Source/web/WebBindings.cpp +++ b/third_party/WebKit/Source/web/WebBindings.cpp @@ -52,7 +52,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebBindings::construct(NPP npp, NPObject* object, const NPVariant* args, uint32_t argCount, NPVariant* result) { @@ -398,4 +398,4 @@ v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant) return convertNPVariantToV8Object(variant, 0, isolate); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebBlob.cpp b/third_party/WebKit/Source/web/WebBlob.cpp index 66ccc96..e9582b4 100644 --- a/third_party/WebKit/Source/web/WebBlob.cpp +++ b/third_party/WebKit/Source/web/WebBlob.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebBlob WebBlob::createFromFile(const WebString& path, long long size) { @@ -100,4 +100,4 @@ WebBlob::operator WTF::PassRefPtr<WebCore::Blob>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebCache.cpp b/third_party/WebKit/Source/web/WebCache.cpp index c68013d..a1bad40 100644 --- a/third_party/WebKit/Source/web/WebCache.cpp +++ b/third_party/WebKit/Source/web/WebCache.cpp @@ -35,7 +35,7 @@ using WebCore::MemoryCache; -namespace WebKit { +namespace blink { // A helper method for coverting a MemoryCache::TypeStatistic to a // WebCache::ResourceTypeStat. @@ -94,4 +94,4 @@ void WebCache::getResourceTypeStats(ResourceTypeStats* result) memset(result, 0, sizeof(WebCache::ResourceTypeStats)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebCachedURLRequest.cpp b/third_party/WebKit/Source/web/WebCachedURLRequest.cpp index 2a9bcbf..c5656ff 100644 --- a/third_party/WebKit/Source/web/WebCachedURLRequest.cpp +++ b/third_party/WebKit/Source/web/WebCachedURLRequest.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebCachedURLRequest::reset() { @@ -74,4 +74,4 @@ WebCachedURLRequest::WebCachedURLRequest(FetchRequest* request) { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebColorName.cpp b/third_party/WebKit/Source/web/WebColorName.cpp index 3fafa7b..efdcf34 100644 --- a/third_party/WebKit/Source/web/WebColorName.cpp +++ b/third_party/WebKit/Source/web/WebColorName.cpp @@ -39,7 +39,7 @@ using namespace::WebCore; -namespace WebKit { +namespace blink { static int toCSSValueKeyword(WebColorName name) { diff --git a/third_party/WebKit/Source/web/WebCrossOriginPreflightResultCache.cpp b/third_party/WebKit/Source/web/WebCrossOriginPreflightResultCache.cpp index 62d43de..2e0274f 100644 --- a/third_party/WebKit/Source/web/WebCrossOriginPreflightResultCache.cpp +++ b/third_party/WebKit/Source/web/WebCrossOriginPreflightResultCache.cpp @@ -33,11 +33,11 @@ #include "core/loader/CrossOriginPreflightResultCache.h" -namespace WebKit { +namespace blink { void WebCrossOriginPreflightResultCache::clear() { WebCore::CrossOriginPreflightResultCache::shared().empty(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebCustomElement.cpp b/third_party/WebKit/Source/web/WebCustomElement.cpp index f34222e..213ba6a 100644 --- a/third_party/WebKit/Source/web/WebCustomElement.cpp +++ b/third_party/WebKit/Source/web/WebCustomElement.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebCustomElement::addEmbedderCustomElementName(const WebString& name) { @@ -45,4 +45,4 @@ void WebCustomElement::addEmbedderCustomElementName(const WebString& name) CustomElement::addEmbedderCustomElementName(name); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp b/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp index 98cd506..9dc25cd 100644 --- a/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp +++ b/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class DOMActivityLoggerContainer : public V8DOMActivityLogger { public: @@ -75,4 +75,4 @@ void setDOMActivityLogger(int worldId, WebDOMActivityLogger* logger) DOMWrapperWorld::setActivityLogger(worldId, adoptPtr(new DOMActivityLoggerContainer(adoptPtr(logger)))); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMCustomEvent.cpp b/third_party/WebKit/Source/web/WebDOMCustomEvent.cpp index 51d7273..7c340e0 100644 --- a/third_party/WebKit/Source/web/WebDOMCustomEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMCustomEvent.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebDOMCustomEvent::initCustomEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& webSerializedScriptValue) { @@ -48,4 +48,4 @@ void WebDOMCustomEvent::initCustomEvent(const WebString& type, bool canBubble, b unwrap<CustomEvent>()->initCustomEvent(type, canBubble, cancelable, serializedScriptValue.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMError.cpp b/third_party/WebKit/Source/web/WebDOMError.cpp index d92123b..75f323f 100644 --- a/third_party/WebKit/Source/web/WebDOMError.cpp +++ b/third_party/WebKit/Source/web/WebDOMError.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMError WebDOMError::create(const WebString& name, const WebString& message) { @@ -92,4 +92,4 @@ WebDOMError::operator WTF::PassRefPtr<WebCore::DOMError>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMEvent.cpp b/third_party/WebKit/Source/web/WebDOMEvent.cpp index 3adf2cd..1d8e159 100644 --- a/third_party/WebKit/Source/web/WebDOMEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMEvent.cpp @@ -36,7 +36,7 @@ #include "core/events/Event.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { class WebDOMEventPrivate : public WebCore::Event { }; @@ -204,4 +204,4 @@ bool WebDOMEvent::isBeforeLoadEvent() const return m_private->hasInterface(WebCore::EventNames::BeforeLoadEvent); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMEventListener.cpp b/third_party/WebKit/Source/web/WebDOMEventListener.cpp index 27e6468..f676f04 100644 --- a/third_party/WebKit/Source/web/WebDOMEventListener.cpp +++ b/third_party/WebKit/Source/web/WebDOMEventListener.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMEventListener::WebDOMEventListener() : m_private(new WebDOMEventListenerPrivate(this)) @@ -63,4 +63,4 @@ EventListenerWrapper* WebDOMEventListener::getEventListenerWrapper(const WebStri return m_private->getEventListenerWrapper(eventType, useCapture, target); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.cpp b/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.cpp index 2d83ea2..b8faf8c 100644 --- a/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.cpp +++ b/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMEventListenerPrivate::WebDOMEventListenerPrivate(WebDOMEventListener* webDOMEventListener) : m_webDOMEventListener(webDOMEventListener) @@ -86,4 +86,4 @@ void WebDOMEventListenerPrivate::eventListenerDeleted(EventListenerWrapper* even ASSERT_NOT_REACHED(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.h b/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.h index 94640d3..6870e56 100644 --- a/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.h +++ b/third_party/WebKit/Source/web/WebDOMEventListenerPrivate.h @@ -38,7 +38,7 @@ namespace WebCore { class EventTarget; } -namespace WebKit { +namespace blink { class EventListenerWrapper; class WebDOMEventListener; @@ -87,6 +87,6 @@ private: Vector<ListenerInfo> m_listenerWrappers; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebDOMFileSystem.cpp b/third_party/WebKit/Source/web/WebDOMFileSystem.cpp index 26e3c45..1d222a8 100644 --- a/third_party/WebKit/Source/web/WebDOMFileSystem.cpp +++ b/third_party/WebKit/Source/web/WebDOMFileSystem.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMFileSystem WebDOMFileSystem::fromV8Value(v8::Handle<v8::Value> value) { @@ -106,4 +106,4 @@ WebDOMFileSystem::operator WTF::PassRefPtr<WebCore::DOMFileSystem>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMMediaStreamTrack.cpp b/third_party/WebKit/Source/web/WebDOMMediaStreamTrack.cpp index 856a18e..206ac0d 100644 --- a/third_party/WebKit/Source/web/WebDOMMediaStreamTrack.cpp +++ b/third_party/WebKit/Source/web/WebDOMMediaStreamTrack.cpp @@ -34,7 +34,7 @@ #include "V8MediaStreamTrack.h" #include "modules/mediastream/MediaStreamTrack.h" -namespace WebKit { +namespace blink { WebDOMMediaStreamTrack::WebDOMMediaStreamTrack(PassRefPtr<WebCore::MediaStreamTrack> track) : m_private(track) @@ -65,4 +65,4 @@ WebMediaStreamTrack WebDOMMediaStreamTrack::component() const return WebMediaStreamTrack(m_private->component()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMMessageEvent.cpp b/third_party/WebKit/Source/web/WebDOMMessageEvent.cpp index 0764478..87754e5 100644 --- a/third_party/WebKit/Source/web/WebDOMMessageEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMMessageEvent.cpp @@ -43,7 +43,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId, const WebMessagePortChannelArray& webChannels) { @@ -83,4 +83,4 @@ WebMessagePortChannelArray WebDOMMessageEvent::releaseChannels() return webChannels; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMMouseEvent.cpp b/third_party/WebKit/Source/web/WebDOMMouseEvent.cpp index 2c1dfc84..6b4ae09 100644 --- a/third_party/WebKit/Source/web/WebDOMMouseEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMMouseEvent.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { int WebDOMMouseEvent::screenX() const { @@ -97,4 +97,4 @@ bool WebDOMMouseEvent::buttonDown() const return constUnwrap<MouseEvent>()->buttonDown(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMProgressEvent.cpp b/third_party/WebKit/Source/web/WebDOMProgressEvent.cpp index a588c10..0c8648e 100644 --- a/third_party/WebKit/Source/web/WebDOMProgressEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMProgressEvent.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total) : WebDOMEvent(ProgressEvent::create(type, lengthIsComputable, loaded, total)) @@ -45,4 +45,4 @@ WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsCom ASSERT(isProgressEvent()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDOMResourceProgressEvent.cpp b/third_party/WebKit/Source/web/WebDOMResourceProgressEvent.cpp index 46cd8bb..8cc339e 100644 --- a/third_party/WebKit/Source/web/WebDOMResourceProgressEvent.cpp +++ b/third_party/WebKit/Source/web/WebDOMResourceProgressEvent.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebDOMResourceProgressEvent::WebDOMResourceProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total, const WebString& url) : WebDOMProgressEvent() @@ -44,4 +44,4 @@ WebDOMResourceProgressEvent::WebDOMResourceProgressEvent(const WebString& type, assign(ResourceProgressEvent::create(type, lengthIsComputable, loaded, total, url)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp index d532397..a07c29f 100644 --- a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp +++ b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static OwnPtr<WebPluginLoadObserver>& nextPluginLoadObserver() { @@ -185,4 +185,4 @@ WebDataSourceImpl::~WebDataSourceImpl() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDataSourceImpl.h b/third_party/WebKit/Source/web/WebDataSourceImpl.h index c0b6f6d..3ded23e 100644 --- a/third_party/WebKit/Source/web/WebDataSourceImpl.h +++ b/third_party/WebKit/Source/web/WebDataSourceImpl.h @@ -41,7 +41,7 @@ #include "wtf/PassOwnPtr.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { class WebPluginLoadObserver; @@ -92,6 +92,6 @@ private: OwnPtr<WebPluginLoadObserver> m_pluginLoadObserver; }; -} // namespace WebKit +} // namespace blink #endif // WebDataSourceImpl_h diff --git a/third_party/WebKit/Source/web/WebDatabase.cpp b/third_party/WebKit/Source/web/WebDatabase.cpp index dea6ea5..80796a8 100644 --- a/third_party/WebKit/Source/web/WebDatabase.cpp +++ b/third_party/WebKit/Source/web/WebDatabase.cpp @@ -42,7 +42,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static WebDatabaseObserver* databaseObserver = 0; @@ -111,4 +111,4 @@ WebDatabase::WebDatabase(const DatabaseBackendBase* database) { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp index 4eef66f..285fc6e 100644 --- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp +++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp @@ -82,7 +82,7 @@ namespace OverlayZOrders { static const int highlight = 99; } -namespace WebKit { +namespace blink { class ClientMessageLoopAdapter : public PageScriptDebugServer::ClientMessageLoop { public: @@ -109,7 +109,7 @@ public: } private: - ClientMessageLoopAdapter(PassOwnPtr<WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop> messageLoop) + ClientMessageLoopAdapter(PassOwnPtr<blink::WebDevToolsAgentClient::WebKitClientMessageLoop> messageLoop) : m_running(false) , m_messageLoop(messageLoop) { } @@ -162,7 +162,7 @@ private: } bool m_running; - OwnPtr<WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop> m_messageLoop; + OwnPtr<blink::WebDevToolsAgentClient::WebKitClientMessageLoop> m_messageLoop; typedef HashSet<WebViewImpl*> FrozenViewsSet; FrozenViewsSet m_frozenViews; // FIXME: The ownership model for s_instance is somewhat complicated. Can we make this simpler? @@ -210,7 +210,7 @@ WebDevToolsAgentImpl::~WebDevToolsAgentImpl() { ClientMessageLoopAdapter::inspectedViewClosed(m_webViewImpl); if (m_attached) - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); } void WebDevToolsAgentImpl::attach() @@ -220,7 +220,7 @@ void WebDevToolsAgentImpl::attach() inspectorController()->connectFrontend(this); inspectorController()->webViewResized(m_webViewImpl->size()); - WebKit::Platform::current()->currentThread()->addTaskObserver(this); + blink::Platform::current()->currentThread()->addTaskObserver(this); m_attached = true; } @@ -230,13 +230,13 @@ void WebDevToolsAgentImpl::reattach(const WebString& savedState) return; inspectorController()->reuseFrontend(this, savedState); - WebKit::Platform::current()->currentThread()->addTaskObserver(this); + blink::Platform::current()->currentThread()->addTaskObserver(this); m_attached = true; } void WebDevToolsAgentImpl::detach() { - WebKit::Platform::current()->currentThread()->removeTaskObserver(this); + blink::Platform::current()->currentThread()->removeTaskObserver(this); // Prevent controller from sending messages to the frontend. InspectorController* ic = inspectorController(); @@ -623,4 +623,4 @@ void WebDevToolsAgent::processPendingMessages() PageScriptDebugServer::shared().runPendingTasks(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h index b2800c8..00995639 100644 --- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h +++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h @@ -52,7 +52,7 @@ class Node; class PlatformKeyboardEvent; } -namespace WebKit { +namespace blink { class WebDevToolsAgentClient; class WebFrame; @@ -141,6 +141,6 @@ private: bool m_isOverlayScrollbarsEnabled; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentPrivate.h b/third_party/WebKit/Source/web/WebDevToolsAgentPrivate.h index 1e34649..c45e1b4 100644 --- a/third_party/WebKit/Source/web/WebDevToolsAgentPrivate.h +++ b/third_party/WebKit/Source/web/WebDevToolsAgentPrivate.h @@ -33,7 +33,7 @@ #include "WebDevToolsAgent.h" -namespace WebKit { +namespace blink { class WebFrameImpl; class WebInputEvent; struct WebSize; @@ -57,6 +57,6 @@ public: virtual WebSize deviceMetricsOffset() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp index 64ad9b9..fe2828a 100644 --- a/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp +++ b/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp @@ -62,7 +62,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebDevToolsFrontendImpl::InspectorFrontendResumeObserver : public ActiveDOMObject { WTF_MAKE_NONCOPYABLE(InspectorFrontendResumeObserver); @@ -172,4 +172,4 @@ void WebDevToolsFrontendImpl::doDispatchOnInspectorFrontend(const WebString& mes ScriptController::callFunction(frame->frame()->document(), function, dispatcherObject, args.size(), args.data(), isolate); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.h b/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.h index d8dbad1..007ed49 100644 --- a/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.h +++ b/third_party/WebKit/Source/web/WebDevToolsFrontendImpl.h @@ -39,7 +39,7 @@ #include "wtf/Vector.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { class WebDevToolsClientDelegate; class WebViewImpl; @@ -47,12 +47,12 @@ struct WebDevToolsMessageData; using WTF::String; -class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend { +class WebDevToolsFrontendImpl : public blink::WebDevToolsFrontend { WTF_MAKE_NONCOPYABLE(WebDevToolsFrontendImpl); public: WebDevToolsFrontendImpl( - WebKit::WebViewImpl* webViewImpl, - WebKit::WebDevToolsFrontendClient* client, + blink::WebViewImpl* webViewImpl, + blink::WebDevToolsFrontendClient* client, const String& applicationLocale); virtual ~WebDevToolsFrontendImpl(); @@ -65,14 +65,14 @@ private: void maybeDispatch(WebCore::Timer<WebDevToolsFrontendImpl>*); void doDispatchOnInspectorFrontend(const WebString& message); - WebKit::WebViewImpl* m_webViewImpl; - WebKit::WebDevToolsFrontendClient* m_client; + blink::WebViewImpl* m_webViewImpl; + blink::WebDevToolsFrontendClient* m_client; String m_applicationLocale; OwnPtr<InspectorFrontendResumeObserver> m_inspectorFrontendResumeObserver; Deque<WebString> m_messages; WebCore::Timer<WebDevToolsFrontendImpl> m_inspectorFrontendDispatchTimer; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebDocument.cpp b/third_party/WebKit/Source/web/WebDocument.cpp index 351206f..e34072b 100644 --- a/third_party/WebKit/Source/web/WebDocument.cpp +++ b/third_party/WebKit/Source/web/WebDocument.cpp @@ -68,7 +68,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebURL WebDocument::url() const { @@ -320,4 +320,4 @@ WebDocument::operator PassRefPtr<Document>() const return toDocument(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDocumentType.cpp b/third_party/WebKit/Source/web/WebDocumentType.cpp index a8351c6..d30d76f 100644 --- a/third_party/WebKit/Source/web/WebDocumentType.cpp +++ b/third_party/WebKit/Source/web/WebDocumentType.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebString WebDocumentType::name() const { @@ -60,4 +60,4 @@ WebDocumentType::operator PassRefPtr<DocumentType>() const return toDocumentType(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebDragData.cpp b/third_party/WebKit/Source/web/WebDragData.cpp index 78ea502..b4461c9 100644 --- a/third_party/WebKit/Source/web/WebDragData.cpp +++ b/third_party/WebKit/Source/web/WebDragData.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebDragDataPrivate : public ChromiumDataObject { }; @@ -175,4 +175,4 @@ void WebDragData::ensureMutable() ASSERT(m_private->hasOneRef()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebElement.cpp b/third_party/WebKit/Source/web/WebElement.cpp index 525744f..7497946 100644 --- a/third_party/WebKit/Source/web/WebElement.cpp +++ b/third_party/WebKit/Source/web/WebElement.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebElement::isFormControlElement() const { @@ -187,4 +187,4 @@ WebElement::operator PassRefPtr<Element>() const return toElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebEntities.cpp b/third_party/WebKit/Source/web/WebEntities.cpp index e3d1186..dd08b87 100644 --- a/third_party/WebKit/Source/web/WebEntities.cpp +++ b/third_party/WebKit/Source/web/WebEntities.cpp @@ -37,7 +37,7 @@ #include "wtf/text/StringBuilder.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { WebEntities::WebEntities(bool xmlEntities) { @@ -84,4 +84,4 @@ String WebEntities::convertEntitiesInString(const String& value) const return result.toString(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebEntities.h b/third_party/WebKit/Source/web/WebEntities.h index 1194b78..5e55247 100644 --- a/third_party/WebKit/Source/web/WebEntities.h +++ b/third_party/WebKit/Source/web/WebEntities.h @@ -34,7 +34,7 @@ #include "wtf/HashMap.h" #include "wtf/text/WTFString.h" -namespace WebKit { +namespace blink { // FIXME: This class is wrong and needs to be removed! class WebEntities { @@ -71,6 +71,6 @@ private: EntitiesMapType m_entitiesMap; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp b/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp index 73452d0..b6a7f45 100644 --- a/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp +++ b/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "WebFileChooserCompletionImpl.h" -namespace WebKit { +namespace blink { WebFileChooserCompletionImpl::WebFileChooserCompletionImpl(PassRefPtr<WebCore::FileChooser> chooser) : m_fileChooser(chooser) @@ -62,4 +62,4 @@ void WebFileChooserCompletionImpl::didChooseFile(const WebVector<SelectedFileInf delete this; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.h b/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.h index f025a5e..dd43c30 100644 --- a/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.h +++ b/third_party/WebKit/Source/web/WebFileChooserCompletionImpl.h @@ -37,11 +37,11 @@ #include "public/platform/WebVector.h" #include "wtf/PassRefPtr.h" -using WebKit::WebFileChooserCompletion; -using WebKit::WebString; -using WebKit::WebVector; +using blink::WebFileChooserCompletion; +using blink::WebString; +using blink::WebVector; -namespace WebKit { +namespace blink { class WebFileChooserCompletionImpl : public WebFileChooserCompletion { public: @@ -53,6 +53,6 @@ private: RefPtr<WebCore::FileChooser> m_fileChooser; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebFontCache.cpp b/third_party/WebKit/Source/web/WebFontCache.cpp index 6cab3be..eb88898 100644 --- a/third_party/WebKit/Source/web/WebFontCache.cpp +++ b/third_party/WebKit/Source/web/WebFontCache.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // static size_t WebFontCache::fontDataCount() @@ -61,4 +61,4 @@ void WebFontCache::prune() fontCache()->purgeInactiveFontData(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFontDescription.cpp b/third_party/WebKit/Source/web/WebFontDescription.cpp index 52b17e6..30fcc6f 100644 --- a/third_party/WebKit/Source/web/WebFontDescription.cpp +++ b/third_party/WebKit/Source/web/WebFontDescription.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebFontDescription::WebFontDescription(const FontDescription& desc, short fontLetterSpacing, short fontWordSpacing) @@ -68,4 +68,4 @@ WebFontDescription::operator WebCore::FontDescription() const return desc; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFontImpl.cpp b/third_party/WebKit/Source/web/WebFontImpl.cpp index a0fd2c8c..5e1397e 100644 --- a/third_party/WebKit/Source/web/WebFontImpl.cpp +++ b/third_party/WebKit/Source/web/WebFontImpl.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebFont* WebFont::create(const WebFontDescription& desc) { @@ -127,4 +127,4 @@ WebFloatRect WebFontImpl::selectionRectForText(const WebTextRun& run, const WebF return m_font.selectionRectForText(run, leftBaseline, height, from, to); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFontImpl.h b/third_party/WebKit/Source/web/WebFontImpl.h index 9142c2d..5250d68 100644 --- a/third_party/WebKit/Source/web/WebFontImpl.h +++ b/third_party/WebKit/Source/web/WebFontImpl.h @@ -36,7 +36,7 @@ namespace WebCore { class FontDescription; } -namespace WebKit { +namespace blink { class WebFontImpl : public WebFont { public: @@ -61,6 +61,6 @@ private: WebCore::Font m_font; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebFormControlElement.cpp b/third_party/WebKit/Source/web/WebFormControlElement.cpp index bd929fe..4ddf102f 100644 --- a/third_party/WebKit/Source/web/WebFormControlElement.cpp +++ b/third_party/WebKit/Source/web/WebFormControlElement.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebFormControlElement::isEnabled() const { @@ -108,4 +108,4 @@ WebFormControlElement::operator PassRefPtr<HTMLFormControlElement>() const return toHTMLFormControlElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFormElement.cpp b/third_party/WebKit/Source/web/WebFormElement.cpp index 01de30f..c4b96f3 100644 --- a/third_party/WebKit/Source/web/WebFormElement.cpp +++ b/third_party/WebKit/Source/web/WebFormElement.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebFormElement::autoComplete() const { @@ -123,4 +123,4 @@ WebFormElement::operator PassRefPtr<HTMLFormElement>() const return toHTMLFormElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFrameImpl.cpp b/third_party/WebKit/Source/web/WebFrameImpl.cpp index 1d7cadf..f90b40f9 100644 --- a/third_party/WebKit/Source/web/WebFrameImpl.cpp +++ b/third_party/WebKit/Source/web/WebFrameImpl.cpp @@ -200,7 +200,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static int frameCount = 0; @@ -2114,13 +2114,13 @@ WebFrameImpl::WebFrameImpl(WebFrameClient* client, long long embedderIdentifier) , m_inSameDocumentHistoryLoad(false) , m_inputEventsScaleFactorForEmulation(1) { - WebKit::Platform::current()->incrementStatsCounter(webFrameActiveCount); + blink::Platform::current()->incrementStatsCounter(webFrameActiveCount); frameCount++; } WebFrameImpl::~WebFrameImpl() { - WebKit::Platform::current()->decrementStatsCounter(webFrameActiveCount); + blink::Platform::current()->decrementStatsCounter(webFrameActiveCount); frameCount--; cancelPendingScopingEffort(); @@ -2529,4 +2529,4 @@ void WebFrameImpl::willDetachPage() } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebFrameImpl.h b/third_party/WebKit/Source/web/WebFrameImpl.h index 00865c5..325f0dc 100644 --- a/third_party/WebKit/Source/web/WebFrameImpl.h +++ b/third_party/WebKit/Source/web/WebFrameImpl.h @@ -56,7 +56,7 @@ struct FrameLoadRequest; struct WindowFeatures; } -namespace WebKit { +namespace blink { class ChromePrintContext; class WebDataSourceImpl; class WebInputElement; @@ -534,6 +534,6 @@ inline const WebFrameImpl* toWebFrameImpl(const WebFrame* webFrame) // This will catch anyone doing an unnecessary cast. void toWebFrameImpl(const WebFrameImpl*); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebGeolocationClientMock.cpp b/third_party/WebKit/Source/web/WebGeolocationClientMock.cpp index fcef4e9..96ac531 100644 --- a/third_party/WebKit/Source/web/WebGeolocationClientMock.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationClientMock.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebGeolocationClientMock* WebGeolocationClientMock::create() { diff --git a/third_party/WebKit/Source/web/WebGeolocationController.cpp b/third_party/WebKit/Source/web/WebGeolocationController.cpp index 9ea91d9..ea78f84 100644 --- a/third_party/WebKit/Source/web/WebGeolocationController.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationController.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebGeolocationController::positionChanged(const WebGeolocationPosition& webPosition) { @@ -49,4 +49,4 @@ void WebGeolocationController::errorOccurred(const WebGeolocationError& webError m_private->errorOccurred(PassRefPtr<GeolocationError>(webError).get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebGeolocationError.cpp b/third_party/WebKit/Source/web/WebGeolocationError.cpp index 6284e68..ed17173 100644 --- a/third_party/WebKit/Source/web/WebGeolocationError.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationError.cpp @@ -31,7 +31,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebGeolocationError::assign(Error code, const WebString& message) { diff --git a/third_party/WebKit/Source/web/WebGeolocationPermissionRequest.cpp b/third_party/WebKit/Source/web/WebGeolocationPermissionRequest.cpp index 5731c8d..985f4e4 100644 --- a/third_party/WebKit/Source/web/WebGeolocationPermissionRequest.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationPermissionRequest.cpp @@ -34,7 +34,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebSecurityOrigin WebGeolocationPermissionRequest::securityOrigin() const { diff --git a/third_party/WebKit/Source/web/WebGeolocationPermissionRequestManager.cpp b/third_party/WebKit/Source/web/WebGeolocationPermissionRequestManager.cpp index bee4a3c..1085487 100644 --- a/third_party/WebKit/Source/web/WebGeolocationPermissionRequestManager.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationPermissionRequestManager.cpp @@ -38,7 +38,7 @@ using namespace WebCore; typedef HashMap<Geolocation*, int> GeolocationIdMap; typedef HashMap<int, Geolocation*> IdGeolocationMap; -namespace WebKit { +namespace blink { class WebGeolocationPermissionRequestManagerPrivate { public: GeolocationIdMap m_geolocationIdMap; @@ -46,9 +46,9 @@ public: }; } -using namespace WebKit; +using namespace blink; -int WebGeolocationPermissionRequestManager::add(const WebKit::WebGeolocationPermissionRequest& permissionRequest) +int WebGeolocationPermissionRequestManager::add(const blink::WebGeolocationPermissionRequest& permissionRequest) { Geolocation* geolocation = permissionRequest.geolocation(); ASSERT(!m_private->m_geolocationIdMap.contains(geolocation)); @@ -58,7 +58,7 @@ int WebGeolocationPermissionRequestManager::add(const WebKit::WebGeolocationPerm return id; } -bool WebGeolocationPermissionRequestManager::remove(const WebKit::WebGeolocationPermissionRequest& permissionRequest, int& id) +bool WebGeolocationPermissionRequestManager::remove(const blink::WebGeolocationPermissionRequest& permissionRequest, int& id) { Geolocation* geolocation = permissionRequest.geolocation(); GeolocationIdMap::iterator it = m_private->m_geolocationIdMap.find(geolocation); @@ -70,7 +70,7 @@ bool WebGeolocationPermissionRequestManager::remove(const WebKit::WebGeolocation return true; } -bool WebGeolocationPermissionRequestManager::remove(int id, WebKit::WebGeolocationPermissionRequest& permissionRequest) +bool WebGeolocationPermissionRequestManager::remove(int id, blink::WebGeolocationPermissionRequest& permissionRequest) { IdGeolocationMap::iterator it = m_private->m_idGeolocationMap.find(id); if (it == m_private->m_idGeolocationMap.end()) diff --git a/third_party/WebKit/Source/web/WebGeolocationPosition.cpp b/third_party/WebKit/Source/web/WebGeolocationPosition.cpp index e683f16..fc3b55f 100644 --- a/third_party/WebKit/Source/web/WebGeolocationPosition.cpp +++ b/third_party/WebKit/Source/web/WebGeolocationPosition.cpp @@ -30,7 +30,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebGeolocationPosition::assign(double timestamp, double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed) { @@ -58,4 +58,4 @@ WebGeolocationPosition::operator PassRefPtr<GeolocationPosition>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebGlyphCache.cpp b/third_party/WebKit/Source/web/WebGlyphCache.cpp index 1237802..fe79453 100644 --- a/third_party/WebKit/Source/web/WebGlyphCache.cpp +++ b/third_party/WebKit/Source/web/WebGlyphCache.cpp @@ -35,11 +35,11 @@ using namespace WebCore; -namespace WebKit { +namespace blink { size_t WebGlyphCache::pageCount() { return GlyphPageTreeNode::treeGlyphPageCount(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebHelperPluginImpl.cpp b/third_party/WebKit/Source/web/WebHelperPluginImpl.cpp index 4bc0be9..5f6e7bb 100644 --- a/third_party/WebKit/Source/web/WebHelperPluginImpl.cpp +++ b/third_party/WebKit/Source/web/WebHelperPluginImpl.cpp @@ -51,7 +51,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { #define addLiteral(literal, writer) writer->addData(literal, sizeof(literal) - 1) @@ -120,7 +120,7 @@ public: { } - virtual WebPlugin* createPlugin(WebKit::WebFrame* frame, const WebPluginParams& params) + virtual WebPlugin* createPlugin(blink::WebFrame* frame, const WebPluginParams& params) { return m_hostWebFrameClient->createPlugin(frame, params); } @@ -274,4 +274,4 @@ WebHelperPlugin* WebHelperPlugin::create(WebWidgetClient* client) return adoptRef(new WebHelperPluginImpl(client)).leakRef(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebHelperPluginImpl.h b/third_party/WebKit/Source/web/WebHelperPluginImpl.h index 17024eb..6629219 100644 --- a/third_party/WebKit/Source/web/WebHelperPluginImpl.h +++ b/third_party/WebKit/Source/web/WebHelperPluginImpl.h @@ -39,7 +39,7 @@ namespace WebCore { class Page; } -namespace WebKit { +namespace blink { class HelperPluginChromeClient; class HelperPluginFrameClient; @@ -92,6 +92,6 @@ inline WebHelperPluginImpl* toWebHelperPluginImpl(WebWidget* widget) return static_cast<WebHelperPluginImpl*>(widget); } -} // namespace WebKit +} // namespace blink #endif // WebHelperPluginImpl_h diff --git a/third_party/WebKit/Source/web/WebHistoryItem.cpp b/third_party/WebKit/Source/web/WebHistoryItem.cpp index cd76cb5..cf5c465 100644 --- a/third_party/WebKit/Source/web/WebHistoryItem.cpp +++ b/third_party/WebKit/Source/web/WebHistoryItem.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { void addReferencedFilePaths(HistoryItem* item, HashSet<String>& results) @@ -275,4 +275,4 @@ void WebHistoryItem::ensureMutable() m_private = m_private->copy(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebHitTestResult.cpp b/third_party/WebKit/Source/web/WebHitTestResult.cpp index 44daec2..9a0a26d 100644 --- a/third_party/WebKit/Source/web/WebHitTestResult.cpp +++ b/third_party/WebKit/Source/web/WebHitTestResult.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebNode WebHitTestResult::node() const { @@ -102,4 +102,4 @@ void WebHitTestResult::reset() m_private.reset(0); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBCallbacksImpl.cpp b/third_party/WebKit/Source/web/WebIDBCallbacksImpl.cpp index 679b214..9bbc1e8 100644 --- a/third_party/WebKit/Source/web/WebIDBCallbacksImpl.cpp +++ b/third_party/WebKit/Source/web/WebIDBCallbacksImpl.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebIDBCallbacksImpl::WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks> callbacks) : m_callbacks(callbacks) @@ -120,4 +120,4 @@ void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBDatabase* m_callbacks->onUpgradeNeeded(oldVersion, m_databaseProxy, metadata, dataLoss, dataLossMessage); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBCallbacksImpl.h b/third_party/WebKit/Source/web/WebIDBCallbacksImpl.h index 9ac3eff..6d8cbc1 100644 --- a/third_party/WebKit/Source/web/WebIDBCallbacksImpl.h +++ b/third_party/WebKit/Source/web/WebIDBCallbacksImpl.h @@ -37,7 +37,7 @@ class IDBDatabaseBackendInterface; } // namespace WebCore -namespace WebKit { +namespace blink { class WebIDBCallbacksImpl : public WebIDBCallbacks { public: @@ -62,6 +62,6 @@ private: RefPtr<WebCore::IDBDatabaseBackendInterface> m_databaseProxy; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBCallbacksImpl_h diff --git a/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.cpp b/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.cpp index b6e1758..efbdfb1 100644 --- a/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.cpp +++ b/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.cpp @@ -32,7 +32,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebIDBDatabaseCallbacksImpl::WebIDBDatabaseCallbacksImpl(PassRefPtr<IDBDatabaseCallbacks> callbacks) : m_callbacks(callbacks) @@ -63,4 +63,4 @@ void WebIDBDatabaseCallbacksImpl::onComplete(long long transactionId) m_callbacks->onComplete(transactionId); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.h b/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.h index 8bd370d..03a1fd4 100644 --- a/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.h +++ b/third_party/WebKit/Source/web/WebIDBDatabaseCallbacksImpl.h @@ -33,7 +33,7 @@ namespace WebCore { class IDBDatabaseCallbacks; } -namespace WebKit { +namespace blink { class WebIDBDatabaseCallbacksImpl : public WebIDBDatabaseCallbacks { public: @@ -49,6 +49,6 @@ private: RefPtr<WebCore::IDBDatabaseCallbacks> m_callbacks; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBDatabaseCallbacksImpl_h diff --git a/third_party/WebKit/Source/web/WebIDBDatabaseError.cpp b/third_party/WebKit/Source/web/WebIDBDatabaseError.cpp index 16855ae..9e5aaa6 100644 --- a/third_party/WebKit/Source/web/WebIDBDatabaseError.cpp +++ b/third_party/WebKit/Source/web/WebIDBDatabaseError.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebIDBDatabaseError::assign(const WebIDBDatabaseError& value) { @@ -63,4 +63,4 @@ WebIDBDatabaseError::operator PassRefPtr<DOMError>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBKey.cpp b/third_party/WebKit/Source/web/WebIDBKey.cpp index a9165b9..63ca246 100644 --- a/third_party/WebKit/Source/web/WebIDBKey.cpp +++ b/third_party/WebKit/Source/web/WebIDBKey.cpp @@ -32,7 +32,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebIDBKey WebIDBKey::createArray(const WebVector<WebIDBKey>& array) { @@ -229,4 +229,4 @@ WebIDBKey::operator PassRefPtr<IDBKey>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBKeyPath.cpp b/third_party/WebKit/Source/web/WebIDBKeyPath.cpp index a9db96e..5e70a7f 100644 --- a/third_party/WebKit/Source/web/WebIDBKeyPath.cpp +++ b/third_party/WebKit/Source/web/WebIDBKeyPath.cpp @@ -33,7 +33,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebIDBKeyPath WebIDBKeyPath::create(const WebString& keyPath) { @@ -109,4 +109,4 @@ WebIDBKeyPath::operator const WebCore::IDBKeyPath&() const return *(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBKeyRange.cpp b/third_party/WebKit/Source/web/WebIDBKeyRange.cpp index 0e46f03..7ebf607 100644 --- a/third_party/WebKit/Source/web/WebIDBKeyRange.cpp +++ b/third_party/WebKit/Source/web/WebIDBKeyRange.cpp @@ -32,7 +32,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebIDBKeyRange::assign(const WebIDBKeyRange& other) { @@ -92,4 +92,4 @@ WebIDBKeyRange::operator PassRefPtr<IDBKeyRange>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebIDBMetadata.cpp b/third_party/WebKit/Source/web/WebIDBMetadata.cpp index c47fc14..7835c1f 100644 --- a/third_party/WebKit/Source/web/WebIDBMetadata.cpp +++ b/third_party/WebKit/Source/web/WebIDBMetadata.cpp @@ -33,7 +33,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebIDBMetadata::WebIDBMetadata(const WebCore::IDBDatabaseMetadata& metadata) { @@ -86,4 +86,4 @@ WebIDBMetadata::operator IDBDatabaseMetadata() const return db; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebImageCache.cpp b/third_party/WebKit/Source/web/WebImageCache.cpp index 5e87767..b4b6f1d 100644 --- a/third_party/WebKit/Source/web/WebImageCache.cpp +++ b/third_party/WebKit/Source/web/WebImageCache.cpp @@ -35,7 +35,7 @@ using WebCore::ImageDecodingStore; -namespace WebKit { +namespace blink { void WebImageCache::setCacheLimitInBytes(size_t size) { @@ -58,4 +58,4 @@ unsigned WebImageCache::cacheEntries() return ImageDecodingStore::instance()->cacheEntries(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebImageDecoder.cpp b/third_party/WebKit/Source/web/WebImageDecoder.cpp index 6b5fd009..86edff2 100644 --- a/third_party/WebKit/Source/web/WebImageDecoder.cpp +++ b/third_party/WebKit/Source/web/WebImageDecoder.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebImageDecoder::reset() { @@ -53,7 +53,7 @@ void WebImageDecoder::reset() void WebImageDecoder::init(Type type) { - size_t maxDecodedBytes = WebKit::Platform::current()->maxDecodedImageBytes(); + size_t maxDecodedBytes = blink::Platform::current()->maxDecodedImageBytes(); switch (type) { case TypeBMP: @@ -114,4 +114,4 @@ WebImage WebImageDecoder::getFrameAtIndex(int index = 0) const return WebImage(image->bitmap()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebImageSkia.cpp b/third_party/WebKit/Source/web/WebImageSkia.cpp index eadc1d9..53001b4 100644 --- a/third_party/WebKit/Source/web/WebImageSkia.cpp +++ b/third_party/WebKit/Source/web/WebImageSkia.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) { @@ -165,4 +165,4 @@ WebImage& WebImage::operator=(const PassRefPtr<Image>& image) return *this; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputElement.cpp b/third_party/WebKit/Source/web/WebInputElement.cpp index ee896c3..996507b 100644 --- a/third_party/WebKit/Source/web/WebInputElement.cpp +++ b/third_party/WebKit/Source/web/WebInputElement.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebInputElement::isTextField() const { @@ -267,4 +267,4 @@ WebInputElement* toWebInputElement(WebElement* webElement) return static_cast<WebInputElement*>(webElement); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputEvent.cpp b/third_party/WebKit/Source/web/WebInputEvent.cpp index 5b81024..47864b2 100644 --- a/third_party/WebKit/Source/web/WebInputEvent.cpp +++ b/third_party/WebKit/Source/web/WebInputEvent.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { struct SameSizeAsWebInputEvent { int inputData[5]; @@ -236,4 +236,4 @@ int WebKeyboardEvent::locationModifiersFromWindowsKeyCode(int keycode) } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.cpp b/third_party/WebKit/Source/web/WebInputEventConversion.cpp index ac51505..09a534f 100644 --- a/third_party/WebKit/Source/web/WebInputEventConversion.cpp +++ b/third_party/WebKit/Source/web/WebInputEventConversion.cpp @@ -50,7 +50,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static const double millisPerSecond = 1000.0; @@ -770,4 +770,4 @@ WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const WebCo y = localPoint.y(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.h b/third_party/WebKit/Source/web/WebInputEventConversion.h index bc78753..dc71302 100644 --- a/third_party/WebKit/Source/web/WebInputEventConversion.h +++ b/third_party/WebKit/Source/web/WebInputEventConversion.h @@ -49,7 +49,7 @@ class WheelEvent; class Widget; } -namespace WebKit { +namespace blink { class WebMouseEvent; class WebMouseWheelEvent; @@ -143,6 +143,6 @@ public: WebGestureEventBuilder(const WebCore::Widget*, const WebCore::RenderObject*, const WebCore::GestureEvent&); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp b/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp index 5b204cdb..902211ec 100644 --- a/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp +++ b/third_party/WebKit/Source/web/WebInputEventFactoryAndroid.cpp @@ -36,7 +36,7 @@ #include "core/platform/chromium/KeyboardCodes.h" #include "wtf/Assertions.h" -namespace WebKit { +namespace blink { WebKeyboardEvent WebInputEventFactory::keyboardEvent(WebInputEvent::Type type, int modifiers, @@ -176,4 +176,4 @@ WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type, return result; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp b/third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp index ea66d63..6ac7125 100644 --- a/third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp +++ b/third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp @@ -50,7 +50,7 @@ static GdkWindow* gLastClickEventWindow = 0; static gint gLastClickTime = 0; static gint gLastClickX = 0; static gint gLastClickY = 0; -static WebKit::WebMouseEvent::Button gLastClickButton = WebKit::WebMouseEvent::ButtonNone; +static blink::WebMouseEvent::Button gLastClickButton = blink::WebMouseEvent::ButtonNone; bool shouldForgetPreviousClick(GdkWindow* window, gint time, gint x, gint y) { @@ -76,7 +76,7 @@ void resetClickCountState() gLastClickTime = 0; gLastClickX = 0; gLastClickY = 0; - gLastClickButton = WebKit::WebMouseEvent::ButtonNone; + gLastClickButton = blink::WebMouseEvent::ButtonNone; } bool isKeyPadKeyval(guint keyval) @@ -87,7 +87,7 @@ bool isKeyPadKeyval(guint keyval) } // namespace -namespace WebKit { +namespace blink { static double gdkEventTimeToWebEventTime(guint32 time) { @@ -421,7 +421,7 @@ WebKeyboardEvent WebInputEventFactory::keyboardEvent(wchar_t character, int stat // function creates a WebInputEvent::Char event without using a // GdkEventKey object. WebKeyboardEvent result; - result.type = WebKit::WebInputEvent::Char; + result.type = blink::WebInputEvent::Char; result.timeStampSeconds = timeStampSeconds; result.modifiers = gdkStateToWebEventModifiers(state); result.windowsKeyCode = character; @@ -625,4 +625,4 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(const GdkEventScroll* e return result; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebInputEventFactoryWin.cpp b/third_party/WebKit/Source/web/WebInputEventFactoryWin.cpp index 11f8342..65a618f 100644 --- a/third_party/WebKit/Source/web/WebInputEventFactoryWin.cpp +++ b/third_party/WebKit/Source/web/WebInputEventFactoryWin.cpp @@ -35,7 +35,7 @@ #include "wtf/Assertions.h" -namespace WebKit { +namespace blink { static const unsigned long defaultScrollLinesPerWheelDelta = 3; static const unsigned long defaultScrollCharsPerWheelDelta = 1; @@ -486,4 +486,4 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(HWND hwnd, UINT message return result; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp index cf26677..b7de228 100644 --- a/third_party/WebKit/Source/web/WebKit.cpp +++ b/third_party/WebKit/Source/web/WebKit.cpp @@ -59,7 +59,7 @@ #include <v8-defaults.h> #include <v8.h> -namespace WebKit { +namespace blink { namespace { @@ -167,9 +167,9 @@ void initializeWithoutV8(Platform* platform) // this, initializing this lazily probably doesn't buy us much. WTF::UTF8Encoding(); - WebCore::setIDBFactoryBackendInterfaceCreateFunction(WebKit::IDBFactoryBackendProxy::create); + WebCore::setIDBFactoryBackendInterfaceCreateFunction(blink::IDBFactoryBackendProxy::create); - WebCore::MediaPlayer::setMediaEngineCreateFunction(WebKit::WebMediaPlayerClientImpl::create); + WebCore::MediaPlayer::setMediaEngineCreateFunction(blink::WebMediaPlayerClientImpl::create); WebCore::WorkerGlobalScopeProxy::setCreateDelegate(WebWorkerClientImpl::createWorkerGlobalScopeProxy); } @@ -229,4 +229,4 @@ void resetPluginCache(bool reloadPages) WebCore::Page::refreshPlugins(reloadPages); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebLabelElement.cpp b/third_party/WebKit/Source/web/WebLabelElement.cpp index 59b4ffa..794a3e1 100644 --- a/third_party/WebKit/Source/web/WebLabelElement.cpp +++ b/third_party/WebKit/Source/web/WebLabelElement.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebElement WebLabelElement::correspondingControl() { @@ -61,4 +61,4 @@ WebLabelElement::operator PassRefPtr<HTMLLabelElement>() const return toHTMLLabelElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebMIDIClientMock.cpp b/third_party/WebKit/Source/web/WebMIDIClientMock.cpp index 923e03a..88ea15c 100644 --- a/third_party/WebKit/Source/web/WebMIDIClientMock.cpp +++ b/third_party/WebKit/Source/web/WebMIDIClientMock.cpp @@ -35,7 +35,7 @@ #include "modules/webmidi/MIDIClientMock.h" #include "public/web/WebMIDIPermissionRequest.h" -namespace WebKit { +namespace blink { WebMIDIClientMock::WebMIDIClientMock() { diff --git a/third_party/WebKit/Source/web/WebMIDIPermissionRequest.cpp b/third_party/WebKit/Source/web/WebMIDIPermissionRequest.cpp index 977045e..68b3d96 100644 --- a/third_party/WebKit/Source/web/WebMIDIPermissionRequest.cpp +++ b/third_party/WebKit/Source/web/WebMIDIPermissionRequest.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebMIDIPermissionRequest::WebMIDIPermissionRequest(const PassRefPtr<WebCore::MIDIAccess>& midi) : m_private(midi) @@ -75,4 +75,4 @@ void WebMIDIPermissionRequest::setIsAllowed(bool allowed) m_private->setSysExEnabled(allowed); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.cpp b/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.cpp index 29a87c5..8b629ef 100644 --- a/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.cpp +++ b/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.cpp @@ -50,7 +50,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, const WebURL& url, Frame* frame) { @@ -759,4 +759,4 @@ void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel #endif -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.h b/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.h index c62a7c2..d32eec7 100644 --- a/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.h +++ b/third_party/WebKit/Source/web/WebMediaPlayerClientImpl.h @@ -51,20 +51,20 @@ class AudioSourceProviderClient; class HTMLMediaSource; } -namespace WebKit { +namespace blink { class WebHelperPluginImpl; class WebAudioSourceProvider; class WebMediaPlayer; // This class serves as a bridge between WebCore::MediaPlayer and -// WebKit::WebMediaPlayer. +// blink::WebMediaPlayer. class WebMediaPlayerClientImpl : public WebCore::MediaPlayer, public WebMediaPlayerClient { public: static PassOwnPtr<WebCore::MediaPlayer> create(WebCore::MediaPlayerClient*); - // Returns the encapsulated WebKit::WebMediaPlayer. + // Returns the encapsulated blink::WebMediaPlayer. WebMediaPlayer* mediaPlayer() const; // WebMediaPlayerClient methods: @@ -97,7 +97,7 @@ public: virtual void load(const WTF::String& url) OVERRIDE; virtual void load(const WTF::String& url, PassRefPtr<WebCore::HTMLMediaSource>) OVERRIDE; - virtual WebKit::WebLayer* platformLayer() const OVERRIDE; + virtual blink::WebLayer* platformLayer() const OVERRIDE; virtual void play() OVERRIDE; virtual void pause() OVERRIDE; virtual void prepareToPlay() OVERRIDE; @@ -182,7 +182,7 @@ private: // AudioClientImpl wraps an AudioSourceProviderClient. // When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore. - class AudioClientImpl : public WebKit::WebAudioSourceProviderClient { + class AudioClientImpl : public blink::WebAudioSourceProviderClient { public: AudioClientImpl(WebCore::AudioSourceProviderClient* client) : m_client(client) @@ -229,6 +229,6 @@ private: RefPtr<WebCore::HTMLMediaSource> m_mediaSource; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebMediaStreamRegistry.cpp b/third_party/WebKit/Source/web/WebMediaStreamRegistry.cpp index 077dbd1..8ac473f 100644 --- a/third_party/WebKit/Source/web/WebMediaStreamRegistry.cpp +++ b/third_party/WebKit/Source/web/WebMediaStreamRegistry.cpp @@ -41,11 +41,11 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url) { return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescriptor(KURL(url).string())); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebMutationEvent.cpp b/third_party/WebKit/Source/web/WebMutationEvent.cpp index b43a391..8ce8f80 100644 --- a/third_party/WebKit/Source/web/WebMutationEvent.cpp +++ b/third_party/WebKit/Source/web/WebMutationEvent.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebNode WebMutationEvent::relatedNode() const { @@ -62,4 +62,4 @@ WebMutationEvent::AttrChangeType WebMutationEvent::attrChange() const return static_cast<AttrChangeType>(constUnwrap<MutationEvent>()->attrChange()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebNetworkStateNotifier.cpp b/third_party/WebKit/Source/web/WebNetworkStateNotifier.cpp index 6a969f8..ec0910e 100644 --- a/third_party/WebKit/Source/web/WebNetworkStateNotifier.cpp +++ b/third_party/WebKit/Source/web/WebNetworkStateNotifier.cpp @@ -35,11 +35,11 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebNetworkStateNotifier::setOnLine(bool onLine) { networkStateNotifier().setOnLine(onLine); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebNode.cpp b/third_party/WebKit/Source/web/WebNode.cpp index f6f87e9..4434847 100644 --- a/third_party/WebKit/Source/web/WebNode.cpp +++ b/third_party/WebKit/Source/web/WebNode.cpp @@ -56,7 +56,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebNode::reset() { @@ -266,4 +266,4 @@ WebNode::operator PassRefPtr<Node>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebNodeCollection.cpp b/third_party/WebKit/Source/web/WebNodeCollection.cpp index 6efbe23..1715730 100644 --- a/third_party/WebKit/Source/web/WebNodeCollection.cpp +++ b/third_party/WebKit/Source/web/WebNodeCollection.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebNodeCollection::reset() { @@ -86,4 +86,4 @@ WebNode WebNodeCollection::firstItem() const return nextItem(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebNodeList.cpp b/third_party/WebKit/Source/web/WebNodeList.cpp index 4944ed8..3a16283 100644 --- a/third_party/WebKit/Source/web/WebNodeList.cpp +++ b/third_party/WebKit/Source/web/WebNodeList.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebNodeList::reset() { @@ -77,4 +77,4 @@ WebNode WebNodeList::item(size_t index) const return WebNode(m_private->item(index)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebNotification.cpp b/third_party/WebKit/Source/web/WebNotification.cpp index 7e2cb2e..7afed14 100644 --- a/third_party/WebKit/Source/web/WebNotification.cpp +++ b/third_party/WebKit/Source/web/WebNotification.cpp @@ -42,7 +42,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebNotificationPrivate : public Notification { }; @@ -112,7 +112,7 @@ void WebNotification::dispatchDisplayEvent() m_private->dispatchShowEvent(); } -void WebNotification::dispatchErrorEvent(const WebKit::WebString& /* errorMessage */) +void WebNotification::dispatchErrorEvent(const blink::WebString& /* errorMessage */) { // FIXME: errorMessage not supported by WebCore yet m_private->dispatchErrorEvent(); @@ -153,4 +153,4 @@ void WebNotification::assign(WebNotificationPrivate* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebOptionElement.cpp b/third_party/WebKit/Source/web/WebOptionElement.cpp index 70be878..89883b2 100644 --- a/third_party/WebKit/Source/web/WebOptionElement.cpp +++ b/third_party/WebKit/Source/web/WebOptionElement.cpp @@ -40,7 +40,7 @@ using namespace WebCore; using namespace HTMLNames; -namespace WebKit { +namespace blink { void WebOptionElement::setValue(const WebString& newValue) { @@ -88,4 +88,4 @@ WebOptionElement::operator PassRefPtr<HTMLOptionElement>() const return toHTMLOptionElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp index f473274..22f0490 100644 --- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp +++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp @@ -55,7 +55,7 @@ using namespace WebCore; using namespace std; -namespace WebKit { +namespace blink { class PagePopupChromeClient : public EmptyChromeClient { WTF_MAKE_NONCOPYABLE(PagePopupChromeClient); @@ -348,4 +348,4 @@ WebPagePopup* WebPagePopup::create(WebWidgetClient* client) return adoptRef(new WebPagePopupImpl(client)).leakRef(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.h b/third_party/WebKit/Source/web/WebPagePopupImpl.h index 74641ff..660c47f 100644 --- a/third_party/WebKit/Source/web/WebPagePopupImpl.h +++ b/third_party/WebKit/Source/web/WebPagePopupImpl.h @@ -43,7 +43,7 @@ class PagePopupClient; class PlatformKeyboardEvent; } -namespace WebKit { +namespace blink { class PagePopupChromeClient; class WebViewImpl; @@ -109,5 +109,5 @@ inline WebPagePopupImpl* toWebPagePopupImpl(WebCore::PagePopup* popup) return static_cast<WebPagePopupImpl*>(popup); } -} // namespace WebKit +} // namespace blink #endif // WebPagePopupImpl_h diff --git a/third_party/WebKit/Source/web/WebPageSerializer.cpp b/third_party/WebKit/Source/web/WebPageSerializer.cpp index 60ff53ee..03fba99 100644 --- a/third_party/WebKit/Source/web/WebPageSerializer.cpp +++ b/third_party/WebKit/Source/web/WebPageSerializer.cpp @@ -134,7 +134,7 @@ void retrieveResourcesForElement(Element* element, } void retrieveResourcesForFrame(Frame* frame, - const WebKit::WebVector<WebKit::WebCString>& supportedSchemes, + const blink::WebVector<blink::WebCString>& supportedSchemes, Vector<Frame*>* visitedFrames, Vector<Frame*>* framesToVisit, Vector<KURL>* frameURLs, @@ -179,7 +179,7 @@ void retrieveResourcesForFrame(Frame* frame, } // namespace -namespace WebKit { +namespace blink { void WebPageSerializer::serialize(WebView* view, WebVector<WebPageSerializer::Resource>* resourcesParam) { @@ -298,4 +298,4 @@ WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTar return baseString; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp b/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp index 8a4aa90..a1a5816 100644 --- a/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp +++ b/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp @@ -99,7 +99,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Maximum length of data buffer which is used to temporary save generated // html content data. This is a soft limit which might be passed if a very large @@ -526,4 +526,4 @@ bool WebPageSerializerImpl::serialize() return didSerialization; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPageSerializerImpl.h b/third_party/WebKit/Source/web/WebPageSerializerImpl.h index 5cd37fba..d6e883a 100644 --- a/third_party/WebKit/Source/web/WebPageSerializerImpl.h +++ b/third_party/WebKit/Source/web/WebPageSerializerImpl.h @@ -54,7 +54,7 @@ class Element; class Node; } -namespace WebKit { +namespace blink { class WebFrameImpl; // Get html data by serializing all frames of current page with lists @@ -187,6 +187,6 @@ private: SerializeDomParam* param); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebPasswordFormData.cpp b/third_party/WebKit/Source/web/WebPasswordFormData.cpp index 4b03d85..3312c33 100644 --- a/third_party/WebKit/Source/web/WebPasswordFormData.cpp +++ b/third_party/WebKit/Source/web/WebPasswordFormData.cpp @@ -42,7 +42,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -176,4 +176,4 @@ WebPasswordFormData::WebPasswordFormData(const WebFormElement& webForm) oldPassword, password, this); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPasswordFormUtils.cpp b/third_party/WebKit/Source/web/WebPasswordFormUtils.cpp index 6bac3ef..582d75c 100644 --- a/third_party/WebKit/Source/web/WebPasswordFormUtils.cpp +++ b/third_party/WebKit/Source/web/WebPasswordFormUtils.cpp @@ -49,7 +49,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Maximum number of password fields we will observe before throwing our // hands in the air and giving up with a given form. @@ -101,4 +101,4 @@ void findPasswordFormFields(HTMLFormElement* form, PasswordFormFields* fields) } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPasswordFormUtils.h b/third_party/WebKit/Source/web/WebPasswordFormUtils.h index 873ede3..5416bcd 100644 --- a/third_party/WebKit/Source/web/WebPasswordFormUtils.h +++ b/third_party/WebKit/Source/web/WebPasswordFormUtils.h @@ -40,7 +40,7 @@ class HTMLFormControlElement; class HTMLFormElement; } -namespace WebKit { +namespace blink { // Helper structure to locate username, passwords and submit fields. // @@ -58,6 +58,6 @@ struct PasswordFormFields { void findPasswordFormFields(WebCore::HTMLFormElement* form, PasswordFormFields* fields); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebPerformance.cpp b/third_party/WebKit/Source/web/WebPerformance.cpp index 7490801..8b841e7 100644 --- a/third_party/WebKit/Source/web/WebPerformance.cpp +++ b/third_party/WebKit/Source/web/WebPerformance.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static double millisecondsToSeconds(unsigned long long milliseconds) { @@ -184,4 +184,4 @@ WebPerformance::operator PassRefPtr<Performance>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp index bbd9fac..ca8ffb5 100644 --- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp +++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp @@ -91,7 +91,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Public methods -------------------------------------------------------------- @@ -341,7 +341,7 @@ void WebPluginContainerImpl::copy() if (!m_webPlugin->hasSelection()) return; - WebKit::Platform::current()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false); + blink::Platform::current()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false); } bool WebPluginContainerImpl::executeEditCommand(const WebString& name) @@ -897,4 +897,4 @@ WebCore::IntRect WebPluginContainerImpl::windowClipRect() const return clipRect; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.h b/third_party/WebKit/Source/web/WebPluginContainerImpl.h index 1651a17..47eebf4 100644 --- a/third_party/WebKit/Source/web/WebPluginContainerImpl.h +++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.h @@ -56,7 +56,7 @@ class WheelEvent; class Widget; } -namespace WebKit { +namespace blink { struct WebPrintParams; @@ -216,6 +216,6 @@ inline WebPluginContainerImpl* toPluginContainerImpl(WebPluginContainer* contain // This will catch anyone doing an unnecessary cast. void toPluginContainerImpl(const WebPluginContainerImpl*); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebPluginDocument.cpp b/third_party/WebKit/Source/web/WebPluginDocument.cpp index 9783a6f..012797f 100644 --- a/third_party/WebKit/Source/web/WebPluginDocument.cpp +++ b/third_party/WebKit/Source/web/WebPluginDocument.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebPlugin* WebPluginDocument::plugin() @@ -69,4 +69,4 @@ WebPluginDocument::operator PassRefPtr<PluginDocument>() const return static_cast<PluginDocument*>(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp b/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp index 5ec59a6..2ca113f 100644 --- a/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp +++ b/third_party/WebKit/Source/web/WebPluginLoadObserver.cpp @@ -34,7 +34,7 @@ #include "WebPlugin.h" #include "WebPluginContainerImpl.h" -namespace WebKit { +namespace blink { WebPluginLoadObserver::~WebPluginLoadObserver() { @@ -54,4 +54,4 @@ void WebPluginLoadObserver::didFailLoading(const WebURLError& error) m_pluginContainer->plugin()->didFailLoadingFrameRequest(m_notifyURL, m_notifyData, error); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPluginLoadObserver.h b/third_party/WebKit/Source/web/WebPluginLoadObserver.h index d8231b0..3e19168 100644 --- a/third_party/WebKit/Source/web/WebPluginLoadObserver.h +++ b/third_party/WebKit/Source/web/WebPluginLoadObserver.h @@ -33,7 +33,7 @@ #include "public/platform/WebURL.h" -namespace WebKit { +namespace blink { class WebPluginContainerImpl; struct WebURLError; @@ -62,6 +62,6 @@ private: void* m_notifyData; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebPluginScrollbarImpl.cpp b/third_party/WebKit/Source/web/WebPluginScrollbarImpl.cpp index 3973c6a..a113f120 100644 --- a/third_party/WebKit/Source/web/WebPluginScrollbarImpl.cpp +++ b/third_party/WebKit/Source/web/WebPluginScrollbarImpl.cpp @@ -44,7 +44,7 @@ using namespace std; using namespace WebCore; -namespace WebKit { +namespace blink { WebPluginScrollbar* WebPluginScrollbar::createForPlugin(Orientation orientation, WebPluginContainer* pluginContainer, @@ -371,4 +371,4 @@ bool WebPluginScrollbarImpl::onKeyDown(const WebInputEvent& event) return false; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPluginScrollbarImpl.h b/third_party/WebKit/Source/web/WebPluginScrollbarImpl.h index f0618c8..05e10b3 100644 --- a/third_party/WebKit/Source/web/WebPluginScrollbarImpl.h +++ b/third_party/WebKit/Source/web/WebPluginScrollbarImpl.h @@ -36,7 +36,7 @@ class IntRect; class Scrollbar; } -namespace WebKit { +namespace blink { class ScrollbarGroup; @@ -55,7 +55,7 @@ public: int scrollOffset() { return m_scrollOffset; } WebCore::Scrollbar* scrollbar() { return m_scrollbar.get(); } - // WebKit::WebScrollbar methods + // blink::WebScrollbar methods virtual bool isOverlay() const OVERRIDE; virtual int value() const OVERRIDE; virtual WebPoint location() const OVERRIDE; @@ -74,7 +74,7 @@ public: virtual bool isLeftSideVerticalScrollbar() const OVERRIDE; virtual bool isCustomScrollbar() const OVERRIDE; - // WebKit::WebPluginScrollbar methods + // blink::WebPluginScrollbar methods virtual void setLocation(const WebRect&) OVERRIDE; virtual void setValue(int position) OVERRIDE; virtual void setDocumentSize(int) OVERRIDE; @@ -99,6 +99,6 @@ private: RefPtr<WebCore::Scrollbar> m_scrollbar; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp b/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp index d8abb09..74ce189 100644 --- a/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp +++ b/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp @@ -54,7 +54,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // WebPopupMenu --------------------------------------------------------------- @@ -394,4 +394,4 @@ void WebPopupMenuImpl::popupClosed(FramelessScrollView* widget) m_client->closeWidgetSoon(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebPopupMenuImpl.h b/third_party/WebKit/Source/web/WebPopupMenuImpl.h index efaa1bc..54a05d0 100644 --- a/third_party/WebKit/Source/web/WebPopupMenuImpl.h +++ b/third_party/WebKit/Source/web/WebPopupMenuImpl.h @@ -48,7 +48,7 @@ class Range; class Widget; } -namespace WebKit { +namespace blink { class WebGestureEvent; class WebKeyboardEvent; class WebMouseEvent; @@ -147,6 +147,6 @@ inline WebPopupMenuImpl* toWebPopupMenuImpl(WebCore::FramelessScrollViewClient* return static_cast<WebPopupMenuImpl*>(client); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebRange.cpp b/third_party/WebKit/Source/web/WebRange.cpp index 05ebc98..cacc63a 100644 --- a/third_party/WebKit/Source/web/WebRange.cpp +++ b/third_party/WebKit/Source/web/WebRange.cpp @@ -50,7 +50,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebRangePrivate : public Range { }; @@ -167,4 +167,4 @@ void WebRange::assign(WebRangePrivate* p) m_private = p; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebRuntimeFeatures.cpp b/third_party/WebKit/Source/web/WebRuntimeFeatures.cpp index 68fdaa2..10f809c 100644 --- a/third_party/WebKit/Source/web/WebRuntimeFeatures.cpp +++ b/third_party/WebKit/Source/web/WebRuntimeFeatures.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebRuntimeFeatures::enableStableFeatures(bool enable) { @@ -446,4 +446,4 @@ void WebRuntimeFeatures::enableRepaintAfterLayout(bool enable) RuntimeEnabledFeatures::setRepaintAfterLayoutEnabled(enable); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebScopedMicrotaskSuppression.cpp b/third_party/WebKit/Source/web/WebScopedMicrotaskSuppression.cpp index f4773a78..ddd5253 100644 --- a/third_party/WebKit/Source/web/WebScopedMicrotaskSuppression.cpp +++ b/third_party/WebKit/Source/web/WebScopedMicrotaskSuppression.cpp @@ -34,7 +34,7 @@ #include "bindings/v8/V8RecursionScope.h" #include "wtf/OwnPtr.h" -namespace WebKit { +namespace blink { #ifndef NDEBUG class WebScopedMicrotaskSuppression::Impl : public WebCore::V8RecursionScope::MicrotaskSuppression { }; @@ -54,4 +54,4 @@ void WebScopedMicrotaskSuppression::reset() #endif } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebScopedUserGesture.cpp b/third_party/WebKit/Source/web/WebScopedUserGesture.cpp index 3067e0c..81eac86 100644 --- a/third_party/WebKit/Source/web/WebScopedUserGesture.cpp +++ b/third_party/WebKit/Source/web/WebScopedUserGesture.cpp @@ -34,7 +34,7 @@ #include "WebUserGestureToken.h" #include "platform/UserGestureIndicator.h" -namespace WebKit { +namespace blink { void WebScopedUserGesture::initialize() { @@ -52,4 +52,4 @@ void WebScopedUserGesture::reset() m_indicator.reset(0); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebScriptBindings.cpp b/third_party/WebKit/Source/web/WebScriptBindings.cpp index 7b61b35..61b8a56 100644 --- a/third_party/WebKit/Source/web/WebScriptBindings.cpp +++ b/third_party/WebKit/Source/web/WebScriptBindings.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { v8::Local<v8::String> WebScriptBindings::toV8String(const WebString& string, v8::Isolate* isolate) { @@ -48,4 +48,4 @@ WebString WebScriptBindings::toWebString(v8::Handle<v8::String> v8String) return v8StringToWebCoreString<String>(v8String, Externalize); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebScriptController.cpp b/third_party/WebKit/Source/web/WebScriptController.cpp index 82bb418..f5aa23e 100644 --- a/third_party/WebKit/Source/web/WebScriptController.cpp +++ b/third_party/WebKit/Source/web/WebScriptController.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebScriptController::registerExtension(v8::Extension* extension) { @@ -52,4 +52,4 @@ void WebScriptController::flushConsoleMessages() // FIXME: remove this method after all it's usages are gone. } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebScrollbarThemePainter.cpp b/third_party/WebKit/Source/web/WebScrollbarThemePainter.cpp index f091e2d..1d0ab58 100644 --- a/third_party/WebKit/Source/web/WebScrollbarThemePainter.cpp +++ b/third_party/WebKit/Source/web/WebScrollbarThemePainter.cpp @@ -34,7 +34,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebScrollbarThemePainter::assign(const WebScrollbarThemePainter& painter) { @@ -122,4 +122,4 @@ WebScrollbarThemePainter::WebScrollbarThemePainter(WebCore::ScrollbarTheme* them { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSearchableFormData.cpp b/third_party/WebKit/Source/web/WebSearchableFormData.cpp index 02c38d4..adba7a1 100644 --- a/third_party/WebKit/Source/web/WebSearchableFormData.cpp +++ b/third_party/WebKit/Source/web/WebSearchableFormData.cpp @@ -235,7 +235,7 @@ bool buildSearchString(const HTMLFormElement* form, Vector<char>* encodedString, } } // namespace -namespace WebKit { +namespace blink { WebSearchableFormData::WebSearchableFormData(const WebFormElement& form, const WebInputElement& selectedInputElement) { @@ -294,4 +294,4 @@ WebSearchableFormData::WebSearchableFormData(const WebFormElement& form, const W m_encoding = String(encoding.name()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSecurityOrigin.cpp b/third_party/WebKit/Source/web/WebSecurityOrigin.cpp index 713f29b..bc141e91 100644 --- a/third_party/WebKit/Source/web/WebSecurityOrigin.cpp +++ b/third_party/WebKit/Source/web/WebSecurityOrigin.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { class WebSecurityOriginPrivate : public SecurityOrigin { }; @@ -162,4 +162,4 @@ void WebSecurityOrigin::grantLoadLocalResources() const get()->grantLoadLocalResources(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSecurityPolicy.cpp b/third_party/WebKit/Source/web/WebSecurityPolicy.cpp index caaecba..cf3e490 100644 --- a/third_party/WebKit/Source/web/WebSecurityPolicy.cpp +++ b/third_party/WebKit/Source/web/WebSecurityPolicy.cpp @@ -40,7 +40,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebSecurityPolicy::registerURLSchemeAsLocal(const WebString& scheme) { @@ -114,4 +114,4 @@ void WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(const WebSt SchemeRegistry::registerURLSchemeAsNotAllowingJavascriptURLs(scheme); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSelectElement.cpp b/third_party/WebKit/Source/web/WebSelectElement.cpp index ecfbfbb..425244b 100644 --- a/third_party/WebKit/Source/web/WebSelectElement.cpp +++ b/third_party/WebKit/Source/web/WebSelectElement.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebSelectElement::setValue(const WebString& value) { @@ -77,4 +77,4 @@ WebSelectElement::operator PassRefPtr<HTMLSelectElement>() const return toHTMLSelectElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSelector.cpp b/third_party/WebKit/Source/web/WebSelector.cpp index 0aa43e6..f606726 100644 --- a/third_party/WebKit/Source/web/WebSelector.cpp +++ b/third_party/WebKit/Source/web/WebSelector.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebString canonicalizeSelector(WebString webSelector, WebSelectorType restriction) { @@ -55,4 +55,4 @@ WebString canonicalizeSelector(WebString webSelector, WebSelectorType restrictio return selectorList.selectorsText(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp b/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp index f7965a6..553bdbc 100644 --- a/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp +++ b/third_party/WebKit/Source/web/WebSerializedScriptValue.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s) { @@ -93,4 +93,4 @@ WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.cpp b/third_party/WebKit/Source/web/WebSettingsImpl.cpp index 0935804..b40c233 100644 --- a/third_party/WebKit/Source/web/WebSettingsImpl.cpp +++ b/third_party/WebKit/Source/web/WebSettingsImpl.cpp @@ -44,7 +44,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebSettingsImpl::WebSettingsImpl(Settings* settings) : m_settings(settings) @@ -782,4 +782,4 @@ void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) m_mainFrameResizesAreOrientationChanges = enabled; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.h b/third_party/WebKit/Source/web/WebSettingsImpl.h index a8fc88c..d7811e1 100644 --- a/third_party/WebKit/Source/web/WebSettingsImpl.h +++ b/third_party/WebKit/Source/web/WebSettingsImpl.h @@ -37,7 +37,7 @@ namespace WebCore { class Settings; } -namespace WebKit { +namespace blink { class WebSettingsImpl : public WebSettings { public: @@ -229,6 +229,6 @@ private: bool m_mainFrameResizesAreOrientationChanges; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp index fb4b6bc..9cfddb8 100644 --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp @@ -73,7 +73,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { @@ -367,4 +367,4 @@ WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) return new WebSharedWorkerImpl(client); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h index ff459b1..0a6ba6f 100644 --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h @@ -45,7 +45,7 @@ #include "wtf/WeakPtr.h" -namespace WebKit { +namespace blink { class WebApplicationCacheHost; class WebApplicationCacheHostClient; class WebWorkerClient; @@ -143,6 +143,6 @@ private: bool m_pauseWorkerContextOnStart; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebSocket.cpp b/third_party/WebKit/Source/web/WebSocket.cpp index 8453323..183bd43 100644 --- a/third_party/WebKit/Source/web/WebSocket.cpp +++ b/third_party/WebKit/Source/web/WebSocket.cpp @@ -33,7 +33,7 @@ #include "WebSocketImpl.h" -namespace WebKit { +namespace blink { WebSocket* WebSocket::create(const WebDocument& document, WebSocketClient* client) { @@ -46,4 +46,4 @@ WebSocket* WebSocket::create(const WebDocument& document, WebSocketClient* clien return websocket.leakPtr(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSocketImpl.cpp b/third_party/WebKit/Source/web/WebSocketImpl.cpp index a529592..492e404 100644 --- a/third_party/WebKit/Source/web/WebSocketImpl.cpp +++ b/third_party/WebKit/Source/web/WebSocketImpl.cpp @@ -46,7 +46,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* client) : m_client(client) @@ -167,4 +167,4 @@ void WebSocketImpl::didClose(unsigned long bufferedAmount, ClosingHandshakeCompl m_client->didClose(bufferedAmount, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSocketImpl.h b/third_party/WebKit/Source/web/WebSocketImpl.h index a30aba8..670ebff 100644 --- a/third_party/WebKit/Source/web/WebSocketImpl.h +++ b/third_party/WebKit/Source/web/WebSocketImpl.h @@ -40,7 +40,7 @@ namespace WebCore { class MainThreadWebSocketChannel; } -namespace WebKit { +namespace blink { class WebDocument; class WebString; @@ -80,6 +80,6 @@ private: BinaryType m_binaryType; }; -} // namespace WebKit +} // namespace blink #endif // WebWebSocketChannelImpl_h diff --git a/third_party/WebKit/Source/web/WebSpeechGrammar.cpp b/third_party/WebKit/Source/web/WebSpeechGrammar.cpp index 74f3e45..1b9aaa5 100644 --- a/third_party/WebKit/Source/web/WebSpeechGrammar.cpp +++ b/third_party/WebKit/Source/web/WebSpeechGrammar.cpp @@ -29,7 +29,7 @@ #include "modules/speech/SpeechGrammar.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { void WebSpeechGrammar::reset() { @@ -64,4 +64,4 @@ float WebSpeechGrammar::weight() const return m_private->weight(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSpeechInputResult.cpp b/third_party/WebKit/Source/web/WebSpeechInputResult.cpp index 21da668..6120d8f 100644 --- a/third_party/WebKit/Source/web/WebSpeechInputResult.cpp +++ b/third_party/WebKit/Source/web/WebSpeechInputResult.cpp @@ -31,7 +31,7 @@ #include "core/speech/SpeechInputResult.h" #include "wtf/PassRefPtr.h" -namespace WebKit { +namespace blink { void WebSpeechInputResult::reset() { @@ -58,6 +58,6 @@ WebSpeechInputResult::operator PassRefPtr<WebCore::SpeechInputResult>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink #endif // ENABLE(INPUT_SPEECH) diff --git a/third_party/WebKit/Source/web/WebSpeechRecognitionHandle.cpp b/third_party/WebKit/Source/web/WebSpeechRecognitionHandle.cpp index 42f91c2..4f89c5c 100644 --- a/third_party/WebKit/Source/web/WebSpeechRecognitionHandle.cpp +++ b/third_party/WebKit/Source/web/WebSpeechRecognitionHandle.cpp @@ -30,7 +30,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebSpeechRecognitionHandle::reset() { @@ -68,4 +68,4 @@ WebSpeechRecognitionHandle::operator PassRefPtr<SpeechRecognition>() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp b/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp index 979bafa..165cfe0 100644 --- a/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp +++ b/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp @@ -31,7 +31,7 @@ #include "wtf/PassRefPtr.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other) { @@ -59,4 +59,4 @@ WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp b/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp index 3fbeca6..e15cc90 100644 --- a/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp +++ b/third_party/WebKit/Source/web/WebStorageEventDispatcherImpl.cpp @@ -38,7 +38,7 @@ #include "weborigin/SecurityOrigin.h" #include "wtf/PassOwnPtr.h" -namespace WebKit { +namespace blink { void WebStorageEventDispatcher::dispatchLocalStorageEvent( const WebString& key, const WebString& oldValue, @@ -64,4 +64,4 @@ void WebStorageEventDispatcher::dispatchSessionStorageEvent( sessionNamespace, sourceAreaInstance, originatedInProcess); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebSurroundingText.cpp b/third_party/WebKit/Source/web/WebSurroundingText.cpp index 887eba7..22cf0d9 100644 --- a/third_party/WebKit/Source/web/WebSurroundingText.cpp +++ b/third_party/WebKit/Source/web/WebSurroundingText.cpp @@ -37,7 +37,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebSurroundingText::initialize(const WebNode& webNode, const WebPoint& nodePoint, size_t maxLength) { @@ -73,4 +73,4 @@ void WebSurroundingText::reset() m_private.reset(0); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebTestingSupport.cpp b/third_party/WebKit/Source/web/WebTestingSupport.cpp index e3412cc..00d441e 100644 --- a/third_party/WebKit/Source/web/WebTestingSupport.cpp +++ b/third_party/WebKit/Source/web/WebTestingSupport.cpp @@ -30,7 +30,7 @@ #include "WebFrame.h" #include <v8/include/v8.h> -namespace WebKit { +namespace blink { void WebTestingSupport::injectInternalsObject(WebFrame* frame) { diff --git a/third_party/WebKit/Source/web/WebTextAreaElement.cpp b/third_party/WebKit/Source/web/WebTextAreaElement.cpp index fafd94d..59d16bc 100644 --- a/third_party/WebKit/Source/web/WebTextAreaElement.cpp +++ b/third_party/WebKit/Source/web/WebTextAreaElement.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebTextAreaElement::setValue(const WebString& value) { @@ -66,4 +66,4 @@ WebTextAreaElement::operator PassRefPtr<HTMLTextAreaElement>() const return toHTMLTextAreaElement(m_private.get()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.cpp b/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.cpp index b21e1e3..c25569c 100644 --- a/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.cpp +++ b/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.cpp @@ -39,7 +39,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { static Vector<TextCheckingResult> toCoreResults(const WebVector<WebTextCheckingResult>& results) { @@ -61,4 +61,4 @@ void WebTextCheckingCompletionImpl::didCancelCheckingText() delete this; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.h b/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.h index 7049538..b7798f0 100644 --- a/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.h +++ b/third_party/WebKit/Source/web/WebTextCheckingCompletionImpl.h @@ -35,7 +35,7 @@ #include "platform/text/TextChecking.h" #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class EditorClientImpl; @@ -55,6 +55,6 @@ private: WTF::RefPtr<WebCore::TextCheckingRequest> m_request; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebTextCheckingResult.cpp b/third_party/WebKit/Source/web/WebTextCheckingResult.cpp index ea5fb6f..a9f73ba 100644 --- a/third_party/WebKit/Source/web/WebTextCheckingResult.cpp +++ b/third_party/WebKit/Source/web/WebTextCheckingResult.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebTextCheckingResult::operator TextCheckingResult() const { @@ -56,4 +56,4 @@ WebTextCheckingResult::operator TextCheckingResult() const return result; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebTextInputInfo.cpp b/third_party/WebKit/Source/web/WebTextInputInfo.cpp index 7a0d876..32b8356 100644 --- a/third_party/WebKit/Source/web/WebTextInputInfo.cpp +++ b/third_party/WebKit/Source/web/WebTextInputInfo.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "WebTextInputInfo.h" -namespace WebKit { +namespace blink { bool WebTextInputInfo::equals(const WebTextInputInfo& other) const { @@ -43,4 +43,4 @@ bool WebTextInputInfo::equals(const WebTextInputInfo& other) const && compositionEnd == other.compositionEnd; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebTextRun.cpp b/third_party/WebKit/Source/web/WebTextRun.cpp index 7ee2ab1..8d30e37 100644 --- a/third_party/WebKit/Source/web/WebTextRun.cpp +++ b/third_party/WebKit/Source/web/WebTextRun.cpp @@ -35,11 +35,11 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebTextRun::operator WebCore::TextRun() const { return TextRun(text, 0, 0, TextRun::AllowTrailingExpansion, rtl ? RTL : LTR, directionalOverride); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebUserGestureIndicator.cpp b/third_party/WebKit/Source/web/WebUserGestureIndicator.cpp index 038b3d7..deea3a3 100644 --- a/third_party/WebKit/Source/web/WebUserGestureIndicator.cpp +++ b/third_party/WebKit/Source/web/WebUserGestureIndicator.cpp @@ -36,7 +36,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { bool WebUserGestureIndicator::isProcessingUserGesture() { @@ -53,4 +53,4 @@ WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() return WebUserGestureToken(UserGestureIndicator::currentToken()); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebUserGestureToken.cpp b/third_party/WebKit/Source/web/WebUserGestureToken.cpp index 574b1c4..0710ad06 100644 --- a/third_party/WebKit/Source/web/WebUserGestureToken.cpp +++ b/third_party/WebKit/Source/web/WebUserGestureToken.cpp @@ -33,7 +33,7 @@ #include "platform/UserGestureIndicator.h" -namespace WebKit { +namespace blink { bool WebUserGestureToken::hasGestures() const { @@ -70,4 +70,4 @@ void WebUserGestureToken::reset() m_token.reset(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebUserMediaRequest.cpp b/third_party/WebKit/Source/web/WebUserMediaRequest.cpp index 3f9583f..609b9b6 100644 --- a/third_party/WebKit/Source/web/WebUserMediaRequest.cpp +++ b/third_party/WebKit/Source/web/WebUserMediaRequest.cpp @@ -49,7 +49,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { WebUserMediaRequest::WebUserMediaRequest(const PassRefPtr<UserMediaRequest>& request) : m_private(request) @@ -137,4 +137,4 @@ WebUserMediaRequest::operator UserMediaRequest*() const return m_private.get(); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp index fc833a1..d417d26 100644 --- a/third_party/WebKit/Source/web/WebViewImpl.cpp +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp @@ -200,7 +200,7 @@ static const float minScaleChangeToTriggerZoom = 1.05f; static const float leftBoxRatio = 0.3f; static const int caretPadding = 10; -namespace WebKit { +namespace blink { // Change the text zoom level by kTextSizeMultiplierRatio each time the user // zooms text in or out (ie., change by 20%). The min and max values limit @@ -1887,8 +1887,8 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions opt PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque); double paintEnd = currentTime(); double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart); - WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30); - WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); + blink::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30); + blink::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); if (isAcceleratedCompositingActive()) { ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent); @@ -3938,7 +3938,7 @@ void WebViewImpl::scheduleAnimation() void WebViewImpl::setIsAcceleratedCompositingActive(bool active) { - WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4); + blink::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4); if (m_isAcceleratedCompositingActive == active) return; @@ -3952,7 +3952,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) m_layerTreeView->finishAllRendering(); m_client->didDeactivateCompositor(); if (!m_layerTreeViewCommitsDeferred - && WebKit::Platform::current()->isThreadedCompositingEnabled()) { + && blink::Platform::current()->isThreadedCompositingEnabled()) { ASSERT(m_layerTreeView); // In threaded compositing mode, force compositing mode is always on so setIsAcceleratedCompositingActive(false) // means that we're transitioning to a new page. Suppress commits until WebKit generates invalidations so @@ -4203,4 +4203,4 @@ bool WebViewImpl::shouldDisableDesktopWorkarounds() || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h index de88190..36c7a10 100644 --- a/third_party/WebKit/Source/web/WebViewImpl.h +++ b/third_party/WebKit/Source/web/WebViewImpl.h @@ -78,7 +78,7 @@ class PopupMenuClient; class RenderLayerCompositor; } -namespace WebKit { +namespace blink { class AutocompletePopupMenuClient; class AutofillPopupMenuClient; class ContextFeaturesClientImpl; @@ -828,6 +828,6 @@ inline WebViewImpl* toWebViewImpl(WebView* webView) return static_cast<WebViewImpl*>(webView); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/WebWorkerClientImpl.cpp b/third_party/WebKit/Source/web/WebWorkerClientImpl.cpp index 9af153b..6781202 100644 --- a/third_party/WebKit/Source/web/WebWorkerClientImpl.cpp +++ b/third_party/WebKit/Source/web/WebWorkerClientImpl.cpp @@ -52,7 +52,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { // Chromium-specific decorator of WorkerMessagingProxy. @@ -88,4 +88,4 @@ WebWorkerClientImpl::~WebWorkerClientImpl() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WebWorkerClientImpl.h b/third_party/WebKit/Source/web/WebWorkerClientImpl.h index 414fadd0..ca02312 100644 --- a/third_party/WebKit/Source/web/WebWorkerClientImpl.h +++ b/third_party/WebKit/Source/web/WebWorkerClientImpl.h @@ -44,7 +44,7 @@ #include "wtf/RefPtr.h" -namespace WebKit { +namespace blink { class WebWorker; class WebFrameImpl; @@ -75,6 +75,6 @@ private: WebFrameImpl* m_webFrame; }; -} // namespace WebKit; +} // namespace blink; #endif diff --git a/third_party/WebKit/Source/web/WebWorkerInfo.cpp b/third_party/WebKit/Source/web/WebWorkerInfo.cpp index 896ea67..4e92dba 100644 --- a/third_party/WebKit/Source/web/WebWorkerInfo.cpp +++ b/third_party/WebKit/Source/web/WebWorkerInfo.cpp @@ -33,7 +33,7 @@ #include "core/workers/WorkerThread.h" -namespace WebKit { +namespace blink { unsigned WebWorkerInfo::dedicatedWorkerCount() { diff --git a/third_party/WebKit/Source/web/WebWorkerRunLoop.cpp b/third_party/WebKit/Source/web/WebWorkerRunLoop.cpp index fd9d379..6f13315 100644 --- a/third_party/WebKit/Source/web/WebWorkerRunLoop.cpp +++ b/third_party/WebKit/Source/web/WebWorkerRunLoop.cpp @@ -29,7 +29,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { namespace { diff --git a/third_party/WebKit/Source/web/WorkerFileSystemClient.cpp b/third_party/WebKit/Source/web/WorkerFileSystemClient.cpp index 9aa9ecc..0703c93 100644 --- a/third_party/WebKit/Source/web/WorkerFileSystemClient.cpp +++ b/third_party/WebKit/Source/web/WorkerFileSystemClient.cpp @@ -45,7 +45,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassOwnPtr<FileSystemClient> WorkerFileSystemClient::create() { @@ -66,4 +66,4 @@ WorkerFileSystemClient::WorkerFileSystemClient() { } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WorkerFileSystemClient.h b/third_party/WebKit/Source/web/WorkerFileSystemClient.h index 2c29ccd..313c595 100644 --- a/third_party/WebKit/Source/web/WorkerFileSystemClient.h +++ b/third_party/WebKit/Source/web/WorkerFileSystemClient.h @@ -34,7 +34,7 @@ #include "modules/filesystem/FileSystemClient.h" #include "wtf/Forward.h" -namespace WebKit { +namespace blink { // FIXME: This could be probably unified into non-worker FileSystemClient // implementation. @@ -49,6 +49,6 @@ private: WorkerFileSystemClient(); }; -} // namespace WebKit +} // namespace blink #endif // WorkerFileSystemClient_h diff --git a/third_party/WebKit/Source/web/WorkerPermissionClient.cpp b/third_party/WebKit/Source/web/WorkerPermissionClient.cpp index e12b106..61cefce 100644 --- a/third_party/WebKit/Source/web/WorkerPermissionClient.cpp +++ b/third_party/WebKit/Source/web/WorkerPermissionClient.cpp @@ -38,7 +38,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { PassOwnPtr<WorkerPermissionClient> WorkerPermissionClient::create(PassOwnPtr<WebWorkerPermissionClientProxy> proxy) { @@ -90,4 +90,4 @@ void providePermissionClientToWorker(WorkerClients* clients, PassOwnPtr<WebWorke WorkerPermissionClient::provideTo(clients, WorkerPermissionClient::supplementName(), WorkerPermissionClient::create(proxy)); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/WorkerPermissionClient.h b/third_party/WebKit/Source/web/WorkerPermissionClient.h index 2f032d4..8abcffb 100644 --- a/third_party/WebKit/Source/web/WorkerPermissionClient.h +++ b/third_party/WebKit/Source/web/WorkerPermissionClient.h @@ -38,7 +38,7 @@ namespace WebCore { class ExecutionContext; } -namespace WebKit { +namespace blink { class WebFrame; class WebString; @@ -65,6 +65,6 @@ private: void providePermissionClientToWorker(WebCore::WorkerClients*, PassOwnPtr<WebWorkerPermissionClientProxy>); -} // namespace WebKit +} // namespace blink #endif // WorkerPermissionClient_h diff --git a/third_party/WebKit/Source/web/default/WebRenderTheme.cpp b/third_party/WebKit/Source/web/default/WebRenderTheme.cpp index 57362b5..0ffd2c9 100644 --- a/third_party/WebKit/Source/web/default/WebRenderTheme.cpp +++ b/third_party/WebKit/Source/web/default/WebRenderTheme.cpp @@ -37,11 +37,11 @@ using WebCore::RenderTheme; using WebCore::RenderThemeChromiumDefault; -namespace WebKit { +namespace blink { void setCaretBlinkInterval(double interval) { RenderThemeChromiumDefault::setCaretBlinkInterval(interval); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/linux/WebFontInfo.cpp b/third_party/WebKit/Source/web/linux/WebFontInfo.cpp index 715aa04..5538907 100644 --- a/third_party/WebKit/Source/web/linux/WebFontInfo.cpp +++ b/third_party/WebKit/Source/web/linux/WebFontInfo.cpp @@ -37,7 +37,7 @@ #include <string.h> #include <unicode/utf16.h> -namespace WebKit { +namespace blink { static bool useSubpixelPositioning = false; @@ -205,4 +205,4 @@ void WebFontInfo::renderStyleForStrike(const char* family, int sizeAndStyle, Web FcPatternDestroy(match); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/linux/WebFontRenderStyle.cpp b/third_party/WebKit/Source/web/linux/WebFontRenderStyle.cpp index edcbe9a..6f6c4cc 100644 --- a/third_party/WebKit/Source/web/linux/WebFontRenderStyle.cpp +++ b/third_party/WebKit/Source/web/linux/WebFontRenderStyle.cpp @@ -35,7 +35,7 @@ using WebCore::FontRenderStyle; -namespace WebKit { +namespace blink { void WebFontRenderStyle::toFontRenderStyle(FontRenderStyle* out) { @@ -59,4 +59,4 @@ void WebFontRenderStyle::setDefaults() useSubpixelPositioning = 2; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp index c20d4b4..e75886e 100644 --- a/third_party/WebKit/Source/web/linux/WebFontRendering.cpp +++ b/third_party/WebKit/Source/web/linux/WebFontRendering.cpp @@ -39,7 +39,7 @@ using WebCore::FontPlatformData; -namespace WebKit { +namespace blink { // static void WebFontRendering::setHinting(SkPaint::Hinting hinting) @@ -92,4 +92,4 @@ void WebFontRendering::setLCDOrientation(SkFontHost::LCDOrientation orientation) SkFontHost::SetSubpixelOrientation(orientation); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/mac/WebScrollbarTheme.cpp b/third_party/WebKit/Source/web/mac/WebScrollbarTheme.cpp index d242f31..6692e47 100644 --- a/third_party/WebKit/Source/web/mac/WebScrollbarTheme.cpp +++ b/third_party/WebKit/Source/web/mac/WebScrollbarTheme.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void WebScrollbarTheme::updateScrollbars( float initialButtonDelay, float autoscrollButtonDelay, @@ -45,4 +45,4 @@ void WebScrollbarTheme::updateScrollbars( initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, redraw); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/painting/ContinuousPainter.cpp b/third_party/WebKit/Source/web/painting/ContinuousPainter.cpp index 5a690cc..37f9415 100644 --- a/third_party/WebKit/Source/web/painting/ContinuousPainter.cpp +++ b/third_party/WebKit/Source/web/painting/ContinuousPainter.cpp @@ -35,7 +35,7 @@ using namespace WebCore; -namespace WebKit { +namespace blink { void ContinuousPainter::setNeedsDisplayRecursive(GraphicsLayer* layer, PageOverlayList* pageOverlays) { @@ -58,4 +58,4 @@ void ContinuousPainter::setNeedsDisplayRecursive(GraphicsLayer* layer, PageOverl setNeedsDisplayRecursive(*it, pageOverlays); } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/painting/ContinuousPainter.h b/third_party/WebKit/Source/web/painting/ContinuousPainter.h index c60f3fe..ab423ea 100644 --- a/third_party/WebKit/Source/web/painting/ContinuousPainter.h +++ b/third_party/WebKit/Source/web/painting/ContinuousPainter.h @@ -33,7 +33,7 @@ namespace WebCore { class GraphicsLayer; } -namespace WebKit { +namespace blink { class PageOverlayList; // This class is responsible for calling setNeedsDisplay on all @@ -46,6 +46,6 @@ public: static void setNeedsDisplayRecursive(WebCore::GraphicsLayer*, PageOverlayList*); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/painting/PaintAggregator.cpp b/third_party/WebKit/Source/web/painting/PaintAggregator.cpp index 7093ae4..53a8a35 100644 --- a/third_party/WebKit/Source/web/painting/PaintAggregator.cpp +++ b/third_party/WebKit/Source/web/painting/PaintAggregator.cpp @@ -33,7 +33,7 @@ #include "public/platform/Platform.h" using namespace WebCore; -namespace WebKit { +namespace blink { // ---------------------------------------------------------------------------- // ALGORITHM NOTES @@ -235,7 +235,7 @@ void PaintAggregator::invalidateRect(const IntRect& rect) // with all existing paints, which means that tracking the size of // paintRects at the time when popPendingUpdate() is called may mask // certain performance problems. - WebKit::Platform::current()->histogramCustomCounts("MPArch.RW_IntermediatePaintRectCount", + blink::Platform::current()->histogramCustomCounts("MPArch.RW_IntermediatePaintRectCount", m_update.paintRects.size(), 1, 100, 50); } @@ -368,4 +368,4 @@ void PaintAggregator::combinePaintRects() } } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/painting/PaintAggregator.h b/third_party/WebKit/Source/web/painting/PaintAggregator.h index cc12b93..9d63c8f 100644 --- a/third_party/WebKit/Source/web/painting/PaintAggregator.h +++ b/third_party/WebKit/Source/web/painting/PaintAggregator.h @@ -35,7 +35,7 @@ #include "platform/geometry/IntRect.h" #include "wtf/Vector.h" -namespace WebKit { +namespace blink { // This class is responsible for aggregating multiple invalidation and scroll // commands to produce a scroll and repaint sequence. @@ -87,6 +87,6 @@ private: PendingUpdate m_update; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp b/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp index 7795ef0..c9beec5 100644 --- a/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp +++ b/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp @@ -48,8 +48,8 @@ #include <gtest/gtest.h> -using namespace WebKit; -using WebKit::URLTestHelpers::toKURL; +using namespace blink; +using blink::URLTestHelpers::toKURL; namespace { diff --git a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp index 3615a5be..d4d2b1f 100644 --- a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp +++ b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp @@ -39,9 +39,9 @@ #include "core/page/Chrome.h" #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; -namespace WebKit { +namespace blink { void setCurrentInputEventForTest(const WebInputEvent* event) { diff --git a/third_party/WebKit/Source/web/tests/CompositedLayerMappingTest.cpp b/third_party/WebKit/Source/web/tests/CompositedLayerMappingTest.cpp index 5037d63..2b3ad66 100644 --- a/third_party/WebKit/Source/web/tests/CompositedLayerMappingTest.cpp +++ b/third_party/WebKit/Source/web/tests/CompositedLayerMappingTest.cpp @@ -43,7 +43,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/web/tests/CustomEventTest.cpp b/third_party/WebKit/Source/web/tests/CustomEventTest.cpp index 808df33b..0a1a78e 100644 --- a/third_party/WebKit/Source/web/tests/CustomEventTest.cpp +++ b/third_party/WebKit/Source/web/tests/CustomEventTest.cpp @@ -48,7 +48,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/FakeWebPlugin.cpp b/third_party/WebKit/Source/web/tests/FakeWebPlugin.cpp index 42ed83b..47076e4 100644 --- a/third_party/WebKit/Source/web/tests/FakeWebPlugin.cpp +++ b/third_party/WebKit/Source/web/tests/FakeWebPlugin.cpp @@ -34,7 +34,7 @@ #include "WebPluginParams.h" #include "wtf/StdLibExtras.h" -namespace WebKit { +namespace blink { FakeWebPlugin::FakeWebPlugin(WebFrame* frame, const WebPluginParams& params) : m_frame(frame) diff --git a/third_party/WebKit/Source/web/tests/FakeWebPlugin.h b/third_party/WebKit/Source/web/tests/FakeWebPlugin.h index 7ee41c8..06413d5 100644 --- a/third_party/WebKit/Source/web/tests/FakeWebPlugin.h +++ b/third_party/WebKit/Source/web/tests/FakeWebPlugin.h @@ -33,7 +33,7 @@ #include "WebPlugin.h" -namespace WebKit { +namespace blink { class WebDragData; class WebFrame; @@ -45,27 +45,27 @@ class WebURLResponse; class FakeWebPlugin : public WebPlugin { public: - FakeWebPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&); + FakeWebPlugin(blink::WebFrame*, const blink::WebPluginParams&); virtual ~FakeWebPlugin(); // WebPlugin methods: - virtual bool initialize(WebKit::WebPluginContainer*) OVERRIDE; + virtual bool initialize(blink::WebPluginContainer*) OVERRIDE; virtual void destroy() OVERRIDE; virtual NPObject* scriptableObject() OVERRIDE { return 0; } virtual bool canProcessDrag() const OVERRIDE { return false; } - virtual void paint(WebKit::WebCanvas*, const WebKit::WebRect&) OVERRIDE { } - virtual void updateGeometry(const WebKit::WebRect& frameRect, const WebKit::WebRect& clipRect, const WebKit::WebVector<WebKit::WebRect>& cutOutsRects, bool isVisible) OVERRIDE { } + virtual void paint(blink::WebCanvas*, const blink::WebRect&) OVERRIDE { } + virtual void updateGeometry(const blink::WebRect& frameRect, const blink::WebRect& clipRect, const blink::WebVector<blink::WebRect>& cutOutsRects, bool isVisible) OVERRIDE { } virtual void updateFocus(bool) OVERRIDE { } virtual void updateVisibility(bool) OVERRIDE { } virtual bool acceptsInputEvents() OVERRIDE { return true; } - virtual bool handleInputEvent(const WebKit::WebInputEvent&, WebKit::WebCursorInfo&) OVERRIDE { return false; } - virtual bool handleDragStatusUpdate(WebKit::WebDragStatus, const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebPoint& position, const WebKit::WebPoint& screenPosition) OVERRIDE { return false; } - virtual void didReceiveResponse(const WebKit::WebURLResponse&) OVERRIDE { } + virtual bool handleInputEvent(const blink::WebInputEvent&, blink::WebCursorInfo&) OVERRIDE { return false; } + virtual bool handleDragStatusUpdate(blink::WebDragStatus, const blink::WebDragData&, blink::WebDragOperationsMask, const blink::WebPoint& position, const blink::WebPoint& screenPosition) OVERRIDE { return false; } + virtual void didReceiveResponse(const blink::WebURLResponse&) OVERRIDE { } virtual void didReceiveData(const char* data, int dataLength) OVERRIDE { } virtual void didFinishLoading() OVERRIDE { } - virtual void didFailLoading(const WebKit::WebURLError&) OVERRIDE { } - virtual void didFinishLoadingFrameRequest(const WebKit::WebURL&, void* notifyData) OVERRIDE { } - virtual void didFailLoadingFrameRequest(const WebKit::WebURL&, void* notifyData, const WebKit::WebURLError&) OVERRIDE { } + virtual void didFailLoading(const blink::WebURLError&) OVERRIDE { } + virtual void didFinishLoadingFrameRequest(const blink::WebURL&, void* notifyData) OVERRIDE { } + virtual void didFailLoadingFrameRequest(const blink::WebURL&, void* notifyData, const blink::WebURLError&) OVERRIDE { } virtual bool isPlaceholder() OVERRIDE { return false; } private: @@ -73,6 +73,6 @@ private: WebPluginContainer* m_container; }; -} // namespace WebKit +} // namespace blink #endif // FakeWebPlugin_h diff --git a/third_party/WebKit/Source/web/tests/FilterOperationsTest.cpp b/third_party/WebKit/Source/web/tests/FilterOperationsTest.cpp index b87f159..2b4bc23 100644 --- a/third_party/WebKit/Source/web/tests/FilterOperationsTest.cpp +++ b/third_party/WebKit/Source/web/tests/FilterOperationsTest.cpp @@ -29,7 +29,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp b/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp index 1aa231c..00e3980 100644 --- a/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp +++ b/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp @@ -41,7 +41,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp b/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp index 1ab9eb3..2f9345d 100644 --- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp +++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp @@ -45,7 +45,7 @@ #include "public/platform/WebURLResponse.h" #include "public/platform/WebUnitTestSupport.h" -namespace WebKit { +namespace blink { namespace FrameTestHelpers { namespace { @@ -154,4 +154,4 @@ void WebViewHelper::reset() } } // namespace FrameTestHelpers -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h index f981e4b..9fc9dfc 100644 --- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h +++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h @@ -35,7 +35,7 @@ #include "wtf/PassOwnPtr.h" #include <string> -namespace WebKit { +namespace blink { class WebFrameImpl; class WebFrameClient; @@ -73,6 +73,6 @@ private: }; } // namespace FrameTestHelpers -} // namespace WebKit +} // namespace blink #endif // FrameTestHelpers_h diff --git a/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp b/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp index 163ffd2..23b9bee 100644 --- a/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp +++ b/third_party/WebKit/Source/web/tests/GraphicsLayerTest.cpp @@ -42,7 +42,7 @@ #include "public/platform/WebUnitTestSupport.h" using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/KeyboardTest.cpp b/third_party/WebKit/Source/web/tests/KeyboardTest.cpp index 179f539..b275946 100644 --- a/third_party/WebKit/Source/web/tests/KeyboardTest.cpp +++ b/third_party/WebKit/Source/web/tests/KeyboardTest.cpp @@ -40,7 +40,7 @@ #include "core/platform/chromium/KeyboardCodes.h" using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/LinkHighlightTest.cpp b/third_party/WebKit/Source/web/tests/LinkHighlightTest.cpp index 605b9db..f4011366 100644 --- a/third_party/WebKit/Source/web/tests/LinkHighlightTest.cpp +++ b/third_party/WebKit/Source/web/tests/LinkHighlightTest.cpp @@ -49,7 +49,7 @@ #include "wtf/PassOwnPtr.h" -using namespace WebKit; +using namespace blink; using namespace WebCore; namespace { diff --git a/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp b/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp index 655f381..10df474 100644 --- a/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp +++ b/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp @@ -39,7 +39,7 @@ #include <v8/include/v8-profiler.h> #include <v8/include/v8.h> -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp b/third_party/WebKit/Source/web/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp index ab72256..6de024d 100644 --- a/third_party/WebKit/Source/web/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp +++ b/third_party/WebKit/Source/web/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp @@ -35,8 +35,8 @@ #include <gtest/gtest.h> -using WebKit::WebRect; -using WebKit::WebFloatRect; +using blink::WebRect; +using blink::WebFloatRect; using namespace WebCore; namespace { diff --git a/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp b/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp index bf5e45d..3fbc0a8 100644 --- a/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp +++ b/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp @@ -50,10 +50,10 @@ #include "wtf/Vector.h" using namespace WebCore; -using namespace WebKit; -using WebKit::FrameTestHelpers::runPendingTasks; -using WebKit::URLTestHelpers::toKURL; -using WebKit::URLTestHelpers::registerMockedURLLoad; +using namespace blink; +using blink::FrameTestHelpers::runPendingTasks; +using blink::URLTestHelpers::toKURL; +using blink::URLTestHelpers::registerMockedURLLoad; namespace { diff --git a/third_party/WebKit/Source/web/tests/PaintAggregatorTest.cpp b/third_party/WebKit/Source/web/tests/PaintAggregatorTest.cpp index fcf374b4..13ab17f 100644 --- a/third_party/WebKit/Source/web/tests/PaintAggregatorTest.cpp +++ b/third_party/WebKit/Source/web/tests/PaintAggregatorTest.cpp @@ -34,7 +34,7 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/PopupMenuTest.cpp b/third_party/WebKit/Source/web/tests/PopupMenuTest.cpp index 90a1522..426eef3 100644 --- a/third_party/WebKit/Source/web/tests/PopupMenuTest.cpp +++ b/third_party/WebKit/Source/web/tests/PopupMenuTest.cpp @@ -65,8 +65,8 @@ #include <gtest/gtest.h> using namespace WebCore; -using namespace WebKit; -using WebKit::URLTestHelpers::toKURL; +using namespace blink; +using blink::URLTestHelpers::toKURL; namespace { diff --git a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp index e49bb5e..24745a0 100644 --- a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp +++ b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp @@ -53,8 +53,8 @@ #include "public/platform/WebUnitTestSupport.h" #include "wtf/OwnPtr.h" -using namespace WebKit; -using WebKit::URLTestHelpers::toKURL; +using namespace blink; +using blink::URLTestHelpers::toKURL; namespace { diff --git a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp index c939f40..80e4b53 100644 --- a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp +++ b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp @@ -18,7 +18,7 @@ #include "public/platform/WebUnitTestSupport.h" using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/RenderTableCellTest.cpp b/third_party/WebKit/Source/web/tests/RenderTableCellTest.cpp index 1c7fc1c..ca2a9a1 100644 --- a/third_party/WebKit/Source/web/tests/RenderTableCellTest.cpp +++ b/third_party/WebKit/Source/web/tests/RenderTableCellTest.cpp @@ -36,7 +36,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/web/tests/RenderTableRowTest.cpp b/third_party/WebKit/Source/web/tests/RenderTableRowTest.cpp index d046233..7175242 100644 --- a/third_party/WebKit/Source/web/tests/RenderTableRowTest.cpp +++ b/third_party/WebKit/Source/web/tests/RenderTableRowTest.cpp @@ -36,7 +36,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace WebCore { diff --git a/third_party/WebKit/Source/web/tests/RunAllTests.cpp b/third_party/WebKit/Source/web/tests/RunAllTests.cpp index d325c31..dface95 100644 --- a/third_party/WebKit/Source/web/tests/RunAllTests.cpp +++ b/third_party/WebKit/Source/web/tests/RunAllTests.cpp @@ -52,11 +52,11 @@ int main(int argc, char** argv) { #if defined(BLINK_DLL_UNITTEST) - WebKit::InitTestSuite(argc, argv); + blink::InitTestSuite(argc, argv); content::SetUpTestEnvironmentForWebKitUnitTests(); - int result = WebKit::RunAllUnitTests(); + int result = blink::RunAllUnitTests(); content::TearDownEnvironmentForWebKitUnitTests(); - WebKit::DeleteTestSuite(); + blink::DeleteTestSuite(); #else ::testing::InitGoogleMock(&argc, argv); TestSuite testSuite(argc, argv); diff --git a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp index 46af633..ae20618 100644 --- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp +++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp @@ -45,7 +45,7 @@ #include "public/platform/WebUnitTestSupport.h" using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/URLTestHelpers.cpp b/third_party/WebKit/Source/web/tests/URLTestHelpers.cpp index f253aa15..37076a4 100644 --- a/third_party/WebKit/Source/web/tests/URLTestHelpers.cpp +++ b/third_party/WebKit/Source/web/tests/URLTestHelpers.cpp @@ -37,7 +37,7 @@ #include "public/platform/WebURLResponse.h" #include "public/platform/WebUnitTestSupport.h" -namespace WebKit { +namespace blink { namespace URLTestHelpers { void registerMockedURLFromBaseURL(const WebString& baseURL, const WebString& fileName, const WebString& mimeType) @@ -69,4 +69,4 @@ void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con } } // namespace URLTestHelpers -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/tests/URLTestHelpers.h b/third_party/WebKit/Source/web/tests/URLTestHelpers.h index d801330..c875455 100644 --- a/third_party/WebKit/Source/web/tests/URLTestHelpers.h +++ b/third_party/WebKit/Source/web/tests/URLTestHelpers.h @@ -34,7 +34,7 @@ #include "public/platform/WebString.h" #include "weborigin/KURL.h" -namespace WebKit { +namespace blink { class WebURL; @@ -56,6 +56,6 @@ void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, const WebString& relativeBaseDirectory, const WebString& mimeType); } // namespace URLTestHelpers -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp index b84a5c1..af52576 100644 --- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp +++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp @@ -48,7 +48,7 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; using WebCore::Frame; using WebCore::FrameView; using WebCore::IntPoint; @@ -57,7 +57,7 @@ using WebCore::IntSize; using WebCore::Page; using WebCore::PageScaleConstraints; using WebCore::ViewportDescription; -using WebKit::FrameTestHelpers::runPendingTasks; +using blink::FrameTestHelpers::runPendingTasks; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp index cf31b95..4de15aa1 100644 --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp @@ -89,15 +89,15 @@ #include "wtf/Forward.h" #include <map> -using namespace WebKit; +using namespace blink; using WebCore::Document; using WebCore::DocumentMarker; using WebCore::Element; using WebCore::FloatRect; using WebCore::HitTestRequest; using WebCore::Range; -using WebKit::URLTestHelpers::toKURL; -using WebKit::FrameTestHelpers::runPendingTasks; +using blink::URLTestHelpers::toKURL; +using blink::FrameTestHelpers::runPendingTasks; namespace { @@ -2093,7 +2093,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers) EXPECT_FALSE(view->renderView()->compositor()->layerForVerticalScrollbar()); } -void setScaleAndScrollAndLayout(WebKit::WebView* webView, WebPoint scroll, float scale) +void setScaleAndScrollAndLayout(blink::WebView* webView, WebPoint scroll, float scale) { webView->setPageScaleFactor(scale, WebPoint(scroll.x, scroll.y)); webView->layout(); @@ -4043,7 +4043,7 @@ class SpellCheckClient : public WebSpellCheckClient { public: explicit SpellCheckClient(uint32_t hash = 0) : m_numberOfTimesChecked(0), m_hash(hash) { } virtual ~SpellCheckClient() { } - virtual void requestCheckingOfText(const WebKit::WebString&, const WebKit::WebVector<uint32_t>&, const WebKit::WebVector<unsigned>&, WebKit::WebTextCheckingCompletion* completion) OVERRIDE + virtual void requestCheckingOfText(const blink::WebString&, const blink::WebVector<uint32_t>&, const blink::WebVector<unsigned>&, blink::WebTextCheckingCompletion* completion) OVERRIDE { ++m_numberOfTimesChecked; Vector<WebTextCheckingResult> results; @@ -4150,10 +4150,10 @@ public: virtual ~StubbornSpellCheckClient() { } virtual void requestCheckingOfText( - const WebKit::WebString&, - const WebKit::WebVector<uint32_t>&, - const WebKit::WebVector<unsigned>&, - WebKit::WebTextCheckingCompletion* completion) OVERRIDE + const blink::WebString&, + const blink::WebVector<uint32_t>&, + const blink::WebVector<unsigned>&, + blink::WebTextCheckingCompletion* completion) OVERRIDE { m_completion = completion; } @@ -4190,7 +4190,7 @@ private: m_completion = 0; } - WebKit::WebTextCheckingCompletion* m_completion; + blink::WebTextCheckingCompletion* m_completion; }; TEST_F(WebFrameTest, SlowSpellcheckMarkerPosition) diff --git a/third_party/WebKit/Source/web/tests/WebImageTest.cpp b/third_party/WebKit/Source/web/tests/WebImageTest.cpp index c7986dd7..f5bd796 100644 --- a/third_party/WebKit/Source/web/tests/WebImageTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebImageTest.cpp @@ -39,7 +39,7 @@ #include "public/platform/WebUnitTestSupport.h" using namespace WebCore; -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp index 0b75176..1e06947 100644 --- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp @@ -47,7 +47,7 @@ #include "core/frame/Frame.h" #include "core/frame/FrameView.h" -using namespace WebKit; +using namespace blink; using namespace WebCore; namespace { @@ -60,7 +60,7 @@ PassRefPtr<WebCore::KeyboardEvent> createKeyboardEventWithLocation(WebCore::Keyb int getModifiersForKeyLocationCode(WebCore::KeyboardEvent::KeyLocationCode location) { RefPtr<WebCore::KeyboardEvent> event = createKeyboardEventWithLocation(location); - WebKit::WebKeyboardEventBuilder convertedEvent(*event); + blink::WebKeyboardEventBuilder convertedEvent(*event); return convertedEvent.modifiers; } diff --git a/third_party/WebKit/Source/web/tests/WebInputEventFactoryTestGtk.cpp b/third_party/WebKit/Source/web/tests/WebInputEventFactoryTestGtk.cpp index cbdb3b3..4a499d2 100644 --- a/third_party/WebKit/Source/web/tests/WebInputEventFactoryTestGtk.cpp +++ b/third_party/WebKit/Source/web/tests/WebInputEventFactoryTestGtk.cpp @@ -39,10 +39,10 @@ #include "WebInputEventFactory.h" #include "core/events/KeyboardEvent.h" -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebInputEventFactory; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebInputEventFactory; namespace { @@ -192,11 +192,11 @@ TEST(WebInputEventFactoryTest, NumPadConversion) EXPECT_TRUE(webEvent.modifiers & WebInputEvent::IsKeyPad); // Round-trip through the WebCore KeyboardEvent class. - WebKit::PlatformKeyboardEventBuilder platformBuilder(webEvent); + blink::PlatformKeyboardEventBuilder platformBuilder(webEvent); RefPtr<WebCore::KeyboardEvent> keypress = WebCore::KeyboardEvent::create(platformBuilder, 0); EXPECT_TRUE(keypress->location() == WebCore::KeyboardEvent::DOM_KEY_LOCATION_NUMPAD); - WebKit::WebKeyboardEventBuilder builder(*keypress); + blink::WebKeyboardEventBuilder builder(*keypress); EXPECT_TRUE(builder.modifiers & WebInputEvent::IsKeyPad); } diff --git a/third_party/WebKit/Source/web/tests/WebPageNewSerializerTest.cpp b/third_party/WebKit/Source/web/tests/WebPageNewSerializerTest.cpp index f2f7c0c..e6ce3a1 100644 --- a/third_party/WebKit/Source/web/tests/WebPageNewSerializerTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebPageNewSerializerTest.cpp @@ -47,10 +47,10 @@ #include "public/platform/WebURLResponse.h" #include "public/platform/WebUnitTestSupport.h" -using namespace WebKit; -using WebKit::FrameTestHelpers::runPendingTasks; -using WebKit::URLTestHelpers::toKURL; -using WebKit::URLTestHelpers::registerMockedURLLoad; +using namespace blink; +using blink::FrameTestHelpers::runPendingTasks; +using blink::URLTestHelpers::toKURL; +using blink::URLTestHelpers::registerMockedURLLoad; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebPageSerializerTest.cpp b/third_party/WebKit/Source/web/tests/WebPageSerializerTest.cpp index 2c110cc..7c1903e 100644 --- a/third_party/WebKit/Source/web/tests/WebPageSerializerTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebPageSerializerTest.cpp @@ -44,8 +44,8 @@ #include <gtest/gtest.h> -using namespace WebKit; -using WebKit::URLTestHelpers::toKURL; +using namespace blink; +using blink::URLTestHelpers::toKURL; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp index b115189..973d45d 100644 --- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp @@ -51,7 +51,7 @@ #include "public/platform/WebThread.h" #include "public/platform/WebUnitTestSupport.h" -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebSelectorTest.cpp b/third_party/WebKit/Source/web/tests/WebSelectorTest.cpp index bffc5ff..f8f6278 100644 --- a/third_party/WebKit/Source/web/tests/WebSelectorTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebSelectorTest.cpp @@ -35,7 +35,7 @@ #include "public/platform/WebUnitTestSupport.h" #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebURLRequestTest.cpp b/third_party/WebKit/Source/web/tests/WebURLRequestTest.cpp index 06b5125..6ec6d9d 100644 --- a/third_party/WebKit/Source/web/tests/WebURLRequestTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebURLRequestTest.cpp @@ -34,7 +34,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebURLResponseTest.cpp b/third_party/WebKit/Source/web/tests/WebURLResponseTest.cpp index e3dde87..76843be 100644 --- a/third_party/WebKit/Source/web/tests/WebURLResponseTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebURLResponseTest.cpp @@ -34,7 +34,7 @@ #include <gtest/gtest.h> -using namespace WebKit; +using namespace blink; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebUnitTests.cpp b/third_party/WebKit/Source/web/tests/WebUnitTests.cpp index 949ae34..bb9caf1 100644 --- a/third_party/WebKit/Source/web/tests/WebUnitTests.cpp +++ b/third_party/WebKit/Source/web/tests/WebUnitTests.cpp @@ -37,7 +37,7 @@ static TestSuite* testSuite = 0; -namespace WebKit { +namespace blink { void InitTestSuite(int argc, char** argv) { @@ -58,4 +58,4 @@ void DeleteTestSuite() testSuite = 0; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/Source/web/tests/WebUnitTests.h b/third_party/WebKit/Source/web/tests/WebUnitTests.h index c07c014..9b8c2a7 100644 --- a/third_party/WebKit/Source/web/tests/WebUnitTests.h +++ b/third_party/WebKit/Source/web/tests/WebUnitTests.h @@ -33,7 +33,7 @@ #include "public/platform/WebCommon.h" -namespace WebKit { +namespace blink { // In chromium multi-dll build, webkit unittest code are compiled in webkit.dll. // This means the test suite object needs to be initialized inside WebKit. @@ -51,6 +51,6 @@ BLINK_EXPORT int RunAllUnitTests(); // Deletes the global testSuite object inside webkit.dll BLINK_EXPORT void DeleteTestSuite(); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/Source/web/tests/WebUserGestureTokenTest.cpp b/third_party/WebKit/Source/web/tests/WebUserGestureTokenTest.cpp index d6f4540..0c39c39 100644 --- a/third_party/WebKit/Source/web/tests/WebUserGestureTokenTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebUserGestureTokenTest.cpp @@ -37,7 +37,7 @@ #include "WebUserGestureIndicator.h" #include "platform/UserGestureIndicator.h" -using namespace WebKit; +using namespace blink; using namespace WebCore; namespace { diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp index 3209f4b..9040815 100644 --- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp +++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp @@ -60,9 +60,9 @@ #include "public/platform/WebUnitTestSupport.h" #include "public/web/WebWidgetClient.h" -using namespace WebKit; -using WebKit::FrameTestHelpers::runPendingTasks; -using WebKit::URLTestHelpers::toKURL; +using namespace blink; +using blink::FrameTestHelpers::runPendingTasks; +using blink::URLTestHelpers::toKURL; namespace { @@ -145,15 +145,15 @@ private: class HelperPluginCreatingWebViewClient : public WebViewClient { public: // WebViewClient methods - virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popupType) OVERRIDE + virtual blink::WebWidget* createPopupMenu(blink::WebPopupType popupType) OVERRIDE { EXPECT_EQ(WebPopupTypeHelperPlugin, popupType); - m_helperPluginWebWidget = WebKit::WebHelperPlugin::create(this); + m_helperPluginWebWidget = blink::WebHelperPlugin::create(this); // The caller owns the object, but we retain a pointer for use in closeWidgetSoon(). return m_helperPluginWebWidget; } - virtual void initializeHelperPluginWebFrame(WebKit::WebHelperPlugin* plugin) OVERRIDE + virtual void initializeHelperPluginWebFrame(blink::WebHelperPlugin* plugin) OVERRIDE { ASSERT_TRUE(m_webFrameClient); plugin->initializeFrame(m_webFrameClient); @@ -583,7 +583,7 @@ TEST_F(WebViewTest, SetCompositionFromExistingText) WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html"); webView->setInitialFocus(false); WebVector<WebCompositionUnderline> underlines(static_cast<size_t>(1)); - underlines[0] = WebKit::WebCompositionUnderline(0, 4, 0, false); + underlines[0] = blink::WebCompositionUnderline(0, 4, 0, false); webView->setEditableSelectionOffsets(4, 10); webView->setCompositionFromExistingText(8, 12, underlines); WebVector<WebCompositionUnderline> underlineResults = toWebViewImpl(webView)->compositionUnderlines(); @@ -609,7 +609,7 @@ TEST_F(WebViewTest, SetCompositionFromExistingTextInTextArea) WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "text_area_populated.html"); webView->setInitialFocus(false); WebVector<WebCompositionUnderline> underlines(static_cast<size_t>(1)); - underlines[0] = WebKit::WebCompositionUnderline(0, 4, 0, false); + underlines[0] = blink::WebCompositionUnderline(0, 4, 0, false); webView->setEditableSelectionOffsets(27, 27); std::string newLineText("\n"); webView->confirmComposition(WebString::fromUTF8(newLineText.c_str())); diff --git a/third_party/WebKit/Source/web/x11/WebScreenInfoFactory.cpp b/third_party/WebKit/Source/web/x11/WebScreenInfoFactory.cpp index e305d0c..3eb3a7b 100644 --- a/third_party/WebKit/Source/web/x11/WebScreenInfoFactory.cpp +++ b/third_party/WebKit/Source/web/x11/WebScreenInfoFactory.cpp @@ -34,7 +34,7 @@ #include "WebScreenInfo.h" #include <X11/Xlib.h> -namespace WebKit { +namespace blink { // FIXME: Take an X window and use XRandR to find the dimensions of the monitor // that it's on (probably using XRRGetScreenInfo() and XRRConfigSizes() from @@ -66,4 +66,4 @@ WebScreenInfo WebScreenInfoFactory::screenInfo(Display* display, int screenNumbe return results; } -} // namespace WebKit +} // namespace blink diff --git a/third_party/WebKit/public/platform/Platform.h b/third_party/WebKit/public/platform/Platform.h index c846f31..a5dd0b3 100644 --- a/third_party/WebKit/public/platform/Platform.h +++ b/third_party/WebKit/public/platform/Platform.h @@ -49,7 +49,7 @@ class GrContext; -namespace WebKit { +namespace blink { class WebAudioBus; class WebBlobRegistry; @@ -184,7 +184,7 @@ public: virtual long long databaseGetFileSize(const WebString& vfsFileName) { return 0; } // Returns the space available for the given origin - virtual long long databaseGetSpaceAvailableForOrigin(const WebKit::WebString& originIdentifier) { return 0; } + virtual long long databaseGetSpaceAvailableForOrigin(const blink::WebString& originIdentifier) { return 0; } // DOM Storage -------------------------------------------------- @@ -575,11 +575,11 @@ public: // Sets a Listener to listen for device motion data updates. // If null, the platform stops providing device motion data to the current listener. - virtual void setDeviceMotionListener(WebKit::WebDeviceMotionListener*) { } + virtual void setDeviceMotionListener(blink::WebDeviceMotionListener*) { } // Sets a Listener to listen for device orientation data updates. // If null, the platform stops proving device orientation data to the current listener. - virtual void setDeviceOrientationListener(WebKit::WebDeviceOrientationListener*) { } + virtual void setDeviceOrientationListener(blink::WebDeviceOrientationListener*) { } // Quota ----------------------------------------------------------- @@ -600,6 +600,6 @@ protected: virtual ~Platform() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebAnimation.h b/third_party/WebKit/public/platform/WebAnimation.h index 042d156..e955390 100644 --- a/third_party/WebKit/public/platform/WebAnimation.h +++ b/third_party/WebKit/public/platform/WebAnimation.h @@ -37,7 +37,7 @@ namespace WebCore { class CCActiveAnimation; } -namespace WebKit { +namespace blink { class WebAnimationCurve; @@ -74,6 +74,6 @@ public: virtual void setAlternatesDirection(bool) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebAnimation_h diff --git a/third_party/WebKit/public/platform/WebAnimationCurve.h b/third_party/WebKit/public/platform/WebAnimationCurve.h index ab94620..3a205c5 100644 --- a/third_party/WebKit/public/platform/WebAnimationCurve.h +++ b/third_party/WebKit/public/platform/WebAnimationCurve.h @@ -29,7 +29,7 @@ #define WEB_FILTER_ANIMATION_CURVE_IS_DEFINED 1 -namespace WebKit { +namespace blink { class WebAnimationCurve { public: @@ -52,7 +52,7 @@ public: virtual AnimationCurveType type() const = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebAnimationCurve_h diff --git a/third_party/WebKit/public/platform/WebAnimationDelegate.h b/third_party/WebKit/public/platform/WebAnimationDelegate.h index f77c1cc..6615c7a 100644 --- a/third_party/WebKit/public/platform/WebAnimationDelegate.h +++ b/third_party/WebKit/public/platform/WebAnimationDelegate.h @@ -25,7 +25,7 @@ #ifndef WebAnimationDelegate_h #define WebAnimationDelegate_h -namespace WebKit { +namespace blink { class WebAnimationDelegate { public: @@ -33,6 +33,6 @@ public: virtual void notifyAnimationFinished(double time) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebAnimationDelegate_h diff --git a/third_party/WebKit/public/platform/WebArrayBuffer.h b/third_party/WebKit/public/platform/WebArrayBuffer.h index 961833a..85f61bf 100644 --- a/third_party/WebKit/public/platform/WebArrayBuffer.h +++ b/third_party/WebKit/public/platform/WebArrayBuffer.h @@ -41,7 +41,7 @@ template <class T> class Handle; namespace WTF { class ArrayBuffer; } -namespace WebKit { +namespace blink { class WebArrayBuffer { public: @@ -77,6 +77,6 @@ protected: WebPrivatePtr<WTF::ArrayBuffer> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebArrayBuffer_h diff --git a/third_party/WebKit/public/platform/WebAudioBus.h b/third_party/WebKit/public/platform/WebAudioBus.h index cb192ec..fae16f0 100644 --- a/third_party/WebKit/public/platform/WebAudioBus.h +++ b/third_party/WebKit/public/platform/WebAudioBus.h @@ -33,7 +33,7 @@ namespace WebCore { class AudioBus; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebAudioBusPrivate; @@ -74,6 +74,6 @@ private: WebCore::AudioBus* m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebAudioBus_h diff --git a/third_party/WebKit/public/platform/WebAudioDestinationConsumer.h b/third_party/WebKit/public/platform/WebAudioDestinationConsumer.h index 513f9d6..210d251 100644 --- a/third_party/WebKit/public/platform/WebAudioDestinationConsumer.h +++ b/third_party/WebKit/public/platform/WebAudioDestinationConsumer.h @@ -27,7 +27,7 @@ #include "WebVector.h" -namespace WebKit { +namespace blink { class WebAudioDestinationConsumer { public: @@ -40,6 +40,6 @@ public: virtual void consumeAudio(const WebVector<const float*>&, size_t numberOfFrames) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebAudioDestinationConsumer_h diff --git a/third_party/WebKit/public/platform/WebAudioDevice.h b/third_party/WebKit/public/platform/WebAudioDevice.h index 7095eae..d27483b 100644 --- a/third_party/WebKit/public/platform/WebAudioDevice.h +++ b/third_party/WebKit/public/platform/WebAudioDevice.h @@ -32,7 +32,7 @@ #include "WebCommon.h" #include "WebVector.h" -namespace WebKit { +namespace blink { // Abstract interface to the Chromium audio system. @@ -53,6 +53,6 @@ public: virtual double sampleRate() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebAudioDevice_h diff --git a/third_party/WebKit/public/platform/WebAudioSourceProvider.h b/third_party/WebKit/public/platform/WebAudioSourceProvider.h index 909eba8..af8664f 100644 --- a/third_party/WebKit/public/platform/WebAudioSourceProvider.h +++ b/third_party/WebKit/public/platform/WebAudioSourceProvider.h @@ -27,7 +27,7 @@ #include "WebVector.h" -namespace WebKit { +namespace blink { class WebAudioSourceProviderClient; diff --git a/third_party/WebKit/public/platform/WebBlobData.h b/third_party/WebKit/public/platform/WebBlobData.h index c699495..06d0d7f 100644 --- a/third_party/WebKit/public/platform/WebBlobData.h +++ b/third_party/WebKit/public/platform/WebBlobData.h @@ -42,7 +42,7 @@ namespace WebCore { class BlobData; } namespace WTF { template <typename T> class PassOwnPtr; } #endif -namespace WebKit { +namespace blink { class WebBlobData : public WebNonCopyable { public: @@ -83,6 +83,6 @@ private: WebPrivateOwnPtr<WebCore::BlobData> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebBlobData_h diff --git a/third_party/WebKit/public/platform/WebBlobRegistry.h b/third_party/WebKit/public/platform/WebBlobRegistry.h index c058231..4569b24 100644 --- a/third_party/WebKit/public/platform/WebBlobRegistry.h +++ b/third_party/WebKit/public/platform/WebBlobRegistry.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebBlobData; class WebString; @@ -44,11 +44,11 @@ class WebBlobRegistry { public: virtual ~WebBlobRegistry() { } - virtual void registerBlobData(const WebKit::WebString& uuid, const WebKit::WebBlobData&) { } - virtual void addBlobDataRef(const WebKit::WebString& uuid) { } - virtual void removeBlobDataRef(const WebKit::WebString& uuid) { } - virtual void registerPublicBlobURL(const WebKit::WebURL&, const WebKit::WebString& uuid) { } - virtual void revokePublicBlobURL(const WebKit::WebURL&) { } + virtual void registerBlobData(const blink::WebString& uuid, const blink::WebBlobData&) { } + virtual void addBlobDataRef(const blink::WebString& uuid) { } + virtual void removeBlobDataRef(const blink::WebString& uuid) { } + virtual void registerPublicBlobURL(const blink::WebURL&, const blink::WebString& uuid) { } + virtual void revokePublicBlobURL(const blink::WebURL&) { } // DEPRECATED - old style blob handling is being replaced virtual void registerBlobURL(const WebURL&, WebBlobData&) { } @@ -78,6 +78,6 @@ public: virtual void unregisterStreamURL(const WebURL&) { BLINK_ASSERT_NOT_REACHED(); } }; -} // namespace WebKit +} // namespace blink #endif // WebBlobRegistry_h diff --git a/third_party/WebKit/public/platform/WebCString.h b/third_party/WebKit/public/platform/WebCString.h index bea372a..0db6479 100644 --- a/third_party/WebKit/public/platform/WebCString.h +++ b/third_party/WebKit/public/platform/WebCString.h @@ -46,7 +46,7 @@ class CString; class CStringBuffer; } -namespace WebKit { +namespace blink { class WebString; @@ -131,6 +131,6 @@ inline bool operator<(const WebCString& a, const WebCString& b) return a.compare(b) < 0; } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCallbacks.h b/third_party/WebKit/public/platform/WebCallbacks.h index ba023d3..4dd0421 100644 --- a/third_party/WebKit/public/platform/WebCallbacks.h +++ b/third_party/WebKit/public/platform/WebCallbacks.h @@ -31,7 +31,7 @@ #ifndef WebCallbacks_h #define WebCallbacks_h -namespace WebKit { +namespace blink { template<typename S, typename T> class WebCallbacks { @@ -41,6 +41,6 @@ public: virtual void onError(T*) { }; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCanvas.h b/third_party/WebKit/public/platform/WebCanvas.h index aca38e0..d0de44c 100644 --- a/third_party/WebKit/public/platform/WebCanvas.h +++ b/third_party/WebKit/public/platform/WebCanvas.h @@ -35,10 +35,10 @@ class SkCanvas; -namespace WebKit { +namespace blink { typedef SkCanvas WebCanvas; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebClipboard.h b/third_party/WebKit/public/platform/WebClipboard.h index 9f1caa4..be1f44e 100644 --- a/third_party/WebKit/public/platform/WebClipboard.h +++ b/third_party/WebKit/public/platform/WebClipboard.h @@ -38,7 +38,7 @@ #include "WebURL.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebDragData; class WebImage; @@ -93,6 +93,6 @@ protected: ~WebClipboard() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebColor.h b/third_party/WebKit/public/platform/WebColor.h index d449e36..f59e08b 100644 --- a/third_party/WebKit/public/platform/WebColor.h +++ b/third_party/WebKit/public/platform/WebColor.h @@ -31,10 +31,10 @@ #ifndef WebColor_h #define WebColor_h -namespace WebKit { +namespace blink { typedef unsigned WebColor; // RGBA quad. Equivalent to SkColor. -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCommon.h b/third_party/WebKit/public/platform/WebCommon.h index 4e4154f..9967267 100644 --- a/third_party/WebKit/public/platform/WebCommon.h +++ b/third_party/WebKit/public/platform/WebCommon.h @@ -88,7 +88,7 @@ typedef unsigned __int64 uint64_t; #include <stdint.h> // For int32_t #endif -namespace WebKit { +namespace blink { // UTF-32 character type typedef int32_t WebUChar32; @@ -108,7 +108,7 @@ typedef unsigned char WebLChar; BLINK_COMMON_EXPORT void failedAssertion(const char* file, int line, const char* function, const char* assertion); -} // namespace WebKit +} // namespace blink // Ideally, only use inside the public directory but outside of INSIDE_BLINK blocks. (Otherwise use WTF's ASSERT.) #if defined(NDEBUG) diff --git a/third_party/WebKit/public/platform/WebCompositingReasons.h b/third_party/WebKit/public/platform/WebCompositingReasons.h index 9b7b8a2..03ae0be 100644 --- a/third_party/WebKit/public/platform/WebCompositingReasons.h +++ b/third_party/WebKit/public/platform/WebCompositingReasons.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include <stdint.h> -namespace WebKit { +namespace blink { // This is a clone of CompositingReasons in RenderLayer.h. const uint64_t CompositingReasonUnknown = 0; @@ -74,6 +74,6 @@ const uint64_t CompositingReasonOutOfFlowClipping = static_ typedef uint64_t WebCompositingReasons; -} // namespace WebKit +} // namespace blink #endif // WebCompositingReasons_h diff --git a/third_party/WebKit/public/platform/WebCompositorOutputSurface.h b/third_party/WebKit/public/platform/WebCompositorOutputSurface.h index 744f289..f27205e 100644 --- a/third_party/WebKit/public/platform/WebCompositorOutputSurface.h +++ b/third_party/WebKit/public/platform/WebCompositorOutputSurface.h @@ -26,7 +26,7 @@ #ifndef WebCompositorOutputSurface_h #define WebCompositorOutputSurface_h -namespace WebKit { +namespace blink { // An empty base class for cc::OutputSurface in chromium. class WebCompositorOutputSurface { }; diff --git a/third_party/WebKit/public/platform/WebCompositorSupport.h b/third_party/WebKit/public/platform/WebCompositorSupport.h index 0056be5..9f33d32 100644 --- a/third_party/WebKit/public/platform/WebCompositorSupport.h +++ b/third_party/WebKit/public/platform/WebCompositorSupport.h @@ -32,7 +32,7 @@ #include "WebScrollbar.h" #include "WebScrollbarThemePainter.h" -namespace WebKit { +namespace blink { class WebAnimationCurve; class WebCompositorOutputSurface; @@ -57,7 +57,7 @@ class WebTransformOperations; class WebCompositorSupport { public: // Creates an output surface for the compositor backed by a 3d context. - virtual WebCompositorOutputSurface* createOutputSurfaceFor3D(WebKit::WebGraphicsContext3D*) { return 0; } + virtual WebCompositorOutputSurface* createOutputSurfaceFor3D(blink::WebGraphicsContext3D*) { return 0; } // Creates an output surface for the compositor backed by a software device. virtual WebCompositorOutputSurface* createOutputSurfaceForSoftware() { return 0; } diff --git a/third_party/WebKit/public/platform/WebContentDecryptionModule.h b/third_party/WebKit/public/platform/WebContentDecryptionModule.h index 4938a68..d0e5473 100644 --- a/third_party/WebKit/public/platform/WebContentDecryptionModule.h +++ b/third_party/WebKit/public/platform/WebContentDecryptionModule.h @@ -33,7 +33,7 @@ #include "public/platform/WebContentDecryptionModuleSession.h" -namespace WebKit { +namespace blink { class BLINK_PLATFORM_EXPORT WebContentDecryptionModule { public: @@ -43,6 +43,6 @@ public: virtual WebContentDecryptionModuleSession* createSession(WebContentDecryptionModuleSession::Client*) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebContentDecryptionModule_h diff --git a/third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h b/third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h index f7afbba..4b01c4f 100644 --- a/third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h +++ b/third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -49,7 +49,7 @@ public: virtual void keyAdded() = 0; virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) = 0; - virtual void keyMessage(const unsigned char* message, size_t messageLength, const WebKit::WebURL& destinationURL) = 0; + virtual void keyMessage(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) = 0; protected: virtual ~Client(); @@ -63,6 +63,6 @@ public: virtual void close() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebContentDecryptionModuleSession_h diff --git a/third_party/WebKit/public/platform/WebContentLayer.h b/third_party/WebKit/public/platform/WebContentLayer.h index 0b13fa1..2647de0 100644 --- a/third_party/WebKit/public/platform/WebContentLayer.h +++ b/third_party/WebKit/public/platform/WebContentLayer.h @@ -29,7 +29,7 @@ #include "WebCommon.h" #include "WebLayer.h" -namespace WebKit { +namespace blink { class WebContentLayerClient; class WebContentLayer { @@ -55,6 +55,6 @@ public: virtual void setDrawCheckerboardForMissingTiles(bool) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebContentLayer_h diff --git a/third_party/WebKit/public/platform/WebContentLayerClient.h b/third_party/WebKit/public/platform/WebContentLayerClient.h index 5641a4e..2526e8f 100644 --- a/third_party/WebKit/public/platform/WebContentLayerClient.h +++ b/third_party/WebKit/public/platform/WebContentLayerClient.h @@ -28,7 +28,7 @@ #include "WebCanvas.h" -namespace WebKit { +namespace blink { struct WebRect; struct WebFloatRect; @@ -47,6 +47,6 @@ protected: virtual ~WebContentLayerClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebContentLayerClient_h diff --git a/third_party/WebKit/public/platform/WebCookie.h b/third_party/WebKit/public/platform/WebCookie.h index 318b0e3..b533495 100644 --- a/third_party/WebKit/public/platform/WebCookie.h +++ b/third_party/WebKit/public/platform/WebCookie.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebString.h" -namespace WebKit { +namespace blink { // A cookie. // @@ -70,6 +70,6 @@ struct WebCookie { bool session; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCookieJar.h b/third_party/WebKit/public/platform/WebCookieJar.h index 6daba6b..8daa6d4 100644 --- a/third_party/WebKit/public/platform/WebCookieJar.h +++ b/third_party/WebKit/public/platform/WebCookieJar.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { class WebURL; struct WebCookie; template <typename T> class WebVector; @@ -51,6 +51,6 @@ protected: ~WebCookieJar() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCrypto.h b/third_party/WebKit/public/platform/WebCrypto.h index 5f53868..b0bec6a 100644 --- a/third_party/WebKit/public/platform/WebCrypto.h +++ b/third_party/WebKit/public/platform/WebCrypto.h @@ -41,7 +41,7 @@ namespace WebCore { class CryptoResult; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebArrayBuffer; @@ -110,6 +110,6 @@ protected: virtual ~WebCrypto() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCryptoAlgorithm.h b/third_party/WebKit/public/platform/WebCryptoAlgorithm.h index 5eaf6b8..c1c459a 100644 --- a/third_party/WebKit/public/platform/WebCryptoAlgorithm.h +++ b/third_party/WebKit/public/platform/WebCryptoAlgorithm.h @@ -38,7 +38,7 @@ #include "wtf/PassOwnPtr.h" #endif -namespace WebKit { +namespace blink { enum WebCryptoAlgorithmId { WebCryptoAlgorithmIdAesCbc, @@ -131,6 +131,6 @@ private: WebPrivatePtr<WebCryptoAlgorithmPrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h b/third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h index 4ba14a3..a896d0c 100644 --- a/third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h +++ b/third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h @@ -35,7 +35,7 @@ #include "WebCryptoAlgorithm.h" #include "WebVector.h" -namespace WebKit { +namespace blink { // NOTE: For documentation on the meaning of each of the parameters see the // Web crypto spec: @@ -231,6 +231,6 @@ private: const WebVector<unsigned char> m_label; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCryptoKey.h b/third_party/WebKit/public/platform/WebCryptoKey.h index 1d765f2..eea6bb2 100644 --- a/third_party/WebKit/public/platform/WebCryptoKey.h +++ b/third_party/WebKit/public/platform/WebCryptoKey.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebPrivatePtr.h" -namespace WebKit { +namespace blink { enum WebCryptoKeyType { WebCryptoKeyTypeSecret, @@ -137,6 +137,6 @@ public: virtual ~WebCryptoKeyHandle() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebCursorInfo.h b/third_party/WebKit/public/platform/WebCursorInfo.h index 5d26d02..ec597d1 100644 --- a/third_party/WebKit/public/platform/WebCursorInfo.h +++ b/third_party/WebKit/public/platform/WebCursorInfo.h @@ -43,7 +43,7 @@ typedef struct HICON__* HICON; typedef HICON HCURSOR; #endif -namespace WebKit { +namespace blink { struct WebCursorInfo { enum Type { @@ -120,6 +120,6 @@ struct WebCursorInfo { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebData.h b/third_party/WebKit/public/platform/WebData.h index 568ba98..0fc8ef1 100644 --- a/third_party/WebKit/public/platform/WebData.h +++ b/third_party/WebKit/public/platform/WebData.h @@ -36,7 +36,7 @@ namespace WebCore { class SharedBuffer; } -namespace WebKit { +namespace blink { class WebDataPrivate; @@ -102,6 +102,6 @@ private: WebPrivatePtr<WebCore::SharedBuffer> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebDeviceMotionData.h b/third_party/WebKit/public/platform/WebDeviceMotionData.h index aa9f5de..dc40e40 100644 --- a/third_party/WebKit/public/platform/WebDeviceMotionData.h +++ b/third_party/WebKit/public/platform/WebDeviceMotionData.h @@ -37,7 +37,7 @@ #include "wtf/Assertions.h" #endif -namespace WebKit { +namespace blink { #pragma pack(push, 1) @@ -81,6 +81,6 @@ COMPILE_ASSERT(sizeof(WebDeviceMotionData) == (10 * sizeof(double) + 2 * sizeof( #pragma pack(pop) -} // namespace WebKit +} // namespace blink #endif // WebDeviceMotionData_h diff --git a/third_party/WebKit/public/platform/WebDeviceMotionListener.h b/third_party/WebKit/public/platform/WebDeviceMotionListener.h index b8da150..50ef2a4 100644 --- a/third_party/WebKit/public/platform/WebDeviceMotionListener.h +++ b/third_party/WebKit/public/platform/WebDeviceMotionListener.h @@ -31,7 +31,7 @@ #ifndef WebDeviceMotionListener_h #define WebDeviceMotionListener_h -namespace WebKit { +namespace blink { class WebDeviceMotionData; @@ -41,6 +41,6 @@ public: virtual void didChangeDeviceMotion(const WebDeviceMotionData&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebDeviceMotionListener_h diff --git a/third_party/WebKit/public/platform/WebDeviceOrientationData.h b/third_party/WebKit/public/platform/WebDeviceOrientationData.h index 940ded7..f0b4980 100644 --- a/third_party/WebKit/public/platform/WebDeviceOrientationData.h +++ b/third_party/WebKit/public/platform/WebDeviceOrientationData.h @@ -37,7 +37,7 @@ #include "wtf/Assertions.h" #endif -namespace WebKit { +namespace blink { #pragma pack(push, 1) @@ -66,6 +66,6 @@ COMPILE_ASSERT(sizeof(WebDeviceOrientationData) == (3 * sizeof(double) + 1 * siz #pragma pack(pop) -} // namespace WebKit +} // namespace blink #endif // WebDeviceOrientationData_h diff --git a/third_party/WebKit/public/platform/WebDeviceOrientationListener.h b/third_party/WebKit/public/platform/WebDeviceOrientationListener.h index 6a55ec6..0acfab6 100644 --- a/third_party/WebKit/public/platform/WebDeviceOrientationListener.h +++ b/third_party/WebKit/public/platform/WebDeviceOrientationListener.h @@ -31,7 +31,7 @@ #ifndef WebDeviceOrientationListener_h #define WebDeviceOrientationListener_h -namespace WebKit { +namespace blink { class WebDeviceOrientationData; @@ -41,6 +41,6 @@ public: virtual void didChangeDeviceOrientation(const WebDeviceOrientationData&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebDeviceOrientationListener_h diff --git a/third_party/WebKit/public/platform/WebDiscardableMemory.h b/third_party/WebKit/public/platform/WebDiscardableMemory.h index 8d90ea3..0cdcfe3 100644 --- a/third_party/WebKit/public/platform/WebDiscardableMemory.h +++ b/third_party/WebKit/public/platform/WebDiscardableMemory.h @@ -26,7 +26,7 @@ #ifndef WebDiscardableMemory_h #define WebDiscardableMemory_h -namespace WebKit { +namespace blink { // A memory allocation that can be automatically discarded by the operating // system under memory pressure. @@ -70,6 +70,6 @@ public: virtual void unlock() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebDragData.h b/third_party/WebKit/public/platform/WebDragData.h index 36a60b12..c40ce24 100644 --- a/third_party/WebKit/public/platform/WebDragData.h +++ b/third_party/WebKit/public/platform/WebDragData.h @@ -41,7 +41,7 @@ namespace WebCore { class ChromiumDataObject; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebDragDataPrivate; template <typename T> class WebVector; @@ -118,6 +118,6 @@ private: WebDragDataPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebExternalBitmap.h b/third_party/WebKit/public/platform/WebExternalBitmap.h index 1470815..25d0a2e 100644 --- a/third_party/WebKit/public/platform/WebExternalBitmap.h +++ b/third_party/WebKit/public/platform/WebExternalBitmap.h @@ -33,7 +33,7 @@ #include "WebSize.h" -namespace WebKit { +namespace blink { class WebExternalBitmap { public: @@ -49,6 +49,6 @@ public: virtual uint8* pixels() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebExternalBitmap_h diff --git a/third_party/WebKit/public/platform/WebExternalTextureLayer.h b/third_party/WebKit/public/platform/WebExternalTextureLayer.h index 6cd9e94..0fd05bb 100644 --- a/third_party/WebKit/public/platform/WebExternalTextureLayer.h +++ b/third_party/WebKit/public/platform/WebExternalTextureLayer.h @@ -30,7 +30,7 @@ #include "WebFloatRect.h" #include "WebLayer.h" -namespace WebKit { +namespace blink { class WebExternalTextureLayerClient; @@ -64,6 +64,6 @@ public: virtual void setRateLimitContext(bool) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebExternalTextureLayer_h diff --git a/third_party/WebKit/public/platform/WebExternalTextureLayerClient.h b/third_party/WebKit/public/platform/WebExternalTextureLayerClient.h index 0337a98..bf167c9 100644 --- a/third_party/WebKit/public/platform/WebExternalTextureLayerClient.h +++ b/third_party/WebKit/public/platform/WebExternalTextureLayerClient.h @@ -29,7 +29,7 @@ #include "WebCommon.h" #include "WebSize.h" -namespace WebKit { +namespace blink { class WebGraphicsContext3D; class WebExternalBitmap; @@ -52,6 +52,6 @@ protected: virtual ~WebExternalTextureLayerClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebExternalTextureLayerClient_h diff --git a/third_party/WebKit/public/platform/WebExternalTextureMailbox.h b/third_party/WebKit/public/platform/WebExternalTextureMailbox.h index 785e918..d8703c6 100644 --- a/third_party/WebKit/public/platform/WebExternalTextureMailbox.h +++ b/third_party/WebKit/public/platform/WebExternalTextureMailbox.h @@ -31,7 +31,7 @@ #ifndef WebExternalTextureMailbox_h #define WebExternalTextureMailbox_h -namespace WebKit { +namespace blink { struct WebExternalTextureMailbox { signed char name[64]; @@ -44,6 +44,6 @@ struct WebExternalTextureMailbox { } }; -} // namespace WebKit +} // namespace blink #endif // WebExternalTextureMailbox_h diff --git a/third_party/WebKit/public/platform/WebFallbackThemeEngine.h b/third_party/WebKit/public/platform/WebFallbackThemeEngine.h index ea87a8a..e8719b0 100644 --- a/third_party/WebKit/public/platform/WebFallbackThemeEngine.h +++ b/third_party/WebKit/public/platform/WebFallbackThemeEngine.h @@ -35,7 +35,7 @@ #include "WebColor.h" #include "WebSize.h" -namespace WebKit { +namespace blink { struct WebRect; @@ -147,6 +147,6 @@ public: virtual void paint(WebCanvas*, Part, State, const WebRect&, const ExtraParams*) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileError.h b/third_party/WebKit/public/platform/WebFileError.h index e7a17c3..e8b553e 100644 --- a/third_party/WebKit/public/platform/WebFileError.h +++ b/third_party/WebKit/public/platform/WebFileError.h @@ -30,7 +30,7 @@ #ifndef WebFileError_h #define WebFileError_h -namespace WebKit { +namespace blink { // File-related error code defined in HTML5 File API. enum WebFileError { @@ -48,6 +48,6 @@ enum WebFileError { WebFileErrorPathExists = 12, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileInfo.h b/third_party/WebKit/public/platform/WebFileInfo.h index d326e06..e48d1b1 100644 --- a/third_party/WebKit/public/platform/WebFileInfo.h +++ b/third_party/WebKit/public/platform/WebFileInfo.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { struct WebFileInfo { // The last modification time of the file, in seconds. @@ -57,6 +57,6 @@ struct WebFileInfo { WebFileInfo() : modificationTime(0.0), length(-1), type(TypeUnknown) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileSystem.h b/third_party/WebKit/public/platform/WebFileSystem.h index f05f27d..a25cf60 100644 --- a/third_party/WebKit/public/platform/WebFileSystem.h +++ b/third_party/WebKit/public/platform/WebFileSystem.h @@ -36,7 +36,7 @@ #include "WebFileSystemType.h" #include "WebURL.h" -namespace WebKit { +namespace blink { // FIXME: Remove this after the switch is over. #define NON_SELFDESTRUCT_WEBFILESYSTEMCALLBACKS @@ -166,6 +166,6 @@ protected: virtual ~WebFileSystem() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileSystemCallbacks.h b/third_party/WebKit/public/platform/WebFileSystemCallbacks.h index 606b127..4616bf2 100644 --- a/third_party/WebKit/public/platform/WebFileSystemCallbacks.h +++ b/third_party/WebKit/public/platform/WebFileSystemCallbacks.h @@ -43,7 +43,7 @@ class AsyncFileSystemCallbacks; } namespace WTF { template <typename T> class PassOwnPtr; } -namespace WebKit { +namespace blink { struct WebFileInfo; class WebFileWriter; @@ -113,6 +113,6 @@ private: WebPrivatePtr<WebFileSystemCallbacksPrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileSystemEntry.h b/third_party/WebKit/public/platform/WebFileSystemEntry.h index 00a5e38..b7d4776 100644 --- a/third_party/WebKit/public/platform/WebFileSystemEntry.h +++ b/third_party/WebKit/public/platform/WebFileSystemEntry.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { struct WebFileSystemEntry { WebFileSystemEntry() : isDirectory(false) { } @@ -45,6 +45,6 @@ struct WebFileSystemEntry { bool isDirectory; }; -} // namespace WebKit +} // namespace blink #endif // WebFileSystemEntry_h diff --git a/third_party/WebKit/public/platform/WebFileSystemType.h b/third_party/WebKit/public/platform/WebFileSystemType.h index 4dd06d1..af5751c 100644 --- a/third_party/WebKit/public/platform/WebFileSystemType.h +++ b/third_party/WebKit/public/platform/WebFileSystemType.h @@ -31,7 +31,7 @@ #ifndef WebFileSystemType_h #define WebFileSystemType_h -namespace WebKit { +namespace blink { enum WebFileSystemType { WebFileSystemTypeTemporary, @@ -44,6 +44,6 @@ enum WebFileSystemType { WebFileSystemTypeExternal, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileUtilities.h b/third_party/WebKit/public/platform/WebFileUtilities.h index 831495d..924dac3 100644 --- a/third_party/WebKit/public/platform/WebFileUtilities.h +++ b/third_party/WebKit/public/platform/WebFileUtilities.h @@ -39,7 +39,7 @@ typedef void *HANDLE; #endif -namespace WebKit { +namespace blink { struct WebFileInfo; @@ -60,6 +60,6 @@ protected: ~WebFileUtilities() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileWriter.h b/third_party/WebKit/public/platform/WebFileWriter.h index 1b3d673..a3756aa 100644 --- a/third_party/WebKit/public/platform/WebFileWriter.h +++ b/third_party/WebKit/public/platform/WebFileWriter.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -54,6 +54,6 @@ public: virtual void cancel() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFileWriterClient.h b/third_party/WebKit/public/platform/WebFileWriterClient.h index 80f26fb..eac92f2 100644 --- a/third_party/WebKit/public/platform/WebFileWriterClient.h +++ b/third_party/WebKit/public/platform/WebFileWriterClient.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebFileError.h" -namespace WebKit { +namespace blink { class WebFileWriterClient { public: @@ -52,6 +52,6 @@ protected: virtual ~WebFileWriterClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h b/third_party/WebKit/public/platform/WebFilterAnimationCurve.h index 17a8665..064a769 100644 --- a/third_party/WebKit/public/platform/WebFilterAnimationCurve.h +++ b/third_party/WebKit/public/platform/WebFilterAnimationCurve.h @@ -36,7 +36,7 @@ #include "WebCommon.h" #include "WebFilterKeyframe.h" -namespace WebKit { +namespace blink { // A keyframed filter animation curve. class WebFilterAnimationCurve : public WebAnimationCurve { @@ -49,6 +49,6 @@ public: virtual void add(const WebFilterKeyframe&, double x1, double y1, double x2, double y2) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebFilterAnimationCurve_h diff --git a/third_party/WebKit/public/platform/WebFilterKeyframe.h b/third_party/WebKit/public/platform/WebFilterKeyframe.h index 8f8fe83..093e147 100644 --- a/third_party/WebKit/public/platform/WebFilterKeyframe.h +++ b/third_party/WebKit/public/platform/WebFilterKeyframe.h @@ -39,7 +39,7 @@ namespace WTF { template <typename T> class PassOwnPtr; } #endif -namespace WebKit { +namespace blink { class WebFilterKeyframe { public: @@ -58,6 +58,6 @@ private: WebPrivateOwnPtr<WebFilterOperations> m_value; }; -} // namespace WebKit +} // namespace blink #endif // WebFilterKeyframe_h diff --git a/third_party/WebKit/public/platform/WebFilterOperations.h b/third_party/WebKit/public/platform/WebFilterOperations.h index 4eca835..8fc038d 100644 --- a/third_party/WebKit/public/platform/WebFilterOperations.h +++ b/third_party/WebKit/public/platform/WebFilterOperations.h @@ -31,7 +31,7 @@ #include "WebColor.h" #include "WebPoint.h" -namespace WebKit { +namespace blink { // An ordered list of filter operations. class WebFilterOperations { @@ -58,6 +58,6 @@ public: virtual void clear() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebFilterOperations_h diff --git a/third_party/WebKit/public/platform/WebFlingAnimator.h b/third_party/WebKit/public/platform/WebFlingAnimator.h index b249a6b..45b2113 100644 --- a/third_party/WebKit/public/platform/WebFlingAnimator.h +++ b/third_party/WebKit/public/platform/WebFlingAnimator.h @@ -30,7 +30,7 @@ #include "WebPoint.h" #include "WebRect.h" -namespace WebKit { +namespace blink { class WebFlingAnimator { public: @@ -43,6 +43,6 @@ public: virtual void cancelFling() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebFlingAnimator_h diff --git a/third_party/WebKit/public/platform/WebFloatAnimationCurve.h b/third_party/WebKit/public/platform/WebFloatAnimationCurve.h index 49f2fbe..69cd601d 100644 --- a/third_party/WebKit/public/platform/WebFloatAnimationCurve.h +++ b/third_party/WebKit/public/platform/WebFloatAnimationCurve.h @@ -30,7 +30,7 @@ #include "WebCommon.h" #include "WebFloatKeyframe.h" -namespace WebKit { +namespace blink { // A keyframed float animation curve. class WebFloatAnimationCurve : public WebAnimationCurve { @@ -47,6 +47,6 @@ public: virtual float getValue(double time) const = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebFloatAnimationCurve_h diff --git a/third_party/WebKit/public/platform/WebFloatKeyframe.h b/third_party/WebKit/public/platform/WebFloatKeyframe.h index d276418..5a8e7d6 100644 --- a/third_party/WebKit/public/platform/WebFloatKeyframe.h +++ b/third_party/WebKit/public/platform/WebFloatKeyframe.h @@ -25,7 +25,7 @@ #ifndef WebFloatKeyframe_h #define WebFloatKeyframe_h -namespace WebKit { +namespace blink { struct WebFloatKeyframe { WebFloatKeyframe(double time, float value) @@ -38,6 +38,6 @@ struct WebFloatKeyframe { float value; }; -} // namespace WebKit +} // namespace blink #endif // WebFloatKeyframe_h diff --git a/third_party/WebKit/public/platform/WebFloatPoint.h b/third_party/WebKit/public/platform/WebFloatPoint.h index 293dc33..bd477d8 100644 --- a/third_party/WebKit/public/platform/WebFloatPoint.h +++ b/third_party/WebKit/public/platform/WebFloatPoint.h @@ -39,7 +39,7 @@ #include <ui/gfx/point_f.h> #endif -namespace WebKit { +namespace blink { struct WebFloatPoint { float x; @@ -107,6 +107,6 @@ inline bool operator!=(const WebFloatPoint& a, const WebFloatPoint& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFloatQuad.h b/third_party/WebKit/public/platform/WebFloatQuad.h index 159005f..bffbabd 100644 --- a/third_party/WebKit/public/platform/WebFloatQuad.h +++ b/third_party/WebKit/public/platform/WebFloatQuad.h @@ -42,7 +42,7 @@ #include "platform/geometry/FloatQuad.h" #endif -namespace WebKit { +namespace blink { struct WebFloatQuad { WebFloatPoint p[4]; @@ -77,6 +77,6 @@ struct WebFloatQuad { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFloatRect.h b/third_party/WebKit/public/platform/WebFloatRect.h index 2d2f5be..32c90c7 100644 --- a/third_party/WebKit/public/platform/WebFloatRect.h +++ b/third_party/WebKit/public/platform/WebFloatRect.h @@ -41,7 +41,7 @@ #include <ui/gfx/rect_f.h> #endif -namespace WebKit { +namespace blink { struct WebFloatRect { float x; @@ -124,6 +124,6 @@ inline bool operator!=(const WebFloatRect& a, const WebFloatRect& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebFloatSize.h b/third_party/WebKit/public/platform/WebFloatSize.h index 1e51875..29910ae 100644 --- a/third_party/WebKit/public/platform/WebFloatSize.h +++ b/third_party/WebKit/public/platform/WebFloatSize.h @@ -43,7 +43,7 @@ #include <ui/gfx/vector2d_f.h> #endif -namespace WebKit { +namespace blink { struct WebFloatSize { float width; @@ -130,6 +130,6 @@ inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebGamepad.h b/third_party/WebKit/public/platform/WebGamepad.h index 148e15e..93df8a2 100644 --- a/third_party/WebKit/public/platform/WebGamepad.h +++ b/third_party/WebKit/public/platform/WebGamepad.h @@ -30,7 +30,7 @@ #include "wtf/Assertions.h" #endif -namespace WebKit { +namespace blink { #pragma pack(push, 1) diff --git a/third_party/WebKit/public/platform/WebGamepads.h b/third_party/WebKit/public/platform/WebGamepads.h index 59cf225..aeb565b 100644 --- a/third_party/WebKit/public/platform/WebGamepads.h +++ b/third_party/WebKit/public/platform/WebGamepads.h @@ -30,7 +30,7 @@ #include "wtf/Assertions.h" #endif -namespace WebKit { +namespace blink { #pragma pack(push, 1) diff --git a/third_party/WebKit/public/platform/WebGestureCurve.h b/third_party/WebKit/public/platform/WebGestureCurve.h index f032964..b83c35d 100644 --- a/third_party/WebKit/public/platform/WebGestureCurve.h +++ b/third_party/WebKit/public/platform/WebGestureCurve.h @@ -25,7 +25,7 @@ #ifndef WebGestureCurve_h #define WebGestureCurve_h -namespace WebKit { +namespace blink { class WebGestureCurveTarget; @@ -41,6 +41,6 @@ public: virtual bool apply(double time, WebGestureCurveTarget*) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebGestureCurveTarget.h b/third_party/WebKit/public/platform/WebGestureCurveTarget.h index f5b039a..5433387 100644 --- a/third_party/WebKit/public/platform/WebGestureCurveTarget.h +++ b/third_party/WebKit/public/platform/WebGestureCurveTarget.h @@ -28,7 +28,7 @@ #include "WebFloatSize.h" #include "WebPoint.h" -namespace WebKit { +namespace blink { class WebGestureCurveTarget { public: @@ -40,6 +40,6 @@ protected: virtual ~WebGestureCurveTarget() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebGraphicsContext3D.h b/third_party/WebKit/public/platform/WebGraphicsContext3D.h index eefb3b6..a55e048 100644 --- a/third_party/WebKit/public/platform/WebGraphicsContext3D.h +++ b/third_party/WebKit/public/platform/WebGraphicsContext3D.h @@ -37,7 +37,7 @@ struct GrGLInterface; -namespace WebKit { +namespace blink { // WGC3D types match the corresponding GL types as defined in OpenGL ES 2.0 // header file gl2.h from khronos.org. @@ -473,6 +473,6 @@ public: virtual void vertexAttribDivisorANGLE(WGC3Duint index, WGC3Duint divisor) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h b/third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h index dba2216..7f70cfd 100644 --- a/third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h +++ b/third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h @@ -35,7 +35,7 @@ class GrContext; -namespace WebKit { +namespace blink { class WebGraphicsContext3D; class WebGraphicsContext3DProvider { @@ -46,6 +46,6 @@ public: virtual GrContext* grContext() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebHTTPBody.h b/third_party/WebKit/public/platform/WebHTTPBody.h index 7dc1dd5..98d1110 100644 --- a/third_party/WebKit/public/platform/WebHTTPBody.h +++ b/third_party/WebKit/public/platform/WebHTTPBody.h @@ -42,7 +42,7 @@ namespace WebCore { class FormData; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebHTTPBodyPrivate; @@ -113,6 +113,6 @@ private: WebHTTPBodyPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h b/third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h index 2ca86c0..ff60384 100644 --- a/third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h +++ b/third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h @@ -31,7 +31,7 @@ #ifndef WebHTTPHeaderVisitor_h #define WebHTTPHeaderVisitor_h -namespace WebKit { +namespace blink { class WebString; @@ -43,6 +43,6 @@ protected: ~WebHTTPHeaderVisitor() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebHTTPLoadInfo.h b/third_party/WebKit/public/platform/WebHTTPLoadInfo.h index b1b4c08..c0f4b8c 100644 --- a/third_party/WebKit/public/platform/WebHTTPLoadInfo.h +++ b/third_party/WebKit/public/platform/WebHTTPLoadInfo.h @@ -38,7 +38,7 @@ namespace WebCore { struct ResourceLoadInfo; } -namespace WebKit { +namespace blink { class WebString; class WebHTTPLoadInfo { @@ -83,6 +83,6 @@ private: WebPrivatePtr<WebCore::ResourceLoadInfo> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebIDBCallbacks.h b/third_party/WebKit/public/platform/WebIDBCallbacks.h index 7c03a5e..adc38e4 100644 --- a/third_party/WebKit/public/platform/WebIDBCallbacks.h +++ b/third_party/WebKit/public/platform/WebIDBCallbacks.h @@ -30,7 +30,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebData; class WebIDBCursor; @@ -73,6 +73,6 @@ public: virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&, DataLoss dataLoss, WebString dataLossMessage) { BLINK_ASSERT_NOT_REACHED(); } }; -} // namespace WebKit +} // namespace blink #endif // WebIDBCallbacks_h diff --git a/third_party/WebKit/public/platform/WebIDBCursor.h b/third_party/WebKit/public/platform/WebIDBCursor.h index c093c45..da1d26e 100644 --- a/third_party/WebKit/public/platform/WebIDBCursor.h +++ b/third_party/WebKit/public/platform/WebIDBCursor.h @@ -31,7 +31,7 @@ #include "WebIDBKey.h" #include "WebString.h" -namespace WebKit { +namespace blink { // See comment in WebIDBFactory for a high level overview these classes. class WebIDBCursor { @@ -53,6 +53,6 @@ protected: WebIDBCursor() { } }; -} // namespace WebKit +} // namespace blink #endif // WebIDBCursor_h diff --git a/third_party/WebKit/public/platform/WebIDBDatabase.h b/third_party/WebKit/public/platform/WebIDBDatabase.h index 8a8e31e..61e8297 100644 --- a/third_party/WebKit/public/platform/WebIDBDatabase.h +++ b/third_party/WebKit/public/platform/WebIDBDatabase.h @@ -29,7 +29,7 @@ #include "WebCommon.h" #include "WebIDBMetadata.h" -namespace WebKit { +namespace blink { class WebData; class WebIDBCallbacks; @@ -83,6 +83,6 @@ protected: WebIDBDatabase() { } }; -} // namespace WebKit +} // namespace blink #endif // WebIDBDatabase_h diff --git a/third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h b/third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h index f9ef67c..dc9fca6 100644 --- a/third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h +++ b/third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h @@ -30,7 +30,7 @@ #include "WebIDBDatabaseError.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebIDBDatabaseCallbacks { public: @@ -43,6 +43,6 @@ public: virtual void onComplete(long long transactionId) { BLINK_ASSERT_NOT_REACHED(); } }; -} // namespace WebKit +} // namespace blink #endif // WebIDBDatabaseCallbacks_h diff --git a/third_party/WebKit/public/platform/WebIDBDatabaseError.h b/third_party/WebKit/public/platform/WebIDBDatabaseError.h index 9919b20..d614e18 100644 --- a/third_party/WebKit/public/platform/WebIDBDatabaseError.h +++ b/third_party/WebKit/public/platform/WebIDBDatabaseError.h @@ -35,7 +35,7 @@ namespace WebCore { class DOMError; } -namespace WebKit { +namespace blink { // See comment in WebIDBFactory for a high level overview these classes. class WebIDBDatabaseError { @@ -65,6 +65,6 @@ private: WebPrivatePtr<WebCore::DOMError> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBDatabaseError_h diff --git a/third_party/WebKit/public/platform/WebIDBDatabaseException.h b/third_party/WebKit/public/platform/WebIDBDatabaseException.h index c94178e..83ee413 100644 --- a/third_party/WebKit/public/platform/WebIDBDatabaseException.h +++ b/third_party/WebKit/public/platform/WebIDBDatabaseException.h @@ -31,7 +31,7 @@ #ifndef WebIDBDatabaseException_h #define WebIDBDatabaseException_h -namespace WebKit { +namespace blink { enum WebIDBDatabaseException { WebIDBDatabaseExceptionUnknownError = 23, @@ -42,6 +42,6 @@ enum WebIDBDatabaseException { WebIDBDatabaseExceptionQuotaError = 19, }; -} // namespace WebKit +} // namespace blink #endif // WebIDBDatabaseException_h diff --git a/third_party/WebKit/public/platform/WebIDBFactory.h b/third_party/WebKit/public/platform/WebIDBFactory.h index c3cb6d2..d4293a6 100644 --- a/third_party/WebKit/public/platform/WebIDBFactory.h +++ b/third_party/WebKit/public/platform/WebIDBFactory.h @@ -35,7 +35,7 @@ #include "WebString.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebIDBDatabase; class WebIDBDatabaseCallbacks; @@ -52,6 +52,6 @@ public: virtual void deleteDatabase(const WebString& name, WebIDBCallbacks* callbacks, const WebString& databaseIdentifier) { BLINK_ASSERT_NOT_REACHED(); } }; -} // namespace WebKit +} // namespace blink #endif // WebIDBFactory_h diff --git a/third_party/WebKit/public/platform/WebIDBKey.h b/third_party/WebKit/public/platform/WebIDBKey.h index 48f42d6..1d1675f 100644 --- a/third_party/WebKit/public/platform/WebIDBKey.h +++ b/third_party/WebKit/public/platform/WebIDBKey.h @@ -34,7 +34,7 @@ namespace WebCore { class IDBKey; } -namespace WebKit { +namespace blink { class WebIDBKey { public: @@ -82,6 +82,6 @@ private: WebPrivatePtr<WebCore::IDBKey> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBKey_h diff --git a/third_party/WebKit/public/platform/WebIDBKeyPath.h b/third_party/WebKit/public/platform/WebIDBKeyPath.h index 66b0f6a..94bb177 100644 --- a/third_party/WebKit/public/platform/WebIDBKeyPath.h +++ b/third_party/WebKit/public/platform/WebIDBKeyPath.h @@ -34,7 +34,7 @@ namespace WebCore { class IDBKeyPath; } -namespace WebKit { +namespace blink { class WebIDBKeyPath { public: @@ -68,6 +68,6 @@ private: WebPrivateOwnPtr<WebCore::IDBKeyPath> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBKeyPath_h diff --git a/third_party/WebKit/public/platform/WebIDBKeyRange.h b/third_party/WebKit/public/platform/WebIDBKeyRange.h index e71dd86..bc8f3f3 100644 --- a/third_party/WebKit/public/platform/WebIDBKeyRange.h +++ b/third_party/WebKit/public/platform/WebIDBKeyRange.h @@ -31,7 +31,7 @@ namespace WebCore { class IDBKeyRange; } -namespace WebKit { +namespace blink { class WebIDBKey; class WebString; @@ -62,6 +62,6 @@ private: WebPrivatePtr<WebCore::IDBKeyRange> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebIDBKeyRange_h diff --git a/third_party/WebKit/public/platform/WebIDBMetadata.h b/third_party/WebKit/public/platform/WebIDBMetadata.h index 8bc913a..86b4e8f 100644 --- a/third_party/WebKit/public/platform/WebIDBMetadata.h +++ b/third_party/WebKit/public/platform/WebIDBMetadata.h @@ -35,7 +35,7 @@ namespace WebCore { struct IDBDatabaseMetadata; } -namespace WebKit { +namespace blink { struct WebIDBMetadata { enum { @@ -87,6 +87,6 @@ struct WebIDBMetadata { }; -} // namespace WebKit +} // namespace blink #endif // WebIDBMetadata_h diff --git a/third_party/WebKit/public/platform/WebIDBTypes.h b/third_party/WebKit/public/platform/WebIDBTypes.h index f80d2fa..1d02515 100644 --- a/third_party/WebKit/public/platform/WebIDBTypes.h +++ b/third_party/WebKit/public/platform/WebIDBTypes.h @@ -26,7 +26,7 @@ #ifndef WebIDBTypes_h #define WebIDBTypes_h -namespace WebKit { +namespace blink { enum WebIDBKeyType { WebIDBKeyTypeInvalid = 0, @@ -45,6 +45,6 @@ enum WebIDBKeyPathType { }; -} // namespace WebKit +} // namespace blink #endif // WebIDBTypes_h diff --git a/third_party/WebKit/public/platform/WebImage.h b/third_party/WebKit/public/platform/WebImage.h index ad5f4a8..85d3268 100644 --- a/third_party/WebKit/public/platform/WebImage.h +++ b/third_party/WebKit/public/platform/WebImage.h @@ -41,7 +41,7 @@ namespace WebCore { class Image; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebData; struct WebSize; @@ -101,6 +101,6 @@ private: }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebImageLayer.h b/third_party/WebKit/public/platform/WebImageLayer.h index de14dd1..ee75c56 100644 --- a/third_party/WebKit/public/platform/WebImageLayer.h +++ b/third_party/WebKit/public/platform/WebImageLayer.h @@ -30,7 +30,7 @@ #include "WebLayer.h" #include "third_party/skia/include/core/SkBitmap.h" -namespace WebKit { +namespace blink { class WebImageLayer { public: @@ -40,6 +40,6 @@ public: virtual void setBitmap(SkBitmap) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebImageLayer_h diff --git a/third_party/WebKit/public/platform/WebLayer.h b/third_party/WebKit/public/platform/WebLayer.h index bcd8524..900a85f 100644 --- a/third_party/WebKit/public/platform/WebLayer.h +++ b/third_party/WebKit/public/platform/WebLayer.h @@ -38,7 +38,7 @@ class SkMatrix44; class SkImageFilter; -namespace WebKit { +namespace blink { class WebAnimationDelegate; class WebFilterOperations; class WebLayerClient; @@ -214,6 +214,6 @@ public: virtual void setWebLayerClient(WebLayerClient*) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebLayer_h diff --git a/third_party/WebKit/public/platform/WebLayerClient.h b/third_party/WebKit/public/platform/WebLayerClient.h index aa110f1..db6a613 100644 --- a/third_party/WebKit/public/platform/WebLayerClient.h +++ b/third_party/WebKit/public/platform/WebLayerClient.h @@ -31,7 +31,7 @@ #ifndef WebLayerClient_h #define WebLayerClient_h -namespace WebKit { +namespace blink { class WebLayerClient { public: @@ -41,7 +41,7 @@ protected: virtual ~WebLayerClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebLayerClient_h diff --git a/third_party/WebKit/public/platform/WebLayerPositionConstraint.h b/third_party/WebKit/public/platform/WebLayerPositionConstraint.h index 0f1b9f8..973a06f 100644 --- a/third_party/WebKit/public/platform/WebLayerPositionConstraint.h +++ b/third_party/WebKit/public/platform/WebLayerPositionConstraint.h @@ -26,7 +26,7 @@ #ifndef WebLayerPositionConstraint_h #define WebLayerPositionConstraint_h -namespace WebKit { +namespace blink { struct WebLayerPositionConstraint { bool isFixedPosition : 1; @@ -50,6 +50,6 @@ struct WebLayerPositionConstraint { } }; -} // namespace WebKit +} // namespace blink #endif // WebLayerPositionConstraint_h diff --git a/third_party/WebKit/public/platform/WebLayerScrollClient.h b/third_party/WebKit/public/platform/WebLayerScrollClient.h index 8504a34..778cead 100644 --- a/third_party/WebKit/public/platform/WebLayerScrollClient.h +++ b/third_party/WebKit/public/platform/WebLayerScrollClient.h @@ -25,7 +25,7 @@ #ifndef WebLayerScrollClient_h #define WebLayerScrollClient_h -namespace WebKit { +namespace blink { // A client that is notified of scrolling on a WebLayer. class WebLayerScrollClient { @@ -35,6 +35,6 @@ protected: virtual ~WebLayerScrollClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebLayerScrollClient_h diff --git a/third_party/WebKit/public/platform/WebLayerTreeView.h b/third_party/WebKit/public/platform/WebLayerTreeView.h index 970e930..dda071f 100644 --- a/third_party/WebKit/public/platform/WebLayerTreeView.h +++ b/third_party/WebKit/public/platform/WebLayerTreeView.h @@ -35,7 +35,7 @@ class SkBitmap; -namespace WebKit { +namespace blink { class WebGraphicsContext3D; class WebLayer; struct WebPoint; @@ -151,6 +151,6 @@ public: virtual void setShowScrollBottleneckRects(bool) { } }; -} // namespace WebKit +} // namespace blink #endif // WebLayerTreeView_h diff --git a/third_party/WebKit/public/platform/WebLocalizedString.h b/third_party/WebKit/public/platform/WebLocalizedString.h index 03c36ec..ae0ffea 100644 --- a/third_party/WebKit/public/platform/WebLocalizedString.h +++ b/third_party/WebKit/public/platform/WebLocalizedString.h @@ -31,7 +31,7 @@ #ifndef WebLocalizedString_h #define WebLocalizedString_h -namespace WebKit { +namespace blink { struct WebLocalizedString { enum Name { @@ -167,6 +167,6 @@ struct WebLocalizedString { }; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebMIDIAccessor.h b/third_party/WebKit/public/platform/WebMIDIAccessor.h index 71aba26..ace32ed 100644 --- a/third_party/WebKit/public/platform/WebMIDIAccessor.h +++ b/third_party/WebKit/public/platform/WebMIDIAccessor.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { class WebMIDIAccessor { public: @@ -44,6 +44,6 @@ public: virtual void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t length, double timeStamp) { } }; -} // namespace WebKit +} // namespace blink #endif // WebMIDIAccessor_h diff --git a/third_party/WebKit/public/platform/WebMIDIAccessorClient.h b/third_party/WebKit/public/platform/WebMIDIAccessorClient.h index 00d7d86..a7d92bd 100644 --- a/third_party/WebKit/public/platform/WebMIDIAccessorClient.h +++ b/third_party/WebKit/public/platform/WebMIDIAccessorClient.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { class WebMIDIAccessorClient { public: @@ -49,6 +49,6 @@ protected: virtual ~WebMIDIAccessorClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebMIDIAccessorClient_h diff --git a/third_party/WebKit/public/platform/WebMediaConstraints.h b/third_party/WebKit/public/platform/WebMediaConstraints.h index 33bc63b..2052c71 100644 --- a/third_party/WebKit/public/platform/WebMediaConstraints.h +++ b/third_party/WebKit/public/platform/WebMediaConstraints.h @@ -42,7 +42,7 @@ struct MediaConstraint; class MediaConstraints; } -namespace WebKit { +namespace blink { struct WebMediaConstraint { WebMediaConstraint() @@ -95,6 +95,6 @@ private: WebPrivatePtr<WebCore::MediaConstraints> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaConstraints_h diff --git a/third_party/WebKit/public/platform/WebMediaSource.h b/third_party/WebKit/public/platform/WebMediaSource.h index 3148b76d..1ba3be7 100644 --- a/third_party/WebKit/public/platform/WebMediaSource.h +++ b/third_party/WebKit/public/platform/WebMediaSource.h @@ -34,7 +34,7 @@ #include "WebTimeRange.h" #include "WebURL.h" -namespace WebKit { +namespace blink { class WebSourceBuffer; @@ -61,6 +61,6 @@ public: virtual void unmarkEndOfStream() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebMediaStream.h b/third_party/WebKit/public/platform/WebMediaStream.h index 87a6706..94082a8 100644 --- a/third_party/WebKit/public/platform/WebMediaStream.h +++ b/third_party/WebKit/public/platform/WebMediaStream.h @@ -34,7 +34,7 @@ namespace WebCore { class MediaStreamDescriptor; } -namespace WebKit { +namespace blink { class WebMediaStreamSource; class WebMediaStreamTrack; @@ -92,6 +92,6 @@ private: WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStream_h diff --git a/third_party/WebKit/public/platform/WebMediaStreamCenter.h b/third_party/WebKit/public/platform/WebMediaStreamCenter.h index 1512462c..1906517 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamCenter.h +++ b/third_party/WebKit/public/platform/WebMediaStreamCenter.h @@ -33,7 +33,7 @@ #include "WebVector.h" -namespace WebKit { +namespace blink { class WebMediaStream; class WebMediaStreamTrack; class WebMediaStreamTrackSourcesRequest; @@ -54,7 +54,7 @@ public: virtual void didCreateMediaStream(WebMediaStream&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamCenter_h diff --git a/third_party/WebKit/public/platform/WebMediaStreamCenterClient.h b/third_party/WebKit/public/platform/WebMediaStreamCenterClient.h index 8a56cfe..014702e 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamCenterClient.h +++ b/third_party/WebKit/public/platform/WebMediaStreamCenterClient.h @@ -31,7 +31,7 @@ #ifndef WebMediaStreamCenterClient_h #define WebMediaStreamCenterClient_h -namespace WebKit { +namespace blink { class WebMediaStream; class WebMediaStreamTrack; @@ -42,6 +42,6 @@ public: virtual void stopLocalMediaStream(const WebMediaStream&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamCenterClient_h diff --git a/third_party/WebKit/public/platform/WebMediaStreamSource.h b/third_party/WebKit/public/platform/WebMediaStreamSource.h index d9113e8..7bdd7eb 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamSource.h +++ b/third_party/WebKit/public/platform/WebMediaStreamSource.h @@ -40,7 +40,7 @@ namespace WebCore { class MediaStreamSource; } -namespace WebKit { +namespace blink { class WebAudioDestinationConsumer; class WebMediaConstraints; class WebString; @@ -126,6 +126,6 @@ private: WebPrivatePtr<WebCore::MediaStreamSource> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamSource_h diff --git a/third_party/WebKit/public/platform/WebMediaStreamTrack.h b/third_party/WebKit/public/platform/WebMediaStreamTrack.h index 0b14bf4..598bf88 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamTrack.h +++ b/third_party/WebKit/public/platform/WebMediaStreamTrack.h @@ -33,7 +33,7 @@ namespace WebCore { class MediaStreamComponent; } -namespace WebKit { +namespace blink { class WebAudioSourceProvider; class WebMediaStream; class WebMediaStreamSource; @@ -93,6 +93,6 @@ private: WebPrivatePtr<WebCore::MediaStreamComponent> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamTrack_h diff --git a/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h b/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h index 63e1ce3..074c9bf 100644 --- a/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h +++ b/third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h @@ -36,7 +36,7 @@ namespace WebCore { class MediaStreamTrackSourcesRequest; } -namespace WebKit { +namespace blink { class WebSourceInfo; class WebMediaStreamTrackSourcesRequest { @@ -79,6 +79,6 @@ private: WebPrivatePtr<WebCore::MediaStreamTrackSourcesRequest> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamTrackSourcesRequest_h diff --git a/third_party/WebKit/public/platform/WebMessagePortChannel.h b/third_party/WebKit/public/platform/WebMessagePortChannel.h index 88c1809..d422233 100644 --- a/third_party/WebKit/public/platform/WebMessagePortChannel.h +++ b/third_party/WebKit/public/platform/WebMessagePortChannel.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebMessagePortChannelClient; class WebString; @@ -57,6 +57,6 @@ protected: ~WebMessagePortChannel() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebMessagePortChannelClient.h b/third_party/WebKit/public/platform/WebMessagePortChannelClient.h index 07ef9c9..9389338 100644 --- a/third_party/WebKit/public/platform/WebMessagePortChannelClient.h +++ b/third_party/WebKit/public/platform/WebMessagePortChannelClient.h @@ -31,7 +31,7 @@ #ifndef WebMessagePortChannelClient_h #define WebMessagePortChannelClient_h -namespace WebKit { +namespace blink { // Provides an interface for users of WebMessagePortChannel to be notified // when messages are available. @@ -46,6 +46,6 @@ protected: ~WebMessagePortChannelClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebMimeRegistry.h b/third_party/WebKit/public/platform/WebMimeRegistry.h index 4d49e60..21a60ea 100644 --- a/third_party/WebKit/public/platform/WebMimeRegistry.h +++ b/third_party/WebKit/public/platform/WebMimeRegistry.h @@ -33,30 +33,30 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebString; class WebMimeRegistry { public: enum SupportsType { IsNotSupported, IsSupported, MayBeSupported }; - virtual SupportsType supportsMIMEType(const WebKit::WebString& mimeType) = 0; - virtual SupportsType supportsImageMIMEType(const WebKit::WebString& mimeType) = 0; - virtual SupportsType supportsJavaScriptMIMEType(const WebKit::WebString& mimeType) = 0; - virtual SupportsType supportsMediaMIMEType(const WebKit::WebString& mimeType, const WebKit::WebString& codecs, const WebKit::WebString& keySystem) = 0; + virtual SupportsType supportsMIMEType(const blink::WebString& mimeType) = 0; + virtual SupportsType supportsImageMIMEType(const blink::WebString& mimeType) = 0; + virtual SupportsType supportsJavaScriptMIMEType(const blink::WebString& mimeType) = 0; + virtual SupportsType supportsMediaMIMEType(const blink::WebString& mimeType, const blink::WebString& codecs, const blink::WebString& keySystem) = 0; - virtual bool supportsMediaSourceMIMEType(const WebKit::WebString& mimeType, const WebKit::WebString& codecs) = 0; + virtual bool supportsMediaSourceMIMEType(const blink::WebString& mimeType, const blink::WebString& codecs) = 0; - virtual SupportsType supportsNonImageMIMEType(const WebKit::WebString& mimeType) = 0; + virtual SupportsType supportsNonImageMIMEType(const blink::WebString& mimeType) = 0; - virtual WebKit::WebString mimeTypeForExtension(const WebKit::WebString& fileExtension) = 0; - virtual WebKit::WebString wellKnownMimeTypeForExtension(const WebKit::WebString& fileExtension) = 0; - virtual WebKit::WebString mimeTypeFromFile(const WebKit::WebString& filePath) = 0; + virtual blink::WebString mimeTypeForExtension(const blink::WebString& fileExtension) = 0; + virtual blink::WebString wellKnownMimeTypeForExtension(const blink::WebString& fileExtension) = 0; + virtual blink::WebString mimeTypeFromFile(const blink::WebString& filePath) = 0; protected: ~WebMimeRegistry() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebNinePatchLayer.h b/third_party/WebKit/public/platform/WebNinePatchLayer.h index 1279db7..95b8af0 100644 --- a/third_party/WebKit/public/platform/WebNinePatchLayer.h +++ b/third_party/WebKit/public/platform/WebNinePatchLayer.h @@ -36,7 +36,7 @@ #include "WebRect.h" #include "third_party/skia/include/core/SkBitmap.h" -namespace WebKit { +namespace blink { class WebNinePatchLayer { public: @@ -46,6 +46,6 @@ public: virtual void setBitmap(SkBitmap, const WebRect& aperture) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebNinePatchLayer_h diff --git a/third_party/WebKit/public/platform/WebNonCopyable.h b/third_party/WebKit/public/platform/WebNonCopyable.h index b0bd456..4b26b54 100644 --- a/third_party/WebKit/public/platform/WebNonCopyable.h +++ b/third_party/WebKit/public/platform/WebNonCopyable.h @@ -31,7 +31,7 @@ #ifndef WebNonCopyable_h #define WebNonCopyable_h -namespace WebKit { +namespace blink { // A base class to extend from if you do not support copying. class WebNonCopyable { @@ -44,6 +44,6 @@ private: WebNonCopyable& operator=(const WebNonCopyable&); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebPluginListBuilder.h b/third_party/WebKit/public/platform/WebPluginListBuilder.h index 4bd427d..ec5105fe 100644 --- a/third_party/WebKit/public/platform/WebPluginListBuilder.h +++ b/third_party/WebKit/public/platform/WebPluginListBuilder.h @@ -31,7 +31,7 @@ #ifndef WebPluginListBuilder_h #define WebPluginListBuilder_h -namespace WebKit { +namespace blink { class WebString; @@ -49,6 +49,6 @@ public: const WebString& fileExtension) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebPoint.h b/third_party/WebKit/public/platform/WebPoint.h index c701e2c..7424072 100644 --- a/third_party/WebKit/public/platform/WebPoint.h +++ b/third_party/WebKit/public/platform/WebPoint.h @@ -39,7 +39,7 @@ #include <ui/gfx/point.h> #endif -namespace WebKit { +namespace blink { struct WebPoint { int x; @@ -106,6 +106,6 @@ inline bool operator!=(const WebPoint& a, const WebPoint& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebPrerender.h b/third_party/WebKit/public/platform/WebPrerender.h index c82b62b..cb30c76 100644 --- a/third_party/WebKit/public/platform/WebPrerender.h +++ b/third_party/WebKit/public/platform/WebPrerender.h @@ -45,7 +45,7 @@ namespace WebCore { class Prerender; } -namespace WebKit { +namespace blink { class WebPrerender { public: @@ -89,6 +89,6 @@ private: WebPrivatePtr<WebCore::Prerender> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebPrerender_h diff --git a/third_party/WebKit/public/platform/WebPrerenderingSupport.h b/third_party/WebKit/public/platform/WebPrerenderingSupport.h index a8646cb..d1c5533 100644 --- a/third_party/WebKit/public/platform/WebPrerenderingSupport.h +++ b/third_party/WebKit/public/platform/WebPrerenderingSupport.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebPrerender; @@ -62,6 +62,6 @@ private: static WebPrerenderingSupport* s_platform; }; -} // namespace WebKit +} // namespace blink #endif // WebPrerenderingSupport_h diff --git a/third_party/WebKit/public/platform/WebPrescientNetworking.h b/third_party/WebKit/public/platform/WebPrescientNetworking.h index fcc4edb..0b8b80b 100644 --- a/third_party/WebKit/public/platform/WebPrescientNetworking.h +++ b/third_party/WebKit/public/platform/WebPrescientNetworking.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebURL; @@ -62,6 +62,6 @@ public: virtual void preconnect(const WebURL&, WebPreconnectMotivation) { } }; -} // namespace WebKit +} // namespace blink #endif // WebPrescientNetworking_h diff --git a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h index b1f558f..d76cff6 100644 --- a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h +++ b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h @@ -34,7 +34,7 @@ #include "wtf/PassOwnPtr.h" #endif -namespace WebKit { +namespace blink { // This class is an implementation detail of the WebKit API. It exists // to help simplify the implementation of WebKit interfaces that merely @@ -95,6 +95,6 @@ template<typename T> template<typename U> inline WebPrivateOwnPtr<T>::WebPrivate } #endif -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebPrivatePtr.h b/third_party/WebKit/public/platform/WebPrivatePtr.h index 9c14297..83ed0d7 100644 --- a/third_party/WebKit/public/platform/WebPrivatePtr.h +++ b/third_party/WebKit/public/platform/WebPrivatePtr.h @@ -37,7 +37,7 @@ #include "wtf/PassRefPtr.h" #endif -namespace WebKit { +namespace blink { // This class is an implementation detail of the WebKit API. It exists // to help simplify the implementation of WebKit interfaces that merely @@ -141,6 +141,6 @@ private: T* m_ptr; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebRTCConfiguration.h b/third_party/WebKit/public/platform/WebRTCConfiguration.h index 16798ff..2d3f68c 100644 --- a/third_party/WebKit/public/platform/WebRTCConfiguration.h +++ b/third_party/WebKit/public/platform/WebRTCConfiguration.h @@ -41,7 +41,7 @@ class RTCIceServer; class RTCConfiguration; } -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -102,6 +102,6 @@ private: WebPrivatePtr<WebCore::RTCConfiguration> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCConfiguration_h diff --git a/third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h b/third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h index 53c88a4..88e200b 100644 --- a/third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h +++ b/third_party/WebKit/public/platform/WebRTCDTMFSenderHandler.h @@ -29,7 +29,7 @@ #include "WebCommon.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebRTCDTMFSenderHandlerClient; class WebRTCDTMFSenderHandler { @@ -44,6 +44,6 @@ public: virtual bool insertDTMF(const WebString& tones, long duration, long interToneGap) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCDTMFSenderHandler_h diff --git a/third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h b/third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h index 4bd83c8..c159685 100644 --- a/third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h +++ b/third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h @@ -28,7 +28,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebRTCDTMFSenderHandlerClient { public: @@ -37,6 +37,6 @@ public: virtual void didPlayTone(const WebString& tone) const = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCDTMFSenderHandlerClient_h diff --git a/third_party/WebKit/public/platform/WebRTCDataChannelHandler.h b/third_party/WebKit/public/platform/WebRTCDataChannelHandler.h index 5cb84e0..31c30cd 100644 --- a/third_party/WebKit/public/platform/WebRTCDataChannelHandler.h +++ b/third_party/WebKit/public/platform/WebRTCDataChannelHandler.h @@ -29,7 +29,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebRTCDataChannelHandlerClient; class WebRTCDataChannelHandler { @@ -56,6 +56,6 @@ public: virtual void close() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCDataChannelHandler_h diff --git a/third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h b/third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h index 42ab4ff..6c737ae 100644 --- a/third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h +++ b/third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h @@ -29,7 +29,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebRTCDataChannelHandlerClient { public: @@ -48,6 +48,6 @@ public: virtual void didDetectError() const = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCDataChannelHandlerClient_h diff --git a/third_party/WebKit/public/platform/WebRTCDataChannelInit.h b/third_party/WebKit/public/platform/WebRTCDataChannelInit.h index aabb583..0b46553 100644 --- a/third_party/WebKit/public/platform/WebRTCDataChannelInit.h +++ b/third_party/WebKit/public/platform/WebRTCDataChannelInit.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { struct WebRTCDataChannelInit { public: @@ -51,6 +51,6 @@ public: int id; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCDataChannelInit_h diff --git a/third_party/WebKit/public/platform/WebRTCICECandidate.h b/third_party/WebKit/public/platform/WebRTCICECandidate.h index c8a00217..47eb0a9 100644 --- a/third_party/WebKit/public/platform/WebRTCICECandidate.h +++ b/third_party/WebKit/public/platform/WebRTCICECandidate.h @@ -39,7 +39,7 @@ namespace WebCore { class RTCIceCandidateDescriptor; } -namespace WebKit { +namespace blink { class WebString; class WebRTCICECandidatePrivate; @@ -77,6 +77,6 @@ private: WebPrivatePtr<WebRTCICECandidatePrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCICECandidate_h diff --git a/third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h b/third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h index 8b9698b..0ecf38ec 100644 --- a/third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h +++ b/third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h @@ -31,7 +31,7 @@ #ifndef WebRTCPeerConnectionHandler_h #define WebRTCPeerConnectionHandler_h -namespace WebKit { +namespace blink { class WebMediaConstraints; class WebMediaStream; class WebMediaStreamTrack; @@ -73,6 +73,6 @@ public: virtual void stop() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCPeerConnectionHandler_h diff --git a/third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h b/third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h index c07de36..27a24fb 100644 --- a/third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h +++ b/third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h @@ -31,7 +31,7 @@ #ifndef WebRTCPeerConnectionHandlerClient_h #define WebRTCPeerConnectionHandlerClient_h -namespace WebKit { +namespace blink { class WebMediaStream; class WebRTCDataChannelHandler; class WebRTCICECandidate; @@ -78,6 +78,6 @@ public: virtual void didAddRemoteDataChannel(WebRTCDataChannelHandler*) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCPeerConnectionHandlerClient_h diff --git a/third_party/WebKit/public/platform/WebRTCSessionDescription.h b/third_party/WebKit/public/platform/WebRTCSessionDescription.h index 504b6a0..4929755 100644 --- a/third_party/WebKit/public/platform/WebRTCSessionDescription.h +++ b/third_party/WebKit/public/platform/WebRTCSessionDescription.h @@ -36,7 +36,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebRTCSessionDescriptionPrivate; @@ -86,6 +86,6 @@ private: WebPrivatePtr<WebRTCSessionDescriptionPrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCSessionDescription_h diff --git a/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h b/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h index ca5e78a..ca2c182 100644 --- a/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h +++ b/third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h @@ -40,7 +40,7 @@ namespace WebCore { class RTCSessionDescriptionRequest; } -namespace WebKit { +namespace blink { class WebRTCSessionDescription; class WebRTCSessionDescriptionRequest { @@ -83,6 +83,6 @@ private: WebPrivatePtr<WebCore::RTCSessionDescriptionRequest> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCSessionDescriptionRequest_h diff --git a/third_party/WebKit/public/platform/WebRTCStatsRequest.h b/third_party/WebKit/public/platform/WebRTCStatsRequest.h index f5f0d43..914c0c4 100644 --- a/third_party/WebKit/public/platform/WebRTCStatsRequest.h +++ b/third_party/WebKit/public/platform/WebRTCStatsRequest.h @@ -39,7 +39,7 @@ namespace WebCore { class RTCStatsRequest; } -namespace WebKit { +namespace blink { class WebMediaStreamTrack; class WebMediaStream; @@ -104,6 +104,6 @@ private: WebPrivatePtr<WebCore::RTCStatsRequest> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCStatsRequest_h diff --git a/third_party/WebKit/public/platform/WebRTCStatsResponse.h b/third_party/WebKit/public/platform/WebRTCStatsResponse.h index 32628dc..5c0234d 100644 --- a/third_party/WebKit/public/platform/WebRTCStatsResponse.h +++ b/third_party/WebKit/public/platform/WebRTCStatsResponse.h @@ -33,7 +33,7 @@ namespace WebCore { class RTCStatsResponseBase; } -namespace WebKit { +namespace blink { class WebRTCStatsResponse { public: @@ -64,6 +64,6 @@ private: WebPrivatePtr<WebCore::RTCStatsResponseBase> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCStatsResponse_h diff --git a/third_party/WebKit/public/platform/WebRTCVoidRequest.h b/third_party/WebKit/public/platform/WebRTCVoidRequest.h index 9bbb875..8057e98 100644 --- a/third_party/WebKit/public/platform/WebRTCVoidRequest.h +++ b/third_party/WebKit/public/platform/WebRTCVoidRequest.h @@ -40,7 +40,7 @@ namespace WebCore { class RTCVoidRequest; } -namespace WebKit { +namespace blink { class WebRTCVoidRequest { public: @@ -82,6 +82,6 @@ private: WebPrivatePtr<WebCore::RTCVoidRequest> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebRTCVoidRequest_h diff --git a/third_party/WebKit/public/platform/WebRect.h b/third_party/WebKit/public/platform/WebRect.h index 0539ff9..440e168 100644 --- a/third_party/WebKit/public/platform/WebRect.h +++ b/third_party/WebKit/public/platform/WebRect.h @@ -41,7 +41,7 @@ #include <ui/gfx/rect.h> #endif -namespace WebKit { +namespace blink { struct WebRect { int x; @@ -124,6 +124,6 @@ inline bool operator!=(const WebRect& a, const WebRect& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebReferrerPolicy.h b/third_party/WebKit/public/platform/WebReferrerPolicy.h index 82710fb..457c3de 100644 --- a/third_party/WebKit/public/platform/WebReferrerPolicy.h +++ b/third_party/WebKit/public/platform/WebReferrerPolicy.h @@ -31,7 +31,7 @@ #ifndef WebReferrerPolicy_h #define WebReferrerPolicy_h -namespace WebKit { +namespace blink { enum WebReferrerPolicy { WebReferrerPolicyAlways, @@ -40,6 +40,6 @@ enum WebReferrerPolicy { WebReferrerPolicyOrigin, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebRenderingStats.h b/third_party/WebKit/public/platform/WebRenderingStats.h index 92bc057..ddd117a 100644 --- a/third_party/WebKit/public/platform/WebRenderingStats.h +++ b/third_party/WebKit/public/platform/WebRenderingStats.h @@ -26,7 +26,7 @@ #ifndef WebRenderingStats_h #define WebRenderingStats_h -namespace WebKit { +namespace blink { struct WebRenderingStats { WebRenderingStats() @@ -34,6 +34,6 @@ struct WebRenderingStats { } }; -} // namespace WebKit +} // namespace blink #endif // WebRenderingStats_h diff --git a/third_party/WebKit/public/platform/WebScreenInfo.h b/third_party/WebKit/public/platform/WebScreenInfo.h index ea43af7..929f724 100644 --- a/third_party/WebKit/public/platform/WebScreenInfo.h +++ b/third_party/WebKit/public/platform/WebScreenInfo.h @@ -33,7 +33,7 @@ #include "WebRect.h" -namespace WebKit { +namespace blink { struct WebScreenInfo { // Device scale factor. Specifies the ratio between physical and logical @@ -74,6 +74,6 @@ struct WebScreenInfo { , isMonochrome(false) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebScrollbar.h b/third_party/WebKit/public/platform/WebScrollbar.h index cc2766a..198be45 100644 --- a/third_party/WebKit/public/platform/WebScrollbar.h +++ b/third_party/WebKit/public/platform/WebScrollbar.h @@ -37,7 +37,7 @@ namespace WebCore { class Scrollbar; } -namespace WebKit { +namespace blink { // A const accessor interface for a WebKit scrollbar class WebScrollbar { @@ -111,6 +111,6 @@ public: virtual void setIsAlphaLocked(bool) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebScrollbarLayer.h b/third_party/WebKit/public/platform/WebScrollbarLayer.h index d1d94da..5658da8 100644 --- a/third_party/WebKit/public/platform/WebScrollbarLayer.h +++ b/third_party/WebKit/public/platform/WebScrollbarLayer.h @@ -34,7 +34,7 @@ namespace WebCore { class Scrollbar; } -namespace WebKit { +namespace blink { class WebScrollbarLayer { public: @@ -45,6 +45,6 @@ public: virtual void setScrollLayer(WebLayer*) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebScrollbarLayer_h diff --git a/third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h b/third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h index 0a8562e..4fc5635 100644 --- a/third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h +++ b/third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h @@ -28,7 +28,7 @@ #include "WebRect.h" -namespace WebKit { +namespace blink { class WebScrollbar; @@ -55,6 +55,6 @@ public: virtual void splitTrack(WebScrollbar*, const WebRect& track, WebRect& startTrack, WebRect& thumb, WebRect& endTrack) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebScrollbarThemePainter.h b/third_party/WebKit/public/platform/WebScrollbarThemePainter.h index 1bd8c56..1417c0b 100644 --- a/third_party/WebKit/public/platform/WebScrollbarThemePainter.h +++ b/third_party/WebKit/public/platform/WebScrollbarThemePainter.h @@ -33,7 +33,7 @@ class ScrollbarTheme; class Scrollbar; }; -namespace WebKit { +namespace blink { class WebScrollbar; struct WebRect; @@ -80,6 +80,6 @@ private: WebCore::Scrollbar* m_scrollbar; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebServiceWorker.h b/third_party/WebKit/public/platform/WebServiceWorker.h index 2c93461..3f42889 100644 --- a/third_party/WebKit/public/platform/WebServiceWorker.h +++ b/third_party/WebKit/public/platform/WebServiceWorker.h @@ -31,7 +31,7 @@ #ifndef WebServiceWorker_h #define WebServiceWorker_h -namespace WebKit { +namespace blink { class WebServiceWorker { diff --git a/third_party/WebKit/public/platform/WebServiceWorkerError.h b/third_party/WebKit/public/platform/WebServiceWorkerError.h index 8ae4c27..2b8df80 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerError.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerError.h @@ -33,7 +33,7 @@ #include "WebString.h" -namespace WebKit { +namespace blink { struct WebServiceWorkerError { enum ErrorType { @@ -48,6 +48,6 @@ struct WebServiceWorkerError { WebString message; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebServiceWorkerProvider.h b/third_party/WebKit/public/platform/WebServiceWorkerProvider.h index 65c0445..73e2363 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerProvider.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerProvider.h @@ -33,7 +33,7 @@ #include "public/platform/WebCallbacks.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -50,6 +50,6 @@ public: virtual ~WebServiceWorkerProvider() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h b/third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h index 5788e09..3a9cac6 100644 --- a/third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h +++ b/third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h @@ -31,7 +31,7 @@ #ifndef WebServiceWorkerProviderClient_h #define WebServiceWorkerProviderClient_h -namespace WebKit { +namespace blink { class WebString; // This class catches any errors that may originate on the browser diff --git a/third_party/WebKit/public/platform/WebSize.h b/third_party/WebKit/public/platform/WebSize.h index 2b266fe..038af59 100644 --- a/third_party/WebKit/public/platform/WebSize.h +++ b/third_party/WebKit/public/platform/WebSize.h @@ -42,7 +42,7 @@ #include <ui/gfx/vector2d.h> #endif -namespace WebKit { +namespace blink { struct WebSize { int width; @@ -129,6 +129,6 @@ inline bool operator!=(const WebSize& a, const WebSize& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebSocketHandle.h b/third_party/WebKit/public/platform/WebSocketHandle.h index 0708f2f..f721891 100644 --- a/third_party/WebKit/public/platform/WebSocketHandle.h +++ b/third_party/WebKit/public/platform/WebSocketHandle.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebSocketHandleClient; class WebString; @@ -64,6 +64,6 @@ public: virtual void close(unsigned short code, const WebString& reason) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSocketHandle_h diff --git a/third_party/WebKit/public/platform/WebSocketHandleClient.h b/third_party/WebKit/public/platform/WebSocketHandleClient.h index 44a6d4a..10e55e4 100644 --- a/third_party/WebKit/public/platform/WebSocketHandleClient.h +++ b/third_party/WebKit/public/platform/WebSocketHandleClient.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "public/platform/WebSocketHandle.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -59,6 +59,6 @@ public: virtual void didReceiveFlowControl(WebSocketHandle*, int64_t quota) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSocketHandleClient_h diff --git a/third_party/WebKit/public/platform/WebSocketStreamError.h b/third_party/WebKit/public/platform/WebSocketStreamError.h index 7684b25..2bbef89 100644 --- a/third_party/WebKit/public/platform/WebSocketStreamError.h +++ b/third_party/WebKit/public/platform/WebSocketStreamError.h @@ -40,7 +40,7 @@ namespace WebCore { class SocketStreamError; } -namespace WebKit { +namespace blink { class WebString; @@ -64,6 +64,6 @@ private: WebPrivatePtr<WebCore::SocketStreamError> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebSocketStreamHandle.h b/third_party/WebKit/public/platform/WebSocketStreamHandle.h index af9672d..60a469a 100644 --- a/third_party/WebKit/public/platform/WebSocketStreamHandle.h +++ b/third_party/WebKit/public/platform/WebSocketStreamHandle.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebData; class WebSocketStreamHandleClient; @@ -53,6 +53,6 @@ public: virtual void close() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebSocketStreamHandleClient.h b/third_party/WebKit/public/platform/WebSocketStreamHandleClient.h index 4f39241..066897a 100644 --- a/third_party/WebKit/public/platform/WebSocketStreamHandleClient.h +++ b/third_party/WebKit/public/platform/WebSocketStreamHandleClient.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebData; class WebSocketStreamError; @@ -59,6 +59,6 @@ public: virtual void didFail(WebSocketStreamHandle*, const WebSocketStreamError&) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebSolidColorLayer.h b/third_party/WebKit/public/platform/WebSolidColorLayer.h index c5913e5..0178830 100644 --- a/third_party/WebKit/public/platform/WebSolidColorLayer.h +++ b/third_party/WebKit/public/platform/WebSolidColorLayer.h @@ -29,7 +29,7 @@ #include "WebColor.h" #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebLayer; class WebSolidColorLayer { @@ -40,6 +40,6 @@ public: virtual void setBackgroundColor(WebColor) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSolidColorLayer_h diff --git a/third_party/WebKit/public/platform/WebSourceBuffer.h b/third_party/WebKit/public/platform/WebSourceBuffer.h index f2cd195..6eceac6 100644 --- a/third_party/WebKit/public/platform/WebSourceBuffer.h +++ b/third_party/WebKit/public/platform/WebSourceBuffer.h @@ -33,7 +33,7 @@ #include "WebTimeRange.h" -namespace WebKit { +namespace blink { class WebSourceBuffer { public: @@ -54,6 +54,6 @@ public: virtual void removedFromMediaSource() = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebSourceInfo.h b/third_party/WebKit/public/platform/WebSourceInfo.h index f91332d..190b1e6 100644 --- a/third_party/WebKit/public/platform/WebSourceInfo.h +++ b/third_party/WebKit/public/platform/WebSourceInfo.h @@ -31,7 +31,7 @@ #include "WebPrivatePtr.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebSourceInfoPrivate; @@ -74,6 +74,6 @@ private: WebPrivatePtr<WebSourceInfoPrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebSourceInfo_h diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h b/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h index 0e314c7..83a0fbc 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h @@ -32,7 +32,7 @@ namespace WebCore { class PlatformSpeechSynthesisUtterance; } -namespace WebKit { +namespace blink { class WebSpeechSynthesisUtterance { public: @@ -72,6 +72,6 @@ private: WebPrivatePtr<WebCore::PlatformSpeechSynthesisUtterance> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechSynthesisUtterance_h diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h b/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h index a4011a7..43ea0f8 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h @@ -34,7 +34,7 @@ namespace WebCore { class PlatformSpeechSynthesisVoice; } -namespace WebKit { +namespace blink { class WebSpeechSynthesisVoice { public: @@ -65,6 +65,6 @@ private: WebPrivatePtr<WebCore::PlatformSpeechSynthesisVoice> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechSynthesisVoice_h diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesizer.h b/third_party/WebKit/public/platform/WebSpeechSynthesizer.h index 4c0f965..a87de3c 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesizer.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesizer.h @@ -28,7 +28,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebSpeechSynthesizerClient; class WebSpeechSynthesisUtterance; @@ -47,6 +47,6 @@ public: virtual void cancel() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechSynthesizer_h diff --git a/third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h b/third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h index f2b9e9c..5c52ece 100644 --- a/third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h +++ b/third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h @@ -30,7 +30,7 @@ #include "WebSpeechSynthesisVoice.h" #include "WebVector.h" -namespace WebKit { +namespace blink { class WebSpeechSynthesizerClient { public: @@ -46,6 +46,6 @@ public: virtual void sentenceBoundaryEventOccurred(const WebSpeechSynthesisUtterance&, unsigned charIndex) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechSynthesizerClient_h diff --git a/third_party/WebKit/public/platform/WebStorageArea.h b/third_party/WebKit/public/platform/WebStorageArea.h index 3b1f967..f83c3c3 100644 --- a/third_party/WebKit/public/platform/WebStorageArea.h +++ b/third_party/WebKit/public/platform/WebStorageArea.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebURL; @@ -93,6 +93,6 @@ public: virtual void clear(const WebURL& pageUrl, bool& somethingCleared) { } }; -} // namespace WebKit +} // namespace blink #endif // WebStorageArea_h diff --git a/third_party/WebKit/public/platform/WebStorageNamespace.h b/third_party/WebKit/public/platform/WebStorageNamespace.h index 1b33bd6..4f129f8 100644 --- a/third_party/WebKit/public/platform/WebStorageNamespace.h +++ b/third_party/WebKit/public/platform/WebStorageNamespace.h @@ -33,7 +33,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { class WebStorageArea; class WebString; @@ -54,6 +54,6 @@ public: virtual bool isSameNamespace(const WebStorageNamespace&) const { return false; } }; -} // namespace WebKit +} // namespace blink #endif // WebStorageNamespace_h diff --git a/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h b/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h index 8f99475..41a9a33 100644 --- a/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h +++ b/third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h @@ -33,7 +33,7 @@ #include "WebStorageQuotaError.h" -namespace WebKit { +namespace blink { class WebStorageQuotaCallbacks { public: @@ -50,6 +50,6 @@ protected: virtual ~WebStorageQuotaCallbacks() { } }; -} // namespace WebKit +} // namespace blink #endif // WebStorageQuotaCallbacks_h diff --git a/third_party/WebKit/public/platform/WebStorageQuotaError.h b/third_party/WebKit/public/platform/WebStorageQuotaError.h index 97fb235..76381ac 100644 --- a/third_party/WebKit/public/platform/WebStorageQuotaError.h +++ b/third_party/WebKit/public/platform/WebStorageQuotaError.h @@ -31,7 +31,7 @@ #ifndef WebStorageQuotaError_h #define WebStorageQuotaError_h -namespace WebKit { +namespace blink { // The error code used for WebStorageQuota. enum WebStorageQuotaError { @@ -41,6 +41,6 @@ enum WebStorageQuotaError { WebStorageQuotaErrorAbort = 17, }; -} // namespace WebKit +} // namespace blink #endif // WebStorageQuotaError_h diff --git a/third_party/WebKit/public/platform/WebStorageQuotaType.h b/third_party/WebKit/public/platform/WebStorageQuotaType.h index aff1cf9..563fafa 100644 --- a/third_party/WebKit/public/platform/WebStorageQuotaType.h +++ b/third_party/WebKit/public/platform/WebStorageQuotaType.h @@ -31,13 +31,13 @@ #ifndef WebStorageQuotaType_h #define WebStorageQuotaType_h -namespace WebKit { +namespace blink { enum WebStorageQuotaType { WebStorageQuotaTypeTemporary, WebStorageQuotaTypePersistent, }; -} // namespace WebKit +} // namespace blink #endif // WebStorageQuotaType_h diff --git a/third_party/WebKit/public/platform/WebString.h b/third_party/WebKit/public/platform/WebString.h index 4250953..1932e71 100644 --- a/third_party/WebKit/public/platform/WebString.h +++ b/third_party/WebKit/public/platform/WebString.h @@ -47,7 +47,7 @@ namespace WTF { class StringImpl; } -namespace WebKit { +namespace blink { class WebCString; @@ -187,6 +187,6 @@ inline bool operator!=(const WebString& a, const WebString& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebThread.h b/third_party/WebKit/public/platform/WebThread.h index 453bfe1..a69d421 100644 --- a/third_party/WebKit/public/platform/WebThread.h +++ b/third_party/WebKit/public/platform/WebThread.h @@ -27,7 +27,7 @@ #include "WebCommon.h" -namespace WebKit { +namespace blink { // Provides an interface to an embedder-defined thread implementation. // @@ -71,6 +71,6 @@ public: virtual ~WebThread() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebThreadSafeData.h b/third_party/WebKit/public/platform/WebThreadSafeData.h index 531bae6..1803456 100644 --- a/third_party/WebKit/public/platform/WebThreadSafeData.h +++ b/third_party/WebKit/public/platform/WebThreadSafeData.h @@ -40,7 +40,7 @@ namespace WebCore { class RawData; } -namespace WebKit { +namespace blink { // A container for raw bytes. It is inexpensive to copy a WebThreadSafeData object. // It is safe to pass a WebThreadSafeData across threads!!! @@ -72,6 +72,6 @@ private: WebPrivatePtr<WebCore::RawData> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebTimeRange.h b/third_party/WebKit/public/platform/WebTimeRange.h index ec51fb3..0d5cb1f 100644 --- a/third_party/WebKit/public/platform/WebTimeRange.h +++ b/third_party/WebKit/public/platform/WebTimeRange.h @@ -33,7 +33,7 @@ #include "WebVector.h" -namespace WebKit { +namespace blink { struct WebTimeRange { WebTimeRange() : start(0), end(0) { } @@ -45,6 +45,6 @@ struct WebTimeRange { typedef WebVector<WebTimeRange> WebTimeRanges; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebTransformAnimationCurve.h b/third_party/WebKit/public/platform/WebTransformAnimationCurve.h index 29fb27a..53f9451 100644 --- a/third_party/WebKit/public/platform/WebTransformAnimationCurve.h +++ b/third_party/WebKit/public/platform/WebTransformAnimationCurve.h @@ -30,7 +30,7 @@ #include "WebCommon.h" #include "WebTransformKeyframe.h" -namespace WebKit { +namespace blink { // A keyframed transform animation curve. class WebTransformAnimationCurve : public WebAnimationCurve { @@ -45,6 +45,6 @@ public: virtual void add(const WebTransformKeyframe&, double x1, double y1, double x2, double y2) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebTransformAnimationCurve_h diff --git a/third_party/WebKit/public/platform/WebTransformKeyframe.h b/third_party/WebKit/public/platform/WebTransformKeyframe.h index 746e054..4adc83a 100644 --- a/third_party/WebKit/public/platform/WebTransformKeyframe.h +++ b/third_party/WebKit/public/platform/WebTransformKeyframe.h @@ -32,7 +32,7 @@ namespace WTF { template <typename T> class PassOwnPtr; } #endif -namespace WebKit { +namespace blink { class WebTransformKeyframe : public WebNonCopyable { public: @@ -51,6 +51,6 @@ private: WebPrivateOwnPtr<WebTransformOperations> m_value; }; -} // namespace WebKit +} // namespace blink #endif // WebTransformKeyframe_h diff --git a/third_party/WebKit/public/platform/WebTransformOperations.h b/third_party/WebKit/public/platform/WebTransformOperations.h index d9a5ebb..a433f66 100644 --- a/third_party/WebKit/public/platform/WebTransformOperations.h +++ b/third_party/WebKit/public/platform/WebTransformOperations.h @@ -29,7 +29,7 @@ class SkMatrix44; #define WEB_TRANSFORM_OPERATIONS_IS_VIRTUAL 1 -namespace WebKit { +namespace blink { class WebTransformOperations { public: @@ -51,7 +51,7 @@ public: virtual bool isIdentity() const = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebTransformOperations_h diff --git a/third_party/WebKit/public/platform/WebURL.h b/third_party/WebKit/public/platform/WebURL.h index 2a4d382..29c4912 100644 --- a/third_party/WebKit/public/platform/WebURL.h +++ b/third_party/WebKit/public/platform/WebURL.h @@ -41,7 +41,7 @@ namespace WebCore { class KURL; } #include <url/gurl.h> #endif -namespace WebKit { +namespace blink { class WebURL { public: @@ -143,6 +143,6 @@ inline bool operator!=(const WebURL& a, const WebURL& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLError.h b/third_party/WebKit/public/platform/WebURLError.h index 547093c..14553d0 100644 --- a/third_party/WebKit/public/platform/WebURLError.h +++ b/third_party/WebKit/public/platform/WebURLError.h @@ -38,7 +38,7 @@ namespace WebCore { class ResourceError; } #endif -namespace WebKit { +namespace blink { struct WebURLError { // A namespace for "reason" to support various layers generating @@ -71,6 +71,6 @@ struct WebURLError { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLLoadTiming.h b/third_party/WebKit/public/platform/WebURLLoadTiming.h index 04f8804..460489c 100644 --- a/third_party/WebKit/public/platform/WebURLLoadTiming.h +++ b/third_party/WebKit/public/platform/WebURLLoadTiming.h @@ -36,7 +36,7 @@ namespace WebCore { class ResourceLoadTiming; } -namespace WebKit { +namespace blink { class WebString; class WebURLLoadTiming { @@ -103,6 +103,6 @@ private: WebPrivatePtr<WebCore::ResourceLoadTiming> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLLoader.h b/third_party/WebKit/public/platform/WebURLLoader.h index 9337bb0..e183a32 100644 --- a/third_party/WebKit/public/platform/WebURLLoader.h +++ b/third_party/WebKit/public/platform/WebURLLoader.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #include "WebURLRequest.h" -namespace WebKit { +namespace blink { class WebData; class WebURLLoaderClient; @@ -71,6 +71,6 @@ public: virtual void didChangePriority(WebURLRequest::Priority newPriority) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLLoaderClient.h b/third_party/WebKit/public/platform/WebURLLoaderClient.h index 072c463..6e28fb7 100644 --- a/third_party/WebKit/public/platform/WebURLLoaderClient.h +++ b/third_party/WebKit/public/platform/WebURLLoaderClient.h @@ -31,7 +31,7 @@ #ifndef WebURLLoaderClient_h #define WebURLLoaderClient_h -namespace WebKit { +namespace blink { class WebURLLoader; class WebURLRequest; @@ -73,6 +73,6 @@ protected: virtual ~WebURLLoaderClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLRequest.h b/third_party/WebKit/public/platform/WebURLRequest.h index d4fe9d4..71ee4cd 100644 --- a/third_party/WebKit/public/platform/WebURLRequest.h +++ b/third_party/WebKit/public/platform/WebURLRequest.h @@ -38,7 +38,7 @@ namespace WebCore { class ResourceRequest; } #endif -namespace WebKit { +namespace blink { class WebCString; class WebHTTPBody; @@ -204,6 +204,6 @@ private: WebURLRequestPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebURLResponse.h b/third_party/WebKit/public/platform/WebURLResponse.h index c293788..7649871 100644 --- a/third_party/WebKit/public/platform/WebURLResponse.h +++ b/third_party/WebKit/public/platform/WebURLResponse.h @@ -38,7 +38,7 @@ namespace WebCore { class ResourceResponse; } #endif -namespace WebKit { +namespace blink { class WebCString; class WebHTTPHeaderVisitor; @@ -200,6 +200,6 @@ private: WebURLResponsePrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebUnitTestSupport.h b/third_party/WebKit/public/platform/WebUnitTestSupport.h index a97a013..185b4e3 100644 --- a/third_party/WebKit/public/platform/WebUnitTestSupport.h +++ b/third_party/WebKit/public/platform/WebUnitTestSupport.h @@ -30,7 +30,7 @@ #include "WebData.h" #include "WebString.h" -namespace WebKit { +namespace blink { class WebLayerTreeView; class WebURL; diff --git a/third_party/WebKit/public/platform/WebVector.h b/third_party/WebKit/public/platform/WebVector.h index e77aa0e..a12ca6d 100644 --- a/third_party/WebKit/public/platform/WebVector.h +++ b/third_party/WebKit/public/platform/WebVector.h @@ -35,7 +35,7 @@ #include <algorithm> -namespace WebKit { +namespace blink { // A simple vector class. // @@ -187,6 +187,6 @@ private: size_t m_size; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/WebVibration.h b/third_party/WebKit/public/platform/WebVibration.h index 5c61bcd..842d63c 100644 --- a/third_party/WebKit/public/platform/WebVibration.h +++ b/third_party/WebKit/public/platform/WebVibration.h @@ -31,11 +31,11 @@ #ifndef WebVibration_h #define WebVibration_h -namespace WebKit { +namespace blink { // Maximum duration of a vibration is 10 seconds. const unsigned kVibrationDurationMax = 10000; -} // namespace WebKit +} // namespace blink #endif // WebVibration_h diff --git a/third_party/WebKit/public/platform/WebWorkerRunLoop.h b/third_party/WebKit/public/platform/WebWorkerRunLoop.h index 417dc30..d790a23 100644 --- a/third_party/WebKit/public/platform/WebWorkerRunLoop.h +++ b/third_party/WebKit/public/platform/WebWorkerRunLoop.h @@ -31,7 +31,7 @@ namespace WebCore { class WorkerRunLoop; } -namespace WebKit { +namespace blink { class WebWorkerRunLoop { public: diff --git a/third_party/WebKit/public/platform/android/WebSandboxSupport.h b/third_party/WebKit/public/platform/android/WebSandboxSupport.h index 3f39f19..0d20922 100644 --- a/third_party/WebKit/public/platform/android/WebSandboxSupport.h +++ b/third_party/WebKit/public/platform/android/WebSandboxSupport.h @@ -31,13 +31,13 @@ #ifndef WebSandboxSupport_h #define WebSandboxSupport_h -namespace WebKit { +namespace blink { // Empty class, as we need it to compile. class WebSandboxSupport { public: }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/android/WebThemeEngine.h b/third_party/WebKit/public/platform/android/WebThemeEngine.h index 35dd82e..ab9968c 100644 --- a/third_party/WebKit/public/platform/android/WebThemeEngine.h +++ b/third_party/WebKit/public/platform/android/WebThemeEngine.h @@ -35,7 +35,7 @@ #include "../WebColor.h" #include "../WebSize.h" -namespace WebKit { +namespace blink { struct WebRect; @@ -147,6 +147,6 @@ public: virtual void paint(WebCanvas*, Part, State, const WebRect&, const ExtraParams*) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/default/WebThemeEngine.h b/third_party/WebKit/public/platform/default/WebThemeEngine.h index f84f292..4488365 100644 --- a/third_party/WebKit/public/platform/default/WebThemeEngine.h +++ b/third_party/WebKit/public/platform/default/WebThemeEngine.h @@ -35,7 +35,7 @@ #include "../WebColor.h" #include "../WebSize.h" -namespace WebKit { +namespace blink { struct WebRect; @@ -147,6 +147,6 @@ public: virtual void paint(WebCanvas*, Part, State, const WebRect&, const ExtraParams*) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/linux/WebFontFamily.h b/third_party/WebKit/public/platform/linux/WebFontFamily.h index 47f0378..bec7eb4 100644 --- a/third_party/WebKit/public/platform/linux/WebFontFamily.h +++ b/third_party/WebKit/public/platform/linux/WebFontFamily.h @@ -34,7 +34,7 @@ #include "../WebCString.h" #include "../WebCommon.h" -namespace WebKit { +namespace blink { struct WebFontFamily { WebCString name; @@ -42,6 +42,6 @@ struct WebFontFamily { bool isItalic; }; -} // namespace WebKit +} // namespace blink #endif // WebFontFamily_h diff --git a/third_party/WebKit/public/platform/linux/WebFontInfo.h b/third_party/WebKit/public/platform/linux/WebFontInfo.h index afd6fc4..e2db6e3 100644 --- a/third_party/WebKit/public/platform/linux/WebFontInfo.h +++ b/third_party/WebKit/public/platform/linux/WebFontInfo.h @@ -38,7 +38,7 @@ #include <string.h> #include <unistd.h> -namespace WebKit { +namespace blink { class WebFontInfo { public: @@ -71,6 +71,6 @@ public: BLINK_EXPORT static void renderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle* result); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h b/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h index 65669b2..898af2a 100644 --- a/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h +++ b/third_party/WebKit/public/platform/linux/WebFontRenderStyle.h @@ -35,7 +35,7 @@ namespace WebCore { struct FontRenderStyle; } -namespace WebKit { +namespace blink { struct BLINK_EXPORT WebFontRenderStyle { // Each of the use* members below can take one of three values: @@ -58,6 +58,6 @@ struct BLINK_EXPORT WebFontRenderStyle { void setDefaults(); }; -} // namespace WebKit +} // namespace blink #endif // WebFontRenderStyle_h diff --git a/third_party/WebKit/public/platform/linux/WebSandboxSupport.h b/third_party/WebKit/public/platform/linux/WebSandboxSupport.h index 80b2334..d0ae30c 100644 --- a/third_party/WebKit/public/platform/linux/WebSandboxSupport.h +++ b/third_party/WebKit/public/platform/linux/WebSandboxSupport.h @@ -35,7 +35,7 @@ #include "../WebString.h" #include "WebFontFamily.h" -namespace WebKit { +namespace blink { struct WebFontRenderStyle; @@ -57,6 +57,6 @@ public: virtual void getRenderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle*) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/mac/WebSandboxSupport.h b/third_party/WebKit/public/platform/mac/WebSandboxSupport.h index 34280c6..242f31d 100644 --- a/third_party/WebKit/public/platform/mac/WebSandboxSupport.h +++ b/third_party/WebKit/public/platform/mac/WebSandboxSupport.h @@ -39,7 +39,7 @@ typedef struct CGFont* CGFontRef; class NSFont; #endif -namespace WebKit { +namespace blink { // Put methods here that are required due to sandbox restrictions. class WebSandboxSupport { @@ -56,6 +56,6 @@ public: virtual bool loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/mac/WebThemeEngine.h b/third_party/WebKit/public/platform/mac/WebThemeEngine.h index c785702..1753c2e 100644 --- a/third_party/WebKit/public/platform/mac/WebThemeEngine.h +++ b/third_party/WebKit/public/platform/mac/WebThemeEngine.h @@ -33,7 +33,7 @@ #include "../WebCanvas.h" -namespace WebKit { +namespace blink { struct WebRect; @@ -73,6 +73,6 @@ public: virtual void paintScrollbarThumb(WebCanvas*, State, Size, const WebRect&, const ScrollbarInfo&) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/win/WebSandboxSupport.h b/third_party/WebKit/public/platform/win/WebSandboxSupport.h index 3522c72..88afb5c 100644 --- a/third_party/WebKit/public/platform/win/WebSandboxSupport.h +++ b/third_party/WebKit/public/platform/win/WebSandboxSupport.h @@ -33,7 +33,7 @@ typedef struct HFONT__* HFONT; -namespace WebKit { +namespace blink { // Put methods here that are required due to sandbox restrictions. class WebSandboxSupport { @@ -47,6 +47,6 @@ public: virtual bool ensureFontLoaded(HFONT) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/platform/win/WebThemeEngine.h b/third_party/WebKit/public/platform/win/WebThemeEngine.h index 29ac410..4ac7495 100644 --- a/third_party/WebKit/public/platform/win/WebThemeEngine.h +++ b/third_party/WebKit/public/platform/win/WebThemeEngine.h @@ -35,7 +35,7 @@ #include "../WebColor.h" #include "../WebSize.h" -namespace WebKit { +namespace blink { struct WebRect; struct WebSize; @@ -87,6 +87,6 @@ public: virtual WebSize getSize(int part) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/testing/WebFrameTestProxy.h b/third_party/WebKit/public/testing/WebFrameTestProxy.h index 6ad53db..426bbe2 100644 --- a/third_party/WebKit/public/testing/WebFrameTestProxy.h +++ b/third_party/WebKit/public/testing/WebFrameTestProxy.h @@ -39,7 +39,7 @@ namespace WebTestRunner { // Templetized wrapper around RenderFrameImpl objects, which implement // the WebFrameClient interface. template<class Base, typename P, typename R> -class WebFrameTestProxy : public Base, public WebKit::WebNonCopyable { +class WebFrameTestProxy : public Base, public blink::WebNonCopyable { public: WebFrameTestProxy(P p, R r) : Base(p, r) @@ -58,108 +58,108 @@ public: m_version = version; } - WebKit::WebPlugin* createPlugin(WebKit::WebFrame* frame, const WebKit::WebPluginParams& params) + blink::WebPlugin* createPlugin(blink::WebFrame* frame, const blink::WebPluginParams& params) { - WebKit::WebPlugin* plugin = m_baseProxy->createPlugin(frame, params); + blink::WebPlugin* plugin = m_baseProxy->createPlugin(frame, params); if (plugin) return plugin; return Base::createPlugin(frame, params); } // WebFrameClient implementation. - virtual void didStartProvisionalLoad(WebKit::WebFrame* frame) + virtual void didStartProvisionalLoad(blink::WebFrame* frame) { if (m_version > 2) m_baseProxy->didStartProvisionalLoad(frame); Base::didStartProvisionalLoad(frame); } - virtual void didReceiveServerRedirectForProvisionalLoad(WebKit::WebFrame* frame) + virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* frame) { Base::didReceiveServerRedirectForProvisionalLoad(frame); } - virtual void didFailProvisionalLoad(WebKit::WebFrame* frame, const WebKit::WebURLError& error) + virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::WebURLError& error) { Base::didFailProvisionalLoad(frame, error); } - virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame, bool isNewNavigation) + virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavigation) { Base::didCommitProvisionalLoad(frame, isNewNavigation); } - virtual void didReceiveTitle(WebKit::WebFrame* frame, const WebKit::WebString& title, WebKit::WebTextDirection direction) + virtual void didReceiveTitle(blink::WebFrame* frame, const blink::WebString& title, blink::WebTextDirection direction) { Base::didReceiveTitle(frame, title, direction); } - virtual void didChangeIcon(WebKit::WebFrame* frame, WebKit::WebIconURL::Type iconType) + virtual void didChangeIcon(blink::WebFrame* frame, blink::WebIconURL::Type iconType) { Base::didChangeIcon(frame, iconType); } - virtual void didFinishDocumentLoad(WebKit::WebFrame* frame) + virtual void didFinishDocumentLoad(blink::WebFrame* frame) { Base::didFinishDocumentLoad(frame); } - virtual void didHandleOnloadEvents(WebKit::WebFrame* frame) + virtual void didHandleOnloadEvents(blink::WebFrame* frame) { Base::didHandleOnloadEvents(frame); } - virtual void didFailLoad(WebKit::WebFrame* frame, const WebKit::WebURLError& error) + virtual void didFailLoad(blink::WebFrame* frame, const blink::WebURLError& error) { Base::didFailLoad(frame, error); } - virtual void didFinishLoad(WebKit::WebFrame* frame) + virtual void didFinishLoad(blink::WebFrame* frame) { Base::didFinishLoad(frame); } - virtual void didDetectXSS(WebKit::WebFrame* frame, const WebKit::WebURL& insecureURL, bool didBlockEntirePage) + virtual void didDetectXSS(blink::WebFrame* frame, const blink::WebURL& insecureURL, bool didBlockEntirePage) { // This is not implemented in RenderFrameImpl, so need to explicitly call // into the base proxy. m_baseProxy->didDetectXSS(frame, insecureURL, didBlockEntirePage); Base::didDetectXSS(frame, insecureURL, didBlockEntirePage); } - virtual void didDispatchPingLoader(WebKit::WebFrame* frame, const WebKit::WebURL& url) + virtual void didDispatchPingLoader(blink::WebFrame* frame, const blink::WebURL& url) { // This is not implemented in RenderFrameImpl, so need to explicitly call // into the base proxy. m_baseProxy->didDispatchPingLoader(frame, url); Base::didDispatchPingLoader(frame, url); } - virtual void willRequestResource(WebKit::WebFrame* frame, const WebKit::WebCachedURLRequest& request) + virtual void willRequestResource(blink::WebFrame* frame, const blink::WebCachedURLRequest& request) { // This is not implemented in RenderFrameImpl, so need to explicitly call // into the base proxy. m_baseProxy->willRequestResource(frame, request); Base::willRequestResource(frame, request); } - virtual void didCreateDataSource(WebKit::WebFrame* frame, WebKit::WebDataSource* ds) + virtual void didCreateDataSource(blink::WebFrame* frame, blink::WebDataSource* ds) { Base::didCreateDataSource(frame, ds); } - virtual void willSendRequest(WebKit::WebFrame* frame, unsigned identifier, WebKit::WebURLRequest& request, const WebKit::WebURLResponse& redirectResponse) + virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, blink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) { m_baseProxy->willSendRequest(frame, identifier, request, redirectResponse); Base::willSendRequest(frame, identifier, request, redirectResponse); } - virtual void didReceiveResponse(WebKit::WebFrame* frame, unsigned identifier, const WebKit::WebURLResponse& response) + virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response) { m_baseProxy->didReceiveResponse(frame, identifier, response); Base::didReceiveResponse(frame, identifier, response); } - virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned identifier, const WebKit::WebURLRequest::Priority& priority) + virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned identifier, const blink::WebURLRequest::Priority& priority) { // This is not implemented in RenderFrameImpl, so need to explicitly call // into the base proxy. m_baseProxy->didChangeResourcePriority(frame, identifier, priority); Base::didChangeResourcePriority(frame, identifier, priority); } - virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identifier) + virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier) { Base::didFinishResourceLoad(frame, identifier); } - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame* frame, WebKit::WebDataSource::ExtraData* extraData, const WebKit::WebURLRequest& request, WebKit::WebNavigationType type, WebKit::WebNavigationPolicy defaultPolicy, bool isRedirect) + virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolicy, bool isRedirect) { return Base::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect); } - virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent event) + virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event) { if (m_baseProxy->willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event)) return true; diff --git a/third_party/WebKit/public/testing/WebPreferences.h b/third_party/WebKit/public/testing/WebPreferences.h index 2dbed40..e49088a 100644 --- a/third_party/WebKit/public/testing/WebPreferences.h +++ b/third_party/WebKit/public/testing/WebPreferences.h @@ -36,7 +36,7 @@ #include "public/platform/WebURL.h" #include "public/web/WebSettings.h" -namespace WebKit { +namespace blink { class WebView; } @@ -51,7 +51,7 @@ struct WEBTESTRUNNER_EXPORT WebPreferences { bool allowFileAccessFromFileURLs; bool allowRunningOfInsecureContent; bool authorAndUserStylesEnabled; - WebKit::WebString defaultTextEncodingName; + blink::WebString defaultTextEncodingName; bool experimentalWebGLEnabled; bool experimentalCSSRegionsEnabled; bool experimentalCSSGridLayoutEnabled; @@ -63,9 +63,9 @@ struct WEBTESTRUNNER_EXPORT WebPreferences { bool loadsImagesAutomatically; bool offlineWebApplicationCacheEnabled; bool pluginsEnabled; - WebKit::WebURL userStyleSheetLocation; + blink::WebURL userStyleSheetLocation; bool allowUniversalAccessFromFileURLs; - WebKit::WebSettings::EditingBehavior editingBehavior; + blink::WebSettings::EditingBehavior editingBehavior; bool tabsToLinks; bool hyperlinkAuditingEnabled; bool caretBrowsingEnabled; diff --git a/third_party/WebKit/public/testing/WebTestDelegate.h b/third_party/WebKit/public/testing/WebTestDelegate.h index 0828231..4ee6eb5 100644 --- a/third_party/WebKit/public/testing/WebTestDelegate.h +++ b/third_party/WebKit/public/testing/WebTestDelegate.h @@ -38,7 +38,7 @@ #define WEBTESTRUNNER_NEW_HISTORY_CAPTURE -namespace WebKit { +namespace blink { class WebDeviceMotionData; class WebDeviceOrientationData; class WebFrame; @@ -63,12 +63,12 @@ public: virtual void setEditCommand(const std::string& name, const std::string& value) = 0; // Set the gamepads to return from Platform::sampleGamepads(). - virtual void setGamepadData(const WebKit::WebGamepads&) = 0; + virtual void setGamepadData(const blink::WebGamepads&) = 0; // Set data to return when registering via Platform::setDeviceMotionListener(). - virtual void setDeviceMotionData(const WebKit::WebDeviceMotionData&) = 0; + virtual void setDeviceMotionData(const blink::WebDeviceMotionData&) = 0; // Set data to return when registering via Platform::setDeviceOrientationListener(). - virtual void setDeviceOrientationData(const WebKit::WebDeviceOrientationData&) = 0; + virtual void setDeviceOrientationData(const blink::WebDeviceOrientationData&) = 0; // Add a message to the text dump for the layout test. virtual void printMessage(const std::string& message) = 0; @@ -80,20 +80,20 @@ public: // Register a new isolated filesystem with the given files, and return the // new filesystem id. - virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector<WebKit::WebString>& absoluteFilenames) = 0; + virtual blink::WebString registerIsolatedFileSystem(const blink::WebVector<blink::WebString>& absoluteFilenames) = 0; // Gets the current time in milliseconds since the UNIX epoch. virtual long long getCurrentTimeInMillisecond() = 0; // Convert the provided relative path into an absolute path. - virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string& path) = 0; + virtual blink::WebString getAbsoluteWebStringFromUTF8Path(const std::string& path) = 0; // Reads in the given file and returns its contents as data URL. - virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL&) = 0; + virtual blink::WebURL localFileToDataURL(const blink::WebURL&) = 0; // Replaces file:///tmp/LayoutTests/ with the actual path to the // LayoutTests directory. - virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string& utf8URL) = 0; + virtual blink::WebURL rewriteLayoutTestsURL(const std::string& utf8URL) = 0; // Manages the settings to used for layout tests. virtual WebPreferences* preferences() = 0; @@ -107,8 +107,8 @@ public: virtual void useUnfortunateSynchronousResizeMode(bool) = 0; // Controls auto resize mode. - virtual void enableAutoResizeMode(const WebKit::WebSize& minSize, const WebKit::WebSize& maxSize) = 0; - virtual void disableAutoResizeMode(const WebKit::WebSize&) = 0; + virtual void enableAutoResizeMode(const blink::WebSize& minSize, const blink::WebSize& maxSize) = 0; + virtual void disableAutoResizeMode(const blink::WebSize&) = 0; // Opens and closes the inspector. virtual void showDevTools() = 0; @@ -152,14 +152,14 @@ public: // The following trigger navigations on the main WebViwe. virtual void goToOffset(int offset) = 0; virtual void reload() = 0; - virtual void loadURLForFrame(const WebKit::WebURL&, const std::string& frameName) = 0; + virtual void loadURLForFrame(const blink::WebURL&, const std::string& frameName) = 0; // Returns true if resource requests to external URLs should be permitted. virtual bool allowExternalPages() = 0; // Returns the back/forward history for the WebView associated with the // given WebTestProxyBase as well as the index of the current entry. - virtual void captureHistoryForWindow(WebTestProxyBase*, WebKit::WebVector<WebKit::WebHistoryItem>*, size_t* currentEntryIndex) = 0; + virtual void captureHistoryForWindow(WebTestProxyBase*, blink::WebVector<blink::WebHistoryItem>*, size_t* currentEntryIndex) = 0; }; } diff --git a/third_party/WebKit/public/testing/WebTestInterfaces.h b/third_party/WebKit/public/testing/WebTestInterfaces.h index 8949a75..16869bd 100644 --- a/third_party/WebKit/public/testing/WebTestInterfaces.h +++ b/third_party/WebKit/public/testing/WebTestInterfaces.h @@ -34,7 +34,7 @@ #include "WebTestCommon.h" #include <memory> -namespace WebKit { +namespace blink { class WebAudioDevice; class WebFrame; class WebMediaStreamCenter; @@ -60,22 +60,22 @@ public: WebTestInterfaces(); ~WebTestInterfaces(); - void setWebView(WebKit::WebView*, WebTestProxyBase*); + void setWebView(blink::WebView*, WebTestProxyBase*); void setDelegate(WebTestDelegate*); - void bindTo(WebKit::WebFrame*); + void bindTo(blink::WebFrame*); void resetAll(); void setTestIsRunning(bool); - void configureForTestWithURL(const WebKit::WebURL&, bool generatePixels); + void configureForTestWithURL(const blink::WebURL&, bool generatePixels); WebTestRunner* testRunner(); - WebKit::WebThemeEngine* themeEngine(); + blink::WebThemeEngine* themeEngine(); - WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*); - WebKit::WebRTCPeerConnectionHandler* createWebRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*); + blink::WebMediaStreamCenter* createMediaStreamCenter(blink::WebMediaStreamCenterClient*); + blink::WebRTCPeerConnectionHandler* createWebRTCPeerConnectionHandler(blink::WebRTCPeerConnectionHandlerClient*); - WebKit::WebMIDIAccessor* createMIDIAccessor(WebKit::WebMIDIAccessorClient*); + blink::WebMIDIAccessor* createMIDIAccessor(blink::WebMIDIAccessorClient*); - WebKit::WebAudioDevice* createAudioDevice(double sampleRate); + blink::WebAudioDevice* createAudioDevice(double sampleRate); #if WEBTESTRUNNER_IMPLEMENTATION TestInterfaces* testInterfaces(); diff --git a/third_party/WebKit/public/testing/WebTestProxy.h b/third_party/WebKit/public/testing/WebTestProxy.h index 6004279..b77f246 100644 --- a/third_party/WebKit/public/testing/WebTestProxy.h +++ b/third_party/WebKit/public/testing/WebTestProxy.h @@ -51,7 +51,7 @@ #include <memory> #include <string> -namespace WebKit { +namespace blink { class WebAXObject; class WebAudioDevice; class WebCachedURLRequest; @@ -112,14 +112,14 @@ class WEBTESTRUNNER_EXPORT WebTestProxyBase { public: void setInterfaces(WebTestInterfaces*); void setDelegate(WebTestDelegate*); - void setWidget(WebKit::WebWidget*); + void setWidget(blink::WebWidget*); void reset(); - WebKit::WebSpellCheckClient *spellCheckClient() const; - WebKit::WebValidationMessageClient* validationMessageClient(); - WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*, const WebKit::WebColor&); - bool runFileChooser(const WebKit::WebFileChooserParams&, WebKit::WebFileChooserCompletion*); + blink::WebSpellCheckClient *spellCheckClient() const; + blink::WebValidationMessageClient* validationMessageClient(); + blink::WebColorChooser* createColorChooser(blink::WebColorChooserClient*, const blink::WebColor&); + bool runFileChooser(const blink::WebFileChooserParams&, blink::WebFileChooserCompletion*); std::string captureTree(bool debugRenderTree); SkCanvas* capturePixels(); @@ -138,15 +138,15 @@ public: void displayInvalidatedRegion(); void discardBackingStore(); - WebKit::WebGeolocationClientMock* geolocationClientMock(); - WebKit::WebMIDIClientMock* midiClientMock(); + blink::WebGeolocationClientMock* geolocationClientMock(); + blink::WebMIDIClientMock* midiClientMock(); MockWebSpeechInputController* speechInputControllerMock(); MockWebSpeechRecognizer* speechRecognizerMock(); #endif WebTaskList* taskList() { return &m_taskList; } - WebKit::WebView* webView(); + blink::WebView* webView(); void didForceResize(); @@ -154,69 +154,69 @@ protected: WebTestProxyBase(); ~WebTestProxyBase(); - void didInvalidateRect(const WebKit::WebRect&); - void didScrollRect(int, int, const WebKit::WebRect&); + void didInvalidateRect(const blink::WebRect&); + void didScrollRect(int, int, const blink::WebRect&); void scheduleAnimation(); // FIXME: Remove once we switch to use didForceResize. - void setWindowRect(const WebKit::WebRect&); - void show(WebKit::WebNavigationPolicy); - void didAutoResize(const WebKit::WebSize&); - void postAccessibilityEvent(const WebKit::WebAXObject&, WebKit::WebAXEvent); - void startDragging(WebKit::WebFrame*, const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&); + void setWindowRect(const blink::WebRect&); + void show(blink::WebNavigationPolicy); + void didAutoResize(const blink::WebSize&); + void postAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent); + void startDragging(blink::WebFrame*, const blink::WebDragData&, blink::WebDragOperationsMask, const blink::WebImage&, const blink::WebPoint&); void didChangeSelection(bool isEmptySelection); void didChangeContents(); void didEndEditing(); - bool createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest&, const WebKit::WebWindowFeatures&, const WebKit::WebString& frameName, WebKit::WebNavigationPolicy, bool suppressOpener); - WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&); - void setStatusText(const WebKit::WebString&); + bool createView(blink::WebFrame* creator, const blink::WebURLRequest&, const blink::WebWindowFeatures&, const blink::WebString& frameName, blink::WebNavigationPolicy, bool suppressOpener); + blink::WebPlugin* createPlugin(blink::WebFrame*, const blink::WebPluginParams&); + void setStatusText(const blink::WebString&); void didStopLoading(); - void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&); - WebKit::WebUserMediaClient* userMediaClient(); - void printPage(WebKit::WebFrame*); - WebKit::WebNotificationPresenter* notificationPresenter(); - WebKit::WebGeolocationClient* geolocationClient(); - WebKit::WebMIDIClient* webMIDIClient(); - WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*); - WebKit::WebSpeechRecognizer* speechRecognizer(); + void showContextMenu(blink::WebFrame*, const blink::WebContextMenuData&); + blink::WebUserMediaClient* userMediaClient(); + void printPage(blink::WebFrame*); + blink::WebNotificationPresenter* notificationPresenter(); + blink::WebGeolocationClient* geolocationClient(); + blink::WebMIDIClient* webMIDIClient(); + blink::WebSpeechInputController* speechInputController(blink::WebSpeechInputListener*); + blink::WebSpeechRecognizer* speechRecognizer(); bool requestPointerLock(); void requestPointerUnlock(); bool isPointerLocked(); void didFocus(); void didBlur(); - void setToolTipText(const WebKit::WebString&, WebKit::WebTextDirection); - void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit::WebString& sourceName, unsigned sourceLine); - void runModalAlertDialog(WebKit::WebFrame*, const WebKit::WebString&); - bool runModalConfirmDialog(WebKit::WebFrame*, const WebKit::WebString&); - bool runModalPromptDialog(WebKit::WebFrame*, const WebKit::WebString& message, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue); - bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&); - - void didStartProvisionalLoad(WebKit::WebFrame*); - void didReceiveServerRedirectForProvisionalLoad(WebKit::WebFrame*); - bool didFailProvisionalLoad(WebKit::WebFrame*, const WebKit::WebURLError&); - void didCommitProvisionalLoad(WebKit::WebFrame*, bool isNewNavigation); - void didReceiveTitle(WebKit::WebFrame*, const WebKit::WebString& title, WebKit::WebTextDirection); - void didChangeIcon(WebKit::WebFrame*, WebKit::WebIconURL::Type); - void didFinishDocumentLoad(WebKit::WebFrame*); - void didHandleOnloadEvents(WebKit::WebFrame*); - void didFailLoad(WebKit::WebFrame*, const WebKit::WebURLError&); - void didFinishLoad(WebKit::WebFrame*); - void didChangeLocationWithinPage(WebKit::WebFrame*); - void didDetectXSS(WebKit::WebFrame*, const WebKit::WebURL& insecureURL, bool didBlockEntirePage); - void didDispatchPingLoader(WebKit::WebFrame*, const WebKit::WebURL&); - void willRequestResource(WebKit::WebFrame*, const WebKit::WebCachedURLRequest&); - void didCreateDataSource(WebKit::WebFrame*, WebKit::WebDataSource*); - void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit::WebURLRequest&, const WebKit::WebURLResponse& redirectResponse); - void didReceiveResponse(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLResponse&); - void didChangeResourcePriority(WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLRequest::Priority&); - void didFinishResourceLoad(WebKit::WebFrame*, unsigned identifier); - WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame*, WebKit::WebDataSource::ExtraData*, const WebKit::WebURLRequest&, WebKit::WebNavigationType, WebKit::WebNavigationPolicy defaultPolicy, bool isRedirect); - bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent); + void setToolTipText(const blink::WebString&, blink::WebTextDirection); + void didAddMessageToConsole(const blink::WebConsoleMessage&, const blink::WebString& sourceName, unsigned sourceLine); + void runModalAlertDialog(blink::WebFrame*, const blink::WebString&); + bool runModalConfirmDialog(blink::WebFrame*, const blink::WebString&); + bool runModalPromptDialog(blink::WebFrame*, const blink::WebString& message, const blink::WebString& defaultValue, blink::WebString* actualValue); + bool runModalBeforeUnloadDialog(blink::WebFrame*, const blink::WebString&); + + void didStartProvisionalLoad(blink::WebFrame*); + void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame*); + bool didFailProvisionalLoad(blink::WebFrame*, const blink::WebURLError&); + void didCommitProvisionalLoad(blink::WebFrame*, bool isNewNavigation); + void didReceiveTitle(blink::WebFrame*, const blink::WebString& title, blink::WebTextDirection); + void didChangeIcon(blink::WebFrame*, blink::WebIconURL::Type); + void didFinishDocumentLoad(blink::WebFrame*); + void didHandleOnloadEvents(blink::WebFrame*); + void didFailLoad(blink::WebFrame*, const blink::WebURLError&); + void didFinishLoad(blink::WebFrame*); + void didChangeLocationWithinPage(blink::WebFrame*); + void didDetectXSS(blink::WebFrame*, const blink::WebURL& insecureURL, bool didBlockEntirePage); + void didDispatchPingLoader(blink::WebFrame*, const blink::WebURL&); + void willRequestResource(blink::WebFrame*, const blink::WebCachedURLRequest&); + void didCreateDataSource(blink::WebFrame*, blink::WebDataSource*); + void willSendRequest(blink::WebFrame*, unsigned identifier, blink::WebURLRequest&, const blink::WebURLResponse& redirectResponse); + void didReceiveResponse(blink::WebFrame*, unsigned identifier, const blink::WebURLResponse&); + void didChangeResourcePriority(blink::WebFrame*, unsigned identifier, const blink::WebURLRequest::Priority&); + void didFinishResourceLoad(blink::WebFrame*, unsigned identifier); + blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame*, blink::WebDataSource::ExtraData*, const blink::WebURLRequest&, blink::WebNavigationType, blink::WebNavigationPolicy defaultPolicy, bool isRedirect); + bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent); void resetInputMethod(); private: template<class, typename, typename> friend class WebFrameTestProxy; - void locationChangeDone(WebKit::WebFrame*); - void paintRect(const WebKit::WebRect&); + void locationChangeDone(blink::WebFrame*); + void paintRect(const blink::WebRect&); void paintInvalidatedRegion(); void paintPagesWithBoundaries(); SkCanvas* canvas(); @@ -224,11 +224,11 @@ private: void invalidateAll(); void animateNow(); - WebKit::WebWidget* webWidget(); + blink::WebWidget* webWidget(); TestInterfaces* m_testInterfaces; WebTestDelegate* m_delegate; - WebKit::WebWidget* m_webWidget; + blink::WebWidget* m_webWidget; WebTaskList m_taskList; @@ -237,17 +237,17 @@ private: // Painting. std::auto_ptr<SkCanvas> m_canvas; - WebKit::WebRect m_paintRect; + blink::WebRect m_paintRect; bool m_isPainting; bool m_animateScheduled; std::map<unsigned, std::string> m_resourceIdentifierMap; - std::map<unsigned, WebKit::WebURLRequest> m_requestMap; + std::map<unsigned, blink::WebURLRequest> m_requestMap; bool m_logConsoleOutput; int m_chooserCount; - std::auto_ptr<WebKit::WebGeolocationClientMock> m_geolocationClient; - std::auto_ptr<WebKit::WebMIDIClientMock> m_midiClient; + std::auto_ptr<blink::WebGeolocationClientMock> m_geolocationClient; + std::auto_ptr<blink::WebMIDIClientMock> m_midiClient; std::auto_ptr<MockWebSpeechRecognizer> m_speechRecognizer; std::auto_ptr<MockWebSpeechInputController> m_speechInputController; std::auto_ptr<MockWebValidationMessageClient> m_validationMessageClient; @@ -268,7 +268,7 @@ private: // Use this template to inject methods into your WebViewClient/WebFrameClient // implementation required for the running layout tests. template<class Base, typename T> -class WebTestProxy : public Base, public WebTestProxyBase, public WebKit::WebNonCopyable { +class WebTestProxy : public Base, public WebTestProxyBase, public blink::WebNonCopyable { public: explicit WebTestProxy(T t) : Base(t) @@ -278,11 +278,11 @@ public: virtual ~WebTestProxy() { } // WebViewClient implementation. - virtual void didInvalidateRect(const WebKit::WebRect& rect) + virtual void didInvalidateRect(const blink::WebRect& rect) { WebTestProxyBase::didInvalidateRect(rect); } - virtual void didScrollRect(int dx, int dy, const WebKit::WebRect& clipRect) + virtual void didScrollRect(int dx, int dy, const blink::WebRect& clipRect) { WebTestProxyBase::didScrollRect(dx, dy, clipRect); } @@ -294,27 +294,27 @@ public: { WebTestProxyBase::scheduleAnimation(); } - virtual void setWindowRect(const WebKit::WebRect& rect) + virtual void setWindowRect(const blink::WebRect& rect) { WebTestProxyBase::setWindowRect(rect); Base::setWindowRect(rect); } - virtual void show(WebKit::WebNavigationPolicy policy) + virtual void show(blink::WebNavigationPolicy policy) { WebTestProxyBase::show(policy); Base::show(policy); } - virtual void didAutoResize(const WebKit::WebSize& newSize) + virtual void didAutoResize(const blink::WebSize& newSize) { WebTestProxyBase::didAutoResize(newSize); Base::didAutoResize(newSize); } - virtual void postAccessibilityEvent(const WebKit::WebAXObject& object, WebKit::WebAXEvent event) + virtual void postAccessibilityEvent(const blink::WebAXObject& object, blink::WebAXEvent event) { WebTestProxyBase::postAccessibilityEvent(object, event); Base::postAccessibilityEvent(object, event); } - virtual void startDragging(WebKit::WebFrame* frame, const WebKit::WebDragData& data, WebKit::WebDragOperationsMask mask, const WebKit::WebImage& image, const WebKit::WebPoint& point) + virtual void startDragging(blink::WebFrame* frame, const blink::WebDragData& data, blink::WebDragOperationsMask mask, const blink::WebImage& image, const blink::WebPoint& point) { WebTestProxyBase::startDragging(frame, data, mask, image, point); // Don't forward this call to Base because we don't want to do a real drag-and-drop. @@ -329,13 +329,13 @@ public: WebTestProxyBase::didChangeContents(); Base::didChangeContents(); } - virtual WebKit::WebView* createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest& request, const WebKit::WebWindowFeatures& features, const WebKit::WebString& frameName, WebKit::WebNavigationPolicy policy, bool suppressOpener) + virtual blink::WebView* createView(blink::WebFrame* creator, const blink::WebURLRequest& request, const blink::WebWindowFeatures& features, const blink::WebString& frameName, blink::WebNavigationPolicy policy, bool suppressOpener) { if (!WebTestProxyBase::createView(creator, request, features, frameName, policy, suppressOpener)) return 0; return Base::createView(creator, request, features, frameName, policy, suppressOpener); } - virtual void setStatusText(const WebKit::WebString& text) + virtual void setStatusText(const blink::WebString& text) { WebTestProxyBase::setStatusText(text); Base::setStatusText(text); @@ -345,36 +345,36 @@ public: WebTestProxyBase::didStopLoading(); Base::didStopLoading(); } - virtual void showContextMenu(WebKit::WebFrame* frame, const WebKit::WebContextMenuData& contextMenuData) + virtual void showContextMenu(blink::WebFrame* frame, const blink::WebContextMenuData& contextMenuData) { WebTestProxyBase::showContextMenu(frame, contextMenuData); Base::showContextMenu(frame, contextMenuData); } - virtual WebKit::WebUserMediaClient* userMediaClient() + virtual blink::WebUserMediaClient* userMediaClient() { return WebTestProxyBase::userMediaClient(); } - virtual void printPage(WebKit::WebFrame* frame) + virtual void printPage(blink::WebFrame* frame) { WebTestProxyBase::printPage(frame); } - virtual WebKit::WebNotificationPresenter* notificationPresenter() + virtual blink::WebNotificationPresenter* notificationPresenter() { return WebTestProxyBase::notificationPresenter(); } - virtual WebKit::WebGeolocationClient* geolocationClient() + virtual blink::WebGeolocationClient* geolocationClient() { return WebTestProxyBase::geolocationClient(); } - virtual WebKit::WebMIDIClient* webMIDIClient() + virtual blink::WebMIDIClient* webMIDIClient() { return WebTestProxyBase::webMIDIClient(); } - virtual WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener* listener) + virtual blink::WebSpeechInputController* speechInputController(blink::WebSpeechInputListener* listener) { return WebTestProxyBase::speechInputController(listener); } - virtual WebKit::WebSpeechRecognizer* speechRecognizer() + virtual blink::WebSpeechRecognizer* speechRecognizer() { return WebTestProxyBase::speechRecognizer(); } @@ -400,7 +400,7 @@ public: WebTestProxyBase::didBlur(); Base::didBlur(); } - virtual void setToolTipText(const WebKit::WebString& text, WebKit::WebTextDirection hint) + virtual void setToolTipText(const blink::WebString& text, blink::WebTextDirection hint) { WebTestProxyBase::setToolTipText(text, hint); Base::setToolTipText(text, hint); @@ -410,17 +410,17 @@ public: WebTestProxyBase::resetInputMethod(); } - virtual void didStartProvisionalLoad(WebKit::WebFrame* frame) + virtual void didStartProvisionalLoad(blink::WebFrame* frame) { WebTestProxyBase::didStartProvisionalLoad(frame); Base::didStartProvisionalLoad(frame); } - virtual void didReceiveServerRedirectForProvisionalLoad(WebKit::WebFrame* frame) + virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* frame) { WebTestProxyBase::didReceiveServerRedirectForProvisionalLoad(frame); Base::didReceiveServerRedirectForProvisionalLoad(frame); } - virtual void didFailProvisionalLoad(WebKit::WebFrame* frame, const WebKit::WebURLError& error) + virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::WebURLError& error) { // If the test finished, don't notify the embedder of the failed load, // as we already destroyed the document loader. @@ -428,118 +428,118 @@ public: return; Base::didFailProvisionalLoad(frame, error); } - virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame, bool isNewNavigation) + virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavigation) { WebTestProxyBase::didCommitProvisionalLoad(frame, isNewNavigation); Base::didCommitProvisionalLoad(frame, isNewNavigation); } - virtual void didReceiveTitle(WebKit::WebFrame* frame, const WebKit::WebString& title, WebKit::WebTextDirection direction) + virtual void didReceiveTitle(blink::WebFrame* frame, const blink::WebString& title, blink::WebTextDirection direction) { WebTestProxyBase::didReceiveTitle(frame, title, direction); Base::didReceiveTitle(frame, title, direction); } - virtual void didChangeIcon(WebKit::WebFrame* frame, WebKit::WebIconURL::Type iconType) + virtual void didChangeIcon(blink::WebFrame* frame, blink::WebIconURL::Type iconType) { WebTestProxyBase::didChangeIcon(frame, iconType); Base::didChangeIcon(frame, iconType); } - virtual void didFinishDocumentLoad(WebKit::WebFrame* frame) + virtual void didFinishDocumentLoad(blink::WebFrame* frame) { WebTestProxyBase::didFinishDocumentLoad(frame); Base::didFinishDocumentLoad(frame); } - virtual void didHandleOnloadEvents(WebKit::WebFrame* frame) + virtual void didHandleOnloadEvents(blink::WebFrame* frame) { WebTestProxyBase::didHandleOnloadEvents(frame); Base::didHandleOnloadEvents(frame); } - virtual void didFailLoad(WebKit::WebFrame* frame, const WebKit::WebURLError& error) + virtual void didFailLoad(blink::WebFrame* frame, const blink::WebURLError& error) { WebTestProxyBase::didFailLoad(frame, error); Base::didFailLoad(frame, error); } - virtual void didFinishLoad(WebKit::WebFrame* frame) + virtual void didFinishLoad(blink::WebFrame* frame) { WebTestProxyBase::didFinishLoad(frame); Base::didFinishLoad(frame); } - virtual void didDetectXSS(WebKit::WebFrame* frame, const WebKit::WebURL& insecureURL, bool didBlockEntirePage) + virtual void didDetectXSS(blink::WebFrame* frame, const blink::WebURL& insecureURL, bool didBlockEntirePage) { WebTestProxyBase::didDetectXSS(frame, insecureURL, didBlockEntirePage); Base::didDetectXSS(frame, insecureURL, didBlockEntirePage); } - virtual void willRequestResource(WebKit::WebFrame* frame, const WebKit::WebCachedURLRequest& request) + virtual void willRequestResource(blink::WebFrame* frame, const blink::WebCachedURLRequest& request) { WebTestProxyBase::willRequestResource(frame, request); Base::willRequestResource(frame, request); } - virtual void didCreateDataSource(WebKit::WebFrame* frame, WebKit::WebDataSource* ds) + virtual void didCreateDataSource(blink::WebFrame* frame, blink::WebDataSource* ds) { WebTestProxyBase::didCreateDataSource(frame, ds); Base::didCreateDataSource(frame, ds); } - virtual void willSendRequest(WebKit::WebFrame* frame, unsigned identifier, WebKit::WebURLRequest& request, const WebKit::WebURLResponse& redirectResponse) + virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, blink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) { WebTestProxyBase::willSendRequest(frame, identifier, request, redirectResponse); Base::willSendRequest(frame, identifier, request, redirectResponse); } - virtual void didReceiveResponse(WebKit::WebFrame* frame, unsigned identifier, const WebKit::WebURLResponse& response) + virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response) { WebTestProxyBase::didReceiveResponse(frame, identifier, response); Base::didReceiveResponse(frame, identifier, response); } - virtual void didChangeResourcePriority(WebKit::WebFrame* frame, unsigned identifier, const WebKit::WebURLRequest::Priority& priority) + virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned identifier, const blink::WebURLRequest::Priority& priority) { WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority); Base::didChangeResourcePriority(frame, identifier, priority); } - virtual void didFinishResourceLoad(WebKit::WebFrame* frame, unsigned identifier) + virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier) { WebTestProxyBase::didFinishResourceLoad(frame, identifier); Base::didFinishResourceLoad(frame, identifier); } - virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage& message, const WebKit::WebString& sourceName, unsigned sourceLine, const WebKit::WebString& stackTrace) + virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, const blink::WebString& sourceName, unsigned sourceLine, const blink::WebString& stackTrace) { WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine); Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace); } - virtual void runModalAlertDialog(WebKit::WebFrame* frame, const WebKit::WebString& message) + virtual void runModalAlertDialog(blink::WebFrame* frame, const blink::WebString& message) { WebTestProxyBase::runModalAlertDialog(frame, message); Base::runModalAlertDialog(frame, message); } - virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, const WebKit::WebString& message) + virtual bool runModalConfirmDialog(blink::WebFrame* frame, const blink::WebString& message) { WebTestProxyBase::runModalConfirmDialog(frame, message); return Base::runModalConfirmDialog(frame, message); } - virtual bool runModalPromptDialog(WebKit::WebFrame* frame, const WebKit::WebString& message, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue) + virtual bool runModalPromptDialog(blink::WebFrame* frame, const blink::WebString& message, const blink::WebString& defaultValue, blink::WebString* actualValue) { WebTestProxyBase::runModalPromptDialog(frame, message, defaultValue, actualValue); return Base::runModalPromptDialog(frame, message, defaultValue, actualValue); } - virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame* frame, const WebKit::WebString& message) + virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame, const blink::WebString& message) { return WebTestProxyBase::runModalBeforeUnloadDialog(frame, message); } - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame* frame, WebKit::WebDataSource::ExtraData* extraData, const WebKit::WebURLRequest& request, WebKit::WebNavigationType type, WebKit::WebNavigationPolicy defaultPolicy, bool isRedirect) + virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolicy, bool isRedirect) { - WebKit::WebNavigationPolicy policy = WebTestProxyBase::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect); - if (policy == WebKit::WebNavigationPolicyIgnore) + blink::WebNavigationPolicy policy = WebTestProxyBase::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect); + if (policy == blink::WebNavigationPolicyIgnore) return policy; return Base::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect); } - virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent event) + virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event) { if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event)) return true; return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event); } - virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient* client, const WebKit::WebColor& color) + virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserClient* client, const blink::WebColor& color) { return WebTestProxyBase::createColorChooser(client, color); } - virtual bool runFileChooser(const WebKit::WebFileChooserParams& params, WebKit::WebFileChooserCompletion* completion) + virtual bool runFileChooser(const blink::WebFileChooserParams& params, blink::WebFileChooserCompletion* completion) { return WebTestProxyBase::runFileChooser(params, completion); } diff --git a/third_party/WebKit/public/testing/WebTestRunner.h b/third_party/WebKit/public/testing/WebTestRunner.h index 738cc3e..017c689 100644 --- a/third_party/WebKit/public/testing/WebTestRunner.h +++ b/third_party/WebKit/public/testing/WebTestRunner.h @@ -31,7 +31,7 @@ #ifndef WebTestRunner_h #define WebTestRunner_h -namespace WebKit { +namespace blink { class WebArrayBufferView; class WebPermissionClient; } @@ -42,7 +42,7 @@ class WebTestRunner { public: // Returns a mock WebPermissionClient that is used for layout tests. An // embedder should use this for all WebViews it creates. - virtual WebKit::WebPermissionClient* webPermissions() const = 0; + virtual blink::WebPermissionClient* webPermissions() const = 0; // After WebTestDelegate::testFinished was invoked, the following methods // can be used to determine what kind of dump the main WebTestProxy can @@ -51,7 +51,7 @@ public: // If true, WebTestDelegate::audioData returns an audio dump and no text // or pixel results are available. virtual bool shouldDumpAsAudio() const = 0; - virtual const WebKit::WebArrayBufferView* audioData() const = 0; + virtual const blink::WebArrayBufferView* audioData() const = 0; // Returns true if the call to WebTestProxy::captureTree will invoke // WebTestDelegate::captureHistoryForWindow. diff --git a/third_party/WebKit/public/web/WebAXEnums.h b/third_party/WebKit/public/web/WebAXEnums.h index a381bec..2989a8c 100644 --- a/third_party/WebKit/public/web/WebAXEnums.h +++ b/third_party/WebKit/public/web/WebAXEnums.h @@ -31,7 +31,7 @@ #ifndef WebAXEnums_h #define WebAXEnums_h -namespace WebKit { +namespace blink { // Accessibility events sent from Blink to the embedder. // These values must match WebCore::AXObjectCache::AXNotification values. @@ -217,6 +217,6 @@ enum WebAXTextDirection { WebAXTextDirectionBT }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebAXObject.h b/third_party/WebKit/public/web/WebAXObject.h index 10d4646..e9335c6 100644 --- a/third_party/WebKit/public/web/WebAXObject.h +++ b/third_party/WebKit/public/web/WebAXObject.h @@ -42,7 +42,7 @@ namespace WTF { template <typename T> class PassRefPtr; } namespace WebCore { class AXObject; } -namespace WebKit { +namespace blink { class WebNode; class WebDocument; @@ -220,6 +220,6 @@ private: WebPrivatePtr<WebCore::AXObject> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h b/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h index 8804bb1..82a09a3 100644 --- a/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h +++ b/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h @@ -32,7 +32,7 @@ #include "../platform/WebSize.h" #include "WebInputEvent.h" -namespace WebKit { +namespace blink { struct WebActiveWheelFlingParameters { WebFloatPoint delta; diff --git a/third_party/WebKit/public/web/WebApplicationCacheHost.h b/third_party/WebKit/public/web/WebApplicationCacheHost.h index 4731b45..d453693 100644 --- a/third_party/WebKit/public/web/WebApplicationCacheHost.h +++ b/third_party/WebKit/public/web/WebApplicationCacheHost.h @@ -35,7 +35,7 @@ #include "../platform/WebURL.h" #include "../platform/WebVector.h" -namespace WebKit { +namespace blink { class WebApplicationCacheHostClient; class WebFrame; @@ -117,6 +117,6 @@ public: virtual void deleteAssociatedCacheGroup() { } }; -} // namespace WebKit +} // namespace blink #endif // WebApplicationCacheHost_h diff --git a/third_party/WebKit/public/web/WebApplicationCacheHostClient.h b/third_party/WebKit/public/web/WebApplicationCacheHostClient.h index 9f08a72..72f8412 100644 --- a/third_party/WebKit/public/web/WebApplicationCacheHostClient.h +++ b/third_party/WebKit/public/web/WebApplicationCacheHostClient.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebApplicationCacheHost.h" -namespace WebKit { +namespace blink { // This interface is used by the embedder to call into webkit. class WebApplicationCacheHostClient { @@ -51,7 +51,7 @@ protected: virtual ~WebApplicationCacheHostClient() { } }; -} // namespace WebKit +} // namespace blink #endif // WebApplicationCacheHostClient_h diff --git a/third_party/WebKit/public/web/WebArrayBufferView.h b/third_party/WebKit/public/web/WebArrayBufferView.h index 51a28b9..cc02d7e 100644 --- a/third_party/WebKit/public/web/WebArrayBufferView.h +++ b/third_party/WebKit/public/web/WebArrayBufferView.h @@ -39,7 +39,7 @@ template <class T> class Handle; namespace WTF { class ArrayBufferView; } -namespace WebKit { +namespace blink { // Provides access to an ArrayBufferView. class WebArrayBufferView { @@ -67,6 +67,6 @@ private: WebPrivatePtr<WTF::ArrayBufferView> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebAudioSourceProviderClient.h b/third_party/WebKit/public/web/WebAudioSourceProviderClient.h index ab21a0e..ed24146 100644 --- a/third_party/WebKit/public/web/WebAudioSourceProviderClient.h +++ b/third_party/WebKit/public/web/WebAudioSourceProviderClient.h @@ -25,7 +25,7 @@ #ifndef WebAudioSourceProviderClient_h #define WebAudioSourceProviderClient_h -namespace WebKit { +namespace blink { class WebAudioSourceProviderClient { public: diff --git a/third_party/WebKit/public/web/WebAutofillClient.h b/third_party/WebKit/public/web/WebAutofillClient.h index b6904331..afc789d 100644 --- a/third_party/WebKit/public/web/WebAutofillClient.h +++ b/third_party/WebKit/public/web/WebAutofillClient.h @@ -31,7 +31,7 @@ #ifndef WebAutofillClient_h #define WebAutofillClient_h -namespace WebKit { +namespace blink { class WebFormElement; class WebFrame; @@ -101,6 +101,6 @@ protected: virtual ~WebAutofillClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebBindings.h b/third_party/WebKit/public/web/WebBindings.h index 8e2a550..a83120a 100644 --- a/third_party/WebKit/public/web/WebBindings.h +++ b/third_party/WebKit/public/web/WebBindings.h @@ -42,7 +42,7 @@ template <class T> class Handle; template <class T> class Local; } -namespace WebKit { +namespace blink { class WebArrayBuffer; class WebArrayBufferView; @@ -184,6 +184,6 @@ public: BLINK_EXPORT static v8::Handle<v8::Value> toV8Value(const NPVariant*); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebBlob.h b/third_party/WebKit/public/web/WebBlob.h index cd518f1..07d3984 100644 --- a/third_party/WebKit/public/web/WebBlob.h +++ b/third_party/WebKit/public/web/WebBlob.h @@ -44,7 +44,7 @@ template <class T> class Handle; namespace WebCore { class Blob; } -namespace WebKit { +namespace blink { class WebBlob { public: @@ -79,6 +79,6 @@ protected: WebPrivatePtr<WebCore::Blob> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebBlob_h diff --git a/third_party/WebKit/public/web/WebCache.h b/third_party/WebKit/public/web/WebCache.h index 79a5219..28557da 100644 --- a/third_party/WebKit/public/web/WebCache.h +++ b/third_party/WebKit/public/web/WebCache.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // An interface to query and configure WebKit's resource cache. class WebCache { @@ -86,6 +86,6 @@ private: WebCache(); // Not intended to be instanced. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebCachedURLRequest.h b/third_party/WebKit/public/web/WebCachedURLRequest.h index 33b46903..c889171 100644 --- a/third_party/WebKit/public/web/WebCachedURLRequest.h +++ b/third_party/WebKit/public/web/WebCachedURLRequest.h @@ -37,7 +37,7 @@ namespace WebCore { class FetchRequest; } -namespace WebKit { +namespace blink { class WebString; class WebURLRequest; @@ -65,6 +65,6 @@ private: mutable WebPrivateOwnPtr<WrappedResourceRequest> m_resourceRequestWrapper; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebColorChooser.h b/third_party/WebKit/public/web/WebColorChooser.h index 53d15f8..2c2ce9c 100644 --- a/third_party/WebKit/public/web/WebColorChooser.h +++ b/third_party/WebKit/public/web/WebColorChooser.h @@ -29,7 +29,7 @@ #include "../platform/WebColor.h" #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // This represents a color chooser. class WebColorChooser { diff --git a/third_party/WebKit/public/web/WebColorChooserClient.h b/third_party/WebKit/public/web/WebColorChooserClient.h index 6099bfe..30ca541 100644 --- a/third_party/WebKit/public/web/WebColorChooserClient.h +++ b/third_party/WebKit/public/web/WebColorChooserClient.h @@ -29,7 +29,7 @@ #include "../platform/WebColor.h" #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // Receives calls from WebColorChooser and passes it to the WebCore side. class WebColorChooserClient { diff --git a/third_party/WebKit/public/web/WebColorName.h b/third_party/WebKit/public/web/WebColorName.h index f719ff1..53ef76a 100644 --- a/third_party/WebKit/public/web/WebColorName.h +++ b/third_party/WebKit/public/web/WebColorName.h @@ -34,7 +34,7 @@ #include "../platform/WebColor.h" #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { enum WebColorName { WebColorActiveBorder, @@ -72,6 +72,6 @@ enum WebColorName { // Sets the values of a set of named colors. BLINK_EXPORT void setNamedColors(const WebColorName*, const WebColor*, size_t length); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebCompositionUnderline.h b/third_party/WebKit/public/web/WebCompositionUnderline.h index 1c5c1f1..2c58662 100644 --- a/third_party/WebKit/public/web/WebCompositionUnderline.h +++ b/third_party/WebKit/public/web/WebCompositionUnderline.h @@ -33,7 +33,7 @@ #include "../platform/WebColor.h" -namespace WebKit { +namespace blink { // Class WebCompositionUnderline is intended to be used with WebWidget's // setComposition() method. @@ -56,6 +56,6 @@ struct WebCompositionUnderline { bool thick; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebConsoleMessage.h b/third_party/WebKit/public/web/WebConsoleMessage.h index a6af83f..cf6a54e 100644 --- a/third_party/WebKit/public/web/WebConsoleMessage.h +++ b/third_party/WebKit/public/web/WebConsoleMessage.h @@ -33,7 +33,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { struct WebConsoleMessage { enum Level { @@ -54,6 +54,6 @@ struct WebConsoleMessage { , text(text) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebContentDetectionResult.h b/third_party/WebKit/public/web/WebContentDetectionResult.h index d9516ae..9d415be 100644 --- a/third_party/WebKit/public/web/WebContentDetectionResult.h +++ b/third_party/WebKit/public/web/WebContentDetectionResult.h @@ -30,7 +30,7 @@ #include "../platform/WebURL.h" #include "WebRange.h" -namespace WebKit { +namespace blink { class WebContentDetectionResult { public: @@ -59,6 +59,6 @@ private: WebURL m_intent; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebContentSecurityPolicy.h b/third_party/WebKit/public/web/WebContentSecurityPolicy.h index 1488fc3..f649e43 100644 --- a/third_party/WebKit/public/web/WebContentSecurityPolicy.h +++ b/third_party/WebKit/public/web/WebContentSecurityPolicy.h @@ -31,13 +31,13 @@ #ifndef WebContentSecurityPolicy_h #define WebContentSecurityPolicy_h -namespace WebKit { +namespace blink { enum WebContentSecurityPolicyType { WebContentSecurityPolicyTypeReport, WebContentSecurityPolicyTypeEnforce, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebContextMenuData.h b/third_party/WebKit/public/web/WebContextMenuData.h index d7d282f..81eb3ba 100644 --- a/third_party/WebKit/public/web/WebContextMenuData.h +++ b/third_party/WebKit/public/web/WebContextMenuData.h @@ -42,7 +42,7 @@ #define WEBCONTEXT_MEDIATYPEFILE_DEFINED -namespace WebKit { +namespace blink { // This struct is passed to WebViewClient::ShowContextMenu. struct WebContextMenuData { @@ -182,6 +182,6 @@ struct WebContextMenuData { , editFlags(0) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h b/third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h index a75e855..b490268 100644 --- a/third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h +++ b/third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // An interface to configure WebKit's cross-origin preflight result cache. class WebCrossOriginPreflightResultCache { @@ -45,6 +45,6 @@ private: WebCrossOriginPreflightResultCache(); // Not intended to be instanced. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebCustomElement.h b/third_party/WebKit/public/web/WebCustomElement.h index 757f4c6..a570831 100644 --- a/third_party/WebKit/public/web/WebCustomElement.h +++ b/third_party/WebKit/public/web/WebCustomElement.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebString; @@ -50,6 +50,6 @@ private: WebCustomElement(); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMActivityLogger.h b/third_party/WebKit/public/web/WebDOMActivityLogger.h index fc77c89..9664be5 100644 --- a/third_party/WebKit/public/web/WebDOMActivityLogger.h +++ b/third_party/WebKit/public/web/WebDOMActivityLogger.h @@ -36,7 +36,7 @@ #include "../platform/WebURL.h" #include <v8.h> -namespace WebKit { +namespace blink { class WebDOMActivityLogger { public: @@ -52,6 +52,6 @@ BLINK_EXPORT bool hasDOMActivityLogger(int worldId); // with the world identified by worldId (worldId may be 0 identifying the main world). BLINK_EXPORT void setDOMActivityLogger(int worldId, WebDOMActivityLogger*); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMCustomEvent.h b/third_party/WebKit/public/web/WebDOMCustomEvent.h index df211fd..e6f2f671 100644 --- a/third_party/WebKit/public/web/WebDOMCustomEvent.h +++ b/third_party/WebKit/public/web/WebDOMCustomEvent.h @@ -33,7 +33,7 @@ #include "WebDOMEvent.h" #include "WebSerializedScriptValue.h" -namespace WebKit { +namespace blink { class WebFrame; class WebString; @@ -44,6 +44,6 @@ public: BLINK_EXPORT void initCustomEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMError.h b/third_party/WebKit/public/web/WebDOMError.h index ef2c4ea..4ca7733 100644 --- a/third_party/WebKit/public/web/WebDOMError.h +++ b/third_party/WebKit/public/web/WebDOMError.h @@ -42,7 +42,7 @@ template <class T> class Handle; namespace WebCore { class DOMError; } -namespace WebKit { +namespace blink { class WebDOMError { public: @@ -76,6 +76,6 @@ protected: WebPrivatePtr<WebCore::DOMError> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebDOMError_h diff --git a/third_party/WebKit/public/web/WebDOMEvent.h b/third_party/WebKit/public/web/WebDOMEvent.h index 04a01c8..4be814f 100644 --- a/third_party/WebKit/public/web/WebDOMEvent.h +++ b/third_party/WebKit/public/web/WebDOMEvent.h @@ -41,7 +41,7 @@ namespace WebCore { class Event; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebDOMEvent { public: @@ -130,6 +130,6 @@ protected: WebPrivatePtr<WebDOMEventPrivate> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMEventListener.h b/third_party/WebKit/public/web/WebDOMEventListener.h index 6353be0..7b247d1 100644 --- a/third_party/WebKit/public/web/WebDOMEventListener.h +++ b/third_party/WebKit/public/web/WebDOMEventListener.h @@ -37,7 +37,7 @@ namespace WebCore { class EventTarget; } #endif -namespace WebKit { +namespace blink { class EventListenerWrapper; class WebDOMEvent; @@ -63,6 +63,6 @@ private: WebDOMEventListenerPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMFileSystem.h b/third_party/WebKit/public/web/WebDOMFileSystem.h index d707921..b69d3d4 100644 --- a/third_party/WebKit/public/web/WebDOMFileSystem.h +++ b/third_party/WebKit/public/web/WebDOMFileSystem.h @@ -43,7 +43,7 @@ template <class T> class Handle; namespace WebCore { class DOMFileSystem; } -namespace WebKit { +namespace blink { class WebDOMFileSystem { public: @@ -78,6 +78,6 @@ private: WebPrivatePtr<WebCore::DOMFileSystem> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebDOMFileSystem_h diff --git a/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h b/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h index 4bd487c..5eed104 100644 --- a/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h +++ b/third_party/WebKit/public/web/WebDOMMediaStreamTrack.h @@ -45,7 +45,7 @@ template <class T> class Handle; namespace WebCore { class MediaStreamTrack; } -namespace WebKit { +namespace blink { class WebDOMMediaStreamTrack { public: @@ -74,6 +74,6 @@ private: WebPrivatePtr<WebCore::MediaStreamTrack> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMMessageEvent.h b/third_party/WebKit/public/web/WebDOMMessageEvent.h index 782d512..92623f1 100644 --- a/third_party/WebKit/public/web/WebDOMMessageEvent.h +++ b/third_party/WebKit/public/web/WebDOMMessageEvent.h @@ -39,7 +39,7 @@ #include "core/events/MessageEvent.h" #endif -namespace WebKit { +namespace blink { class WebFrame; class WebString; @@ -59,6 +59,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMMouseEvent.h b/third_party/WebKit/public/web/WebDOMMouseEvent.h index dcfa89e..a46dfec 100644 --- a/third_party/WebKit/public/web/WebDOMMouseEvent.h +++ b/third_party/WebKit/public/web/WebDOMMouseEvent.h @@ -36,7 +36,7 @@ namespace WebCore { class Event; } #endif -namespace WebKit { +namespace blink { class WebDOMMouseEvent : public WebDOMEvent { public: @@ -55,6 +55,6 @@ public: BLINK_EXPORT bool buttonDown() const; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMProgressEvent.h b/third_party/WebKit/public/web/WebDOMProgressEvent.h index d8db155..830a368 100644 --- a/third_party/WebKit/public/web/WebDOMProgressEvent.h +++ b/third_party/WebKit/public/web/WebDOMProgressEvent.h @@ -33,7 +33,7 @@ #include "WebDOMEvent.h" -namespace WebKit { +namespace blink { class WebString; @@ -43,6 +43,6 @@ public: BLINK_EXPORT WebDOMProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h b/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h index 548a5cf..9736e8f 100644 --- a/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h +++ b/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h @@ -33,7 +33,7 @@ #include "WebDOMProgressEvent.h" -namespace WebKit { +namespace blink { class WebString; @@ -43,6 +43,6 @@ public: BLINK_EXPORT WebDOMResourceProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total, const WebString& url); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDataSource.h b/third_party/WebKit/public/web/WebDataSource.h index 9c5e236..eedbaf3 100644 --- a/third_party/WebKit/public/web/WebDataSource.h +++ b/third_party/WebKit/public/web/WebDataSource.h @@ -35,7 +35,7 @@ #include "WebNavigationType.h" #include "WebTextDirection.h" -namespace WebKit { +namespace blink { class WebApplicationCacheHost; class WebString; @@ -121,6 +121,6 @@ protected: ~WebDataSource() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDatabase.h b/third_party/WebKit/public/web/WebDatabase.h index 6ad7554..502890c 100644 --- a/third_party/WebKit/public/web/WebDatabase.h +++ b/third_party/WebKit/public/web/WebDatabase.h @@ -36,7 +36,7 @@ namespace WebCore { class DatabaseBackendBase; } -namespace WebKit { +namespace blink { class WebDatabaseObserver; class WebString; @@ -71,6 +71,6 @@ private: const WebCore::DatabaseBackendBase* m_database; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDatabaseObserver.h b/third_party/WebKit/public/web/WebDatabaseObserver.h index 99e7db7..95f52a8 100644 --- a/third_party/WebKit/public/web/WebDatabaseObserver.h +++ b/third_party/WebKit/public/web/WebDatabaseObserver.h @@ -31,7 +31,7 @@ #ifndef WebDatabaseObserver_h #define WebDatabaseObserver_h -namespace WebKit { +namespace blink { class WebDatabase; class WebDatabaseObserver { @@ -51,6 +51,6 @@ protected: ~WebDatabaseObserver() {} }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h b/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h index 37522c6..91fe00b 100644 --- a/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h +++ b/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h @@ -28,7 +28,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { // Gets called back when WebViewClient finished choosing a date/time value. class WebDateTimeChooserCompletion { @@ -46,6 +46,6 @@ protected: virtual ~WebDateTimeChooserCompletion() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDateTimeChooserParams.h b/third_party/WebKit/public/web/WebDateTimeChooserParams.h index 1adc445..918d636 100644 --- a/third_party/WebKit/public/web/WebDateTimeChooserParams.h +++ b/third_party/WebKit/public/web/WebDateTimeChooserParams.h @@ -31,7 +31,7 @@ #include "../platform/WebVector.h" #include "WebDateTimeInputType.h" -namespace WebKit { +namespace blink { // This class conveys various information to make date/time chooser UI. // See WebViewClient::openDateTimeChooser. @@ -81,6 +81,6 @@ struct WebDateTimeChooserParams { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDateTimeInputType.h b/third_party/WebKit/public/web/WebDateTimeInputType.h index 52d60fb..6d586ef 100644 --- a/third_party/WebKit/public/web/WebDateTimeInputType.h +++ b/third_party/WebKit/public/web/WebDateTimeInputType.h @@ -30,7 +30,7 @@ #ifndef WebDateTimeInputType_h #define WebDateTimeInputType_h -namespace WebKit { +namespace blink { enum WebDateTimeInputType { WebDateTimeInputTypeNone, @@ -42,6 +42,6 @@ enum WebDateTimeInputType { WebDateTimeInputTypeWeek, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDevToolsAgent.h b/third_party/WebKit/public/web/WebDevToolsAgent.h index 36f9700..a412313 100644 --- a/third_party/WebKit/public/web/WebDevToolsAgent.h +++ b/third_party/WebKit/public/web/WebDevToolsAgent.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebVector.h" -namespace WebKit { +namespace blink { class WebDevToolsAgentClient; class WebDevToolsMessageTransport; class WebFrame; @@ -90,6 +90,6 @@ public: }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDevToolsAgentClient.h b/third_party/WebKit/public/web/WebDevToolsAgentClient.h index 21f39e8..8499ec1 100644 --- a/third_party/WebKit/public/web/WebDevToolsAgentClient.h +++ b/third_party/WebKit/public/web/WebDevToolsAgentClient.h @@ -34,7 +34,7 @@ #include "../platform/WebCString.h" #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebString; struct WebDevToolsMessageData; struct WebRect; @@ -106,6 +106,6 @@ protected: ~WebDevToolsAgentClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDevToolsFrontend.h b/third_party/WebKit/public/web/WebDevToolsFrontend.h index 9c1c36d..1f6547d 100644 --- a/third_party/WebKit/public/web/WebDevToolsFrontend.h +++ b/third_party/WebKit/public/web/WebDevToolsFrontend.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebDevToolsFrontendClient; class WebString; @@ -52,6 +52,6 @@ public: virtual void dispatchOnInspectorFrontend(const WebString&) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDevToolsFrontendClient.h b/third_party/WebKit/public/web/WebDevToolsFrontendClient.h index 13f6c47..53add1c 100644 --- a/third_party/WebKit/public/web/WebDevToolsFrontendClient.h +++ b/third_party/WebKit/public/web/WebDevToolsFrontendClient.h @@ -31,7 +31,7 @@ #ifndef WebDevToolsFrontendClient_h #define WebDevToolsFrontendClient_h -namespace WebKit { +namespace blink { class WebString; struct WebFloatPoint; @@ -51,6 +51,6 @@ protected: virtual ~WebDevToolsFrontendClient() {} }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDocument.h b/third_party/WebKit/public/web/WebDocument.h index e78254b..943f025 100644 --- a/third_party/WebKit/public/web/WebDocument.h +++ b/third_party/WebKit/public/web/WebDocument.h @@ -51,7 +51,7 @@ class Value; template <class T> class Handle; } -namespace WebKit { +namespace blink { class WebAXObject; class WebDocumentType; class WebElement; @@ -151,6 +151,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDocumentType.h b/third_party/WebKit/public/web/WebDocumentType.h index 5b5372a..8760865 100644 --- a/third_party/WebKit/public/web/WebDocumentType.h +++ b/third_party/WebKit/public/web/WebDocumentType.h @@ -38,7 +38,7 @@ namespace WebCore { class DocumentType; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebString; // Provides readonly access to some properties of a DOM document type. @@ -63,6 +63,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDragOperation.h b/third_party/WebKit/public/web/WebDragOperation.h index 050b74f..6331d51 100644 --- a/third_party/WebKit/public/web/WebDragOperation.h +++ b/third_party/WebKit/public/web/WebDragOperation.h @@ -33,7 +33,7 @@ #include <limits.h> -namespace WebKit { +namespace blink { // "Verb" of a drag-and-drop operation as negotiated between the source and // destination. @@ -54,6 +54,6 @@ enum WebDragOperation { // with potentially multiple value bits set. typedef WebDragOperation WebDragOperationsMask; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDragStatus.h b/third_party/WebKit/public/web/WebDragStatus.h index fb490d3..0e41f23 100644 --- a/third_party/WebKit/public/web/WebDragStatus.h +++ b/third_party/WebKit/public/web/WebDragStatus.h @@ -31,7 +31,7 @@ #ifndef WebDragStatus_h #define WebDragStatus_h -namespace WebKit { +namespace blink { enum WebDragStatus { WebDragStatusUnknown = 0, @@ -41,6 +41,6 @@ enum WebDragStatus { WebDragStatusDrop }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebDraggableRegion.h b/third_party/WebKit/public/web/WebDraggableRegion.h index 1ec01db..90636a5 100644 --- a/third_party/WebKit/public/web/WebDraggableRegion.h +++ b/third_party/WebKit/public/web/WebDraggableRegion.h @@ -35,13 +35,13 @@ #include "../platform/WebRect.h" #include "../platform/WebString.h" -namespace WebKit { +namespace blink { struct WebDraggableRegion { bool draggable; WebRect bounds; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebElement.h b/third_party/WebKit/public/web/WebElement.h index dc7abbe..3bfd310 100644 --- a/third_party/WebKit/public/web/WebElement.h +++ b/third_party/WebKit/public/web/WebElement.h @@ -38,7 +38,7 @@ namespace WebCore { class Element; } #endif -namespace WebKit { +namespace blink { struct WebRect; // Provides access to some properties of a DOM element node. @@ -95,6 +95,6 @@ struct WebRect; #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebExceptionCode.h b/third_party/WebKit/public/web/WebExceptionCode.h index 61d53d9..17dce57 100644 --- a/third_party/WebKit/public/web/WebExceptionCode.h +++ b/third_party/WebKit/public/web/WebExceptionCode.h @@ -31,11 +31,11 @@ #ifndef WebExceptionCode_h #define WebExceptionCode_h -namespace WebKit { +namespace blink { // This should match how ExceptionCode is defined in WebCore. typedef int WebExceptionCode; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebExternalPopupMenu.h b/third_party/WebKit/public/web/WebExternalPopupMenu.h index 49630cf..44a2e8b8 100644 --- a/third_party/WebKit/public/web/WebExternalPopupMenu.h +++ b/third_party/WebKit/public/web/WebExternalPopupMenu.h @@ -31,7 +31,7 @@ #ifndef WebExternalPopupMenu_h #define WebExternalPopupMenu_h -namespace WebKit { +namespace blink { struct WebRect; @@ -41,6 +41,6 @@ public: virtual void close() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebExternalPopupMenu_h diff --git a/third_party/WebKit/public/web/WebExternalPopupMenuClient.h b/third_party/WebKit/public/web/WebExternalPopupMenuClient.h index 1396c65..f9e5891 100644 --- a/third_party/WebKit/public/web/WebExternalPopupMenuClient.h +++ b/third_party/WebKit/public/web/WebExternalPopupMenuClient.h @@ -33,7 +33,7 @@ #include "../platform/WebVector.h" -namespace WebKit { +namespace blink { class WebExternalPopupMenuClient { public: @@ -58,6 +58,6 @@ public: virtual void didCancel() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebExternalPopupMenuClient_h diff --git a/third_party/WebKit/public/web/WebFileChooserCompletion.h b/third_party/WebKit/public/web/WebFileChooserCompletion.h index dc946f0..19c0f26 100644 --- a/third_party/WebKit/public/web/WebFileChooserCompletion.h +++ b/third_party/WebKit/public/web/WebFileChooserCompletion.h @@ -33,7 +33,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { template <typename T> class WebVector; @@ -65,6 +65,6 @@ protected: virtual ~WebFileChooserCompletion() {} }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFileChooserParams.h b/third_party/WebKit/public/web/WebFileChooserParams.h index c651a11..2f8f40c 100644 --- a/third_party/WebKit/public/web/WebFileChooserParams.h +++ b/third_party/WebKit/public/web/WebFileChooserParams.h @@ -35,7 +35,7 @@ #include "../platform/WebVector.h" #include "WebFileChooserCompletion.h" -namespace WebKit { +namespace blink { struct WebFileChooserParams { // If |multiSelect| is true, the dialog allows the user to select multiple files. @@ -81,6 +81,6 @@ struct WebFileChooserParams { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFindOptions.h b/third_party/WebKit/public/web/WebFindOptions.h index e311043..3c32007 100644 --- a/third_party/WebKit/public/web/WebFindOptions.h +++ b/third_party/WebKit/public/web/WebFindOptions.h @@ -33,7 +33,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { // Options used when performing a find-in-page query. struct WebFindOptions { @@ -61,6 +61,6 @@ struct WebFindOptions { , medialCapitalAsWordStart(false) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFont.h b/third_party/WebKit/public/web/WebFont.h index 27dc3e0..523cee4 100644 --- a/third_party/WebKit/public/web/WebFont.h +++ b/third_party/WebKit/public/web/WebFont.h @@ -35,7 +35,7 @@ #include "../platform/WebColor.h" #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { struct WebFontDescription; struct WebFloatPoint; @@ -95,6 +95,6 @@ public: int height, int from = 0, int to = -1) const = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFontCache.h b/third_party/WebKit/public/web/WebFontCache.h index 90c56ba..db38a4e 100644 --- a/third_party/WebKit/public/web/WebFontCache.h +++ b/third_party/WebKit/public/web/WebFontCache.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // An interface to query and configure WebKit's font cache. class WebFontCache { @@ -54,6 +54,6 @@ private: WebFontCache(); // Not intended to be instanced. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFontDescription.h b/third_party/WebKit/public/web/WebFontDescription.h index 465a4d5..d40030c 100644 --- a/third_party/WebKit/public/web/WebFontDescription.h +++ b/third_party/WebKit/public/web/WebFontDescription.h @@ -37,7 +37,7 @@ namespace WebCore { class FontDescription; } #endif -namespace WebKit { +namespace blink { struct WebFontDescription { enum GenericFamily { @@ -101,6 +101,6 @@ struct WebFontDescription { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFormControlElement.h b/third_party/WebKit/public/web/WebFormControlElement.h index 00f784b..a6abd72 100644 --- a/third_party/WebKit/public/web/WebFormControlElement.h +++ b/third_party/WebKit/public/web/WebFormControlElement.h @@ -39,7 +39,7 @@ namespace WebCore { class HTMLFormControlElement; } #endif -namespace WebKit { +namespace blink { // Provides readonly access to some properties of a DOM form control element node. class WebFormControlElement : public WebElement { @@ -78,6 +78,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFormElement.h b/third_party/WebKit/public/web/WebFormElement.h index aa30f9d..0d01205 100644 --- a/third_party/WebKit/public/web/WebFormElement.h +++ b/third_party/WebKit/public/web/WebFormElement.h @@ -38,7 +38,7 @@ namespace WebCore { class HTMLFormElement; } #endif -namespace WebKit { +namespace blink { class WebInputElement; class WebFormControlElement; @@ -85,6 +85,6 @@ namespace WebKit { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFrame.h b/third_party/WebKit/public/web/WebFrame.h index e487798..b2e1dc3 100644 --- a/third_party/WebKit/public/web/WebFrame.h +++ b/third_party/WebKit/public/web/WebFrame.h @@ -52,7 +52,7 @@ template <class T> class Handle; template <class T> class Local; } -namespace WebKit { +namespace blink { class WebData; class WebDataSource; @@ -252,7 +252,7 @@ public: // gets its own wrappers for all DOM nodes and DOM constructors. // extensionGroup is an embedder-provided specifier that controls which // v8 extensions are loaded into the new context - see - // WebKit::registerExtension for the corresponding specifier. + // blink::registerExtension for the corresponding specifier. // // worldID must be > 0 (as 0 represents the main world). // worldID must be < EmbedderWorldIdLimit, high number used internally. @@ -673,6 +673,6 @@ protected: ~WebFrame() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebFrameClient.h b/third_party/WebKit/public/web/WebFrameClient.h index f535472..ae6b10a 100644 --- a/third_party/WebKit/public/web/WebFrameClient.h +++ b/third_party/WebKit/public/web/WebFrameClient.h @@ -46,7 +46,7 @@ #include "WebTextDirection.h" #include <v8.h> -namespace WebKit { +namespace blink { class WebApplicationCacheHost; class WebApplicationCacheHostClient; @@ -240,7 +240,7 @@ public: WebFrame*, unsigned identifier, const WebURLResponse&) { } virtual void didChangeResourcePriority( - WebFrame*, unsigned identifier, const WebKit::WebURLRequest::Priority&) { } + WebFrame*, unsigned identifier, const blink::WebURLRequest::Priority&) { } // The resource request given by identifier succeeded. virtual void didFinishResourceLoad( @@ -377,6 +377,6 @@ protected: ~WebFrameClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebGeolocationClient.h b/third_party/WebKit/public/web/WebGeolocationClient.h index 1dfb0cd..87a1b27 100644 --- a/third_party/WebKit/public/web/WebGeolocationClient.h +++ b/third_party/WebKit/public/web/WebGeolocationClient.h @@ -26,7 +26,7 @@ #ifndef WebGeolocationClient_h #define WebGeolocationClient_h -namespace WebKit { +namespace blink { class WebGeolocationController; class WebGeolocationPermissionRequest; class WebGeolocationPosition; @@ -49,6 +49,6 @@ public: virtual void setController(WebGeolocationController*) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebGeolocationClient_h diff --git a/third_party/WebKit/public/web/WebGeolocationClientMock.h b/third_party/WebKit/public/web/WebGeolocationClientMock.h index 8f0d63b..f20e6cc 100644 --- a/third_party/WebKit/public/web/WebGeolocationClientMock.h +++ b/third_party/WebKit/public/web/WebGeolocationClientMock.h @@ -39,7 +39,7 @@ namespace WebCore { class GeolocationClientMock; } -namespace WebKit { +namespace blink { class WebGeolocationPosition; class WebString; diff --git a/third_party/WebKit/public/web/WebGeolocationController.h b/third_party/WebKit/public/web/WebGeolocationController.h index 51a0766..4a4df54 100644 --- a/third_party/WebKit/public/web/WebGeolocationController.h +++ b/third_party/WebKit/public/web/WebGeolocationController.h @@ -31,7 +31,7 @@ namespace WebCore { class GeolocationController; } -namespace WebKit { +namespace blink { class WebGeolocationPosition; class WebGeolocationError; @@ -60,6 +60,6 @@ private: WebCore::GeolocationController* m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebGeolocationController_h diff --git a/third_party/WebKit/public/web/WebGeolocationError.h b/third_party/WebKit/public/web/WebGeolocationError.h index 0ce55bc..949b3cc 100644 --- a/third_party/WebKit/public/web/WebGeolocationError.h +++ b/third_party/WebKit/public/web/WebGeolocationError.h @@ -35,7 +35,7 @@ namespace WebCore { class GeolocationError; } -namespace WebKit { +namespace blink { class WebString; @@ -64,6 +64,6 @@ private: WebPrivatePtr<WebCore::GeolocationError> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebGeolocationError_h diff --git a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h index 1f4a9f8..5236f6d 100644 --- a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h +++ b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h @@ -33,7 +33,7 @@ namespace WebCore { class Geolocation; } -namespace WebKit { +namespace blink { class WebSecurityOrigin; // WebGeolocationPermissionRequest encapsulates a WebCore Geolocation object and represents diff --git a/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h b/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h index ff62032..eca31d6 100644 --- a/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h +++ b/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h @@ -29,7 +29,7 @@ #include "../platform/WebNonCopyable.h" #include "../platform/WebPrivateOwnPtr.h" -namespace WebKit { +namespace blink { class WebGeolocationPermissionRequest; class WebGeolocationPermissionRequestManagerPrivate; @@ -45,9 +45,9 @@ public: WebGeolocationPermissionRequestManager() { init(); } ~WebGeolocationPermissionRequestManager() { reset(); } - BLINK_EXPORT int add(const WebKit::WebGeolocationPermissionRequest&); - BLINK_EXPORT bool remove(const WebKit::WebGeolocationPermissionRequest&, int&); - BLINK_EXPORT bool remove(int, WebKit::WebGeolocationPermissionRequest&); + BLINK_EXPORT int add(const blink::WebGeolocationPermissionRequest&); + BLINK_EXPORT bool remove(const blink::WebGeolocationPermissionRequest&, int&); + BLINK_EXPORT bool remove(int, blink::WebGeolocationPermissionRequest&); private: BLINK_EXPORT void init(); diff --git a/third_party/WebKit/public/web/WebGeolocationPosition.h b/third_party/WebKit/public/web/WebGeolocationPosition.h index 9ccdbcd..84d1363 100644 --- a/third_party/WebKit/public/web/WebGeolocationPosition.h +++ b/third_party/WebKit/public/web/WebGeolocationPosition.h @@ -35,7 +35,7 @@ namespace WebCore { class GeolocationPosition; } -namespace WebKit { +namespace blink { class WebGeolocationPosition { public: @@ -61,6 +61,6 @@ private: WebPrivatePtr<WebCore::GeolocationPosition> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebGeolocationPosition_h diff --git a/third_party/WebKit/public/web/WebGlyphCache.h b/third_party/WebKit/public/web/WebGlyphCache.h index ec32290..0487882 100644 --- a/third_party/WebKit/public/web/WebGlyphCache.h +++ b/third_party/WebKit/public/web/WebGlyphCache.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // An interface to query WebKit's glyph cache (which maps unicode characters to // glyphs in particular fonts). @@ -46,6 +46,6 @@ private: WebGlyphCache(); // Not intended to be instanced. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebHelperPlugin.h b/third_party/WebKit/public/web/WebHelperPlugin.h index 9b96313..cb96a14 100644 --- a/third_party/WebKit/public/web/WebHelperPlugin.h +++ b/third_party/WebKit/public/web/WebHelperPlugin.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebWidget.h" -namespace WebKit { +namespace blink { class WebFrameClient; class WebPlugin; @@ -55,6 +55,6 @@ protected: ~WebHelperPlugin() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebHistoryItem.h b/third_party/WebKit/public/web/WebHistoryItem.h index f8683b4..9a91d45 100644 --- a/third_party/WebKit/public/web/WebHistoryItem.h +++ b/third_party/WebKit/public/web/WebHistoryItem.h @@ -36,7 +36,7 @@ namespace WebCore { class HistoryItem; } -namespace WebKit { +namespace blink { class WebHTTPBody; class WebString; class WebSerializedScriptValue; @@ -121,6 +121,6 @@ private: WebPrivatePtr<WebCore::HistoryItem> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebHitTestResult.h b/third_party/WebKit/public/web/WebHitTestResult.h index 568a738..a48f3cd 100644 --- a/third_party/WebKit/public/web/WebHitTestResult.h +++ b/third_party/WebKit/public/web/WebHitTestResult.h @@ -32,7 +32,7 @@ namespace WebCore { class HitTestResult; } -namespace WebKit { +namespace blink { class WebElement; class WebNode; @@ -81,6 +81,6 @@ protected: WebPrivateOwnPtr<WebCore::HitTestResult> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebIconURL.h b/third_party/WebKit/public/web/WebIconURL.h index 8be121e..429c5c3 100644 --- a/third_party/WebKit/public/web/WebIconURL.h +++ b/third_party/WebKit/public/web/WebIconURL.h @@ -36,7 +36,7 @@ #endif #include "../platform/WebURL.h" -namespace WebKit { +namespace blink { class WebIconURL { public: diff --git a/third_party/WebKit/public/web/WebImageCache.h b/third_party/WebKit/public/web/WebImageCache.h index d2521b2..8dcdd4e 100644 --- a/third_party/WebKit/public/web/WebImageCache.h +++ b/third_party/WebKit/public/web/WebImageCache.h @@ -33,14 +33,14 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // An interface to query and configure WebKit's image cache. // // Methods of this interface can be called on any thread. // -// Methods of this interface can be only be used after WebKit::initialize() -// and before WebKit::shutdown() is called. +// Methods of this interface can be only be used after blink::initialize() +// and before blink::shutdown() is called. class WebImageCache { public: @@ -61,6 +61,6 @@ private: WebImageCache(); // Not intended to be instanced. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebImageDecoder.h b/third_party/WebKit/public/web/WebImageDecoder.h index e4deb30..724ba85 100644 --- a/third_party/WebKit/public/web/WebImageDecoder.h +++ b/third_party/WebKit/public/web/WebImageDecoder.h @@ -37,7 +37,7 @@ namespace WebCore { class ImageDecoder; } -namespace WebKit { +namespace blink { typedef WebCore::ImageDecoder WebImageDecoderPrivate; class WebData; @@ -85,6 +85,6 @@ private: WebImageDecoderPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebInbandTextTrack.h b/third_party/WebKit/public/web/WebInbandTextTrack.h index 9ea4b05..3aaf8b8b 100644 --- a/third_party/WebKit/public/web/WebInbandTextTrack.h +++ b/third_party/WebKit/public/web/WebInbandTextTrack.h @@ -31,7 +31,7 @@ #ifndef WebInbandTextTrack_h #define WebInbandTextTrack_h -namespace WebKit { +namespace blink { class WebString; class WebInbandTextTrackClient; @@ -66,6 +66,6 @@ public: virtual int textTrackIndex() const = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebInbandTextTrackClient.h b/third_party/WebKit/public/web/WebInbandTextTrackClient.h index dea4043..42a65d2be 100644 --- a/third_party/WebKit/public/web/WebInbandTextTrackClient.h +++ b/third_party/WebKit/public/web/WebInbandTextTrackClient.h @@ -31,7 +31,7 @@ #ifndef WebInbandTextTrackClient_h #define WebInbandTextTrackClient_h -namespace WebKit { +namespace blink { class WebString; @@ -46,6 +46,6 @@ public: const WebString& settings) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebInputElement.h b/third_party/WebKit/public/web/WebInputElement.h index d8f7d3f..c74de0b 100644 --- a/third_party/WebKit/public/web/WebInputElement.h +++ b/third_party/WebKit/public/web/WebInputElement.h @@ -37,7 +37,7 @@ namespace WebCore { class HTMLInputElement; } #endif -namespace WebKit { +namespace blink { class WebNodeCollection; @@ -125,6 +125,6 @@ namespace WebKit { return toWebInputElement(const_cast<WebElement*>(element)); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebInputEvent.h b/third_party/WebKit/public/web/WebInputEvent.h index 4cad781..69687fc 100644 --- a/third_party/WebKit/public/web/WebInputEvent.h +++ b/third_party/WebKit/public/web/WebInputEvent.h @@ -37,7 +37,7 @@ #include <string.h> -namespace WebKit { +namespace blink { // The classes defined in this file are intended to be used with // WebWidget's handleInputEvent method. These event types are cross- @@ -496,6 +496,6 @@ public: #pragma pack(pop) -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebKit.h b/third_party/WebKit/public/web/WebKit.h index 3967311..6b4382f 100644 --- a/third_party/WebKit/public/web/WebKit.h +++ b/third_party/WebKit/public/web/WebKit.h @@ -37,7 +37,7 @@ namespace v8 { class Isolate; } -namespace WebKit { +namespace blink { // Must be called on the thread that will be the main WebKit thread before // using any other WebKit APIs. The provided Platform; must be @@ -81,6 +81,6 @@ BLINK_EXPORT void enableLogChannel(const char*); // containing plugins will be reloaded after refreshing the plugin list. BLINK_EXPORT void resetPluginCache(bool reloadPages); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebLabelElement.h b/third_party/WebKit/public/web/WebLabelElement.h index 026af06..f1ed851 100644 --- a/third_party/WebKit/public/web/WebLabelElement.h +++ b/third_party/WebKit/public/web/WebLabelElement.h @@ -38,7 +38,7 @@ namespace WebCore { class HTMLLabelElement; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { // Provides readonly access to some properties of a DOM label element node. class WebLabelElement : public WebElement { @@ -63,6 +63,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebMIDIClient.h b/third_party/WebKit/public/web/WebMIDIClient.h index 0db27e4..9435b93 100644 --- a/third_party/WebKit/public/web/WebMIDIClient.h +++ b/third_party/WebKit/public/web/WebMIDIClient.h @@ -31,7 +31,7 @@ #ifndef WebMIDIClient_h #define WebMIDIClient_h -namespace WebKit { +namespace blink { class WebMIDIPermissionRequest; class WebMIDIClient { @@ -44,6 +44,6 @@ public: virtual void cancelSysExPermissionRequest(const WebMIDIPermissionRequest&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebMIDIClient_h diff --git a/third_party/WebKit/public/web/WebMIDIClientMock.h b/third_party/WebKit/public/web/WebMIDIClientMock.h index 1728b2a..fb39c09 100644 --- a/third_party/WebKit/public/web/WebMIDIClientMock.h +++ b/third_party/WebKit/public/web/WebMIDIClientMock.h @@ -39,7 +39,7 @@ namespace WebCore { class MIDIClientMock; } -namespace WebKit { +namespace blink { class WebMIDIPermissionRequest; class WebMIDIClientMock : public WebMIDIClient { @@ -61,6 +61,6 @@ private: WebPrivateOwnPtr<WebCore::MIDIClientMock> m_clientMock; }; -} // namespace WebKit +} // namespace blink #endif // WebMIDIClientMock_h diff --git a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h index d5f051d..fde2901 100644 --- a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h +++ b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h @@ -38,7 +38,7 @@ namespace WebCore { class MIDIAccess; } -namespace WebKit { +namespace blink { class WebSecurityOrigin; @@ -80,6 +80,6 @@ inline bool operator!=(const WebMIDIPermissionRequest& a, const WebMIDIPermissio return !(a == b); } -} // namespace WebKit +} // namespace blink #endif // WebMIDIPermissionRequest_h diff --git a/third_party/WebKit/public/web/WebMediaPlayer.h b/third_party/WebKit/public/web/WebMediaPlayer.h index 225e2cf..5eb9c06 100644 --- a/third_party/WebKit/public/web/WebMediaPlayer.h +++ b/third_party/WebKit/public/web/WebMediaPlayer.h @@ -36,7 +36,7 @@ #include "../platform/WebString.h" #include "../platform/WebTimeRange.h" -namespace WebKit { +namespace blink { class WebAudioSourceProvider; class WebAudioSourceProviderClient; @@ -159,6 +159,6 @@ public: virtual bool canEnterFullscreen() const { return false; } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebMediaPlayerAction.h b/third_party/WebKit/public/web/WebMediaPlayerAction.h index 192704f..7a3d591 100644 --- a/third_party/WebKit/public/web/WebMediaPlayerAction.h +++ b/third_party/WebKit/public/web/WebMediaPlayerAction.h @@ -31,7 +31,7 @@ #ifndef WebMediaPlayerAction_h #define WebMediaPlayerAction_h -namespace WebKit { +namespace blink { struct WebMediaPlayerAction { enum Type { @@ -51,6 +51,6 @@ struct WebMediaPlayerAction { : type(type), enable(enable) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebMediaPlayerClient.h b/third_party/WebKit/public/web/WebMediaPlayerClient.h index db613ed..d86108c 100644 --- a/third_party/WebKit/public/web/WebMediaPlayerClient.h +++ b/third_party/WebKit/public/web/WebMediaPlayerClient.h @@ -33,7 +33,7 @@ #include "WebMediaPlayer.h" -namespace WebKit { +namespace blink { class WebFrame; class WebInbandTextTrack; @@ -84,6 +84,6 @@ protected: ~WebMediaPlayerClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebMediaStreamRegistry.h b/third_party/WebKit/public/web/WebMediaStreamRegistry.h index 3d16a36..3c17812 100644 --- a/third_party/WebKit/public/web/WebMediaStreamRegistry.h +++ b/third_party/WebKit/public/web/WebMediaStreamRegistry.h @@ -33,7 +33,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { class WebMediaStream; class WebURL; @@ -43,6 +43,6 @@ public: BLINK_EXPORT static WebMediaStream lookupMediaStreamDescriptor(const WebURL&); }; -} // namespace WebKit +} // namespace blink #endif // WebMediaStreamRegistry_h diff --git a/third_party/WebKit/public/web/WebMemoryUsageInfo.h b/third_party/WebKit/public/web/WebMemoryUsageInfo.h index 1168a2c..9cfcfea 100644 --- a/third_party/WebKit/public/web/WebMemoryUsageInfo.h +++ b/third_party/WebKit/public/web/WebMemoryUsageInfo.h @@ -28,7 +28,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { struct WebMemoryUsageInfo { WebMemoryUsageInfo(const WebString& allocator, size_t allocated) @@ -46,6 +46,6 @@ struct WebMemoryUsageInfo { size_t allocatedBytes; }; -} // namespace WebKit +} // namespace blink #endif // WebMemoryUsageInfo_h diff --git a/third_party/WebKit/public/web/WebMenuItemInfo.h b/third_party/WebKit/public/web/WebMenuItemInfo.h index f15caac..2b08f42 100644 --- a/third_party/WebKit/public/web/WebMenuItemInfo.h +++ b/third_party/WebKit/public/web/WebMenuItemInfo.h @@ -36,7 +36,7 @@ #include "../platform/WebVector.h" #include "WebTextDirection.h" -namespace WebKit { +namespace blink { struct WebMenuItemInfo { enum Type { @@ -68,6 +68,6 @@ struct WebMenuItemInfo { bool checked; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNavigationPolicy.h b/third_party/WebKit/public/web/WebNavigationPolicy.h index 54bee9d..36be0db 100644 --- a/third_party/WebKit/public/web/WebNavigationPolicy.h +++ b/third_party/WebKit/public/web/WebNavigationPolicy.h @@ -31,7 +31,7 @@ #ifndef WebNavigationPolicy_h #define WebNavigationPolicy_h -namespace WebKit { +namespace blink { enum WebNavigationPolicy { WebNavigationPolicyIgnore, @@ -43,6 +43,6 @@ enum WebNavigationPolicy { WebNavigationPolicyNewPopup, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNavigationType.h b/third_party/WebKit/public/web/WebNavigationType.h index 8ca8dc6..b69b1a7 100644 --- a/third_party/WebKit/public/web/WebNavigationType.h +++ b/third_party/WebKit/public/web/WebNavigationType.h @@ -31,7 +31,7 @@ #ifndef WebNavigationType_h #define WebNavigationType_h -namespace WebKit { +namespace blink { enum WebNavigationType { WebNavigationTypeLinkClicked, @@ -42,6 +42,6 @@ enum WebNavigationType { WebNavigationTypeOther }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNetworkStateNotifier.h b/third_party/WebKit/public/web/WebNetworkStateNotifier.h index 98904cb4..5b2ec92 100644 --- a/third_party/WebKit/public/web/WebNetworkStateNotifier.h +++ b/third_party/WebKit/public/web/WebNetworkStateNotifier.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebNetworkStateNotifier { public: @@ -43,6 +43,6 @@ private: WebNetworkStateNotifier(); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNode.h b/third_party/WebKit/public/web/WebNode.h index a438644..4afdbcb 100644 --- a/third_party/WebKit/public/web/WebNode.h +++ b/third_party/WebKit/public/web/WebNode.h @@ -38,7 +38,7 @@ namespace WebCore { class Node; } -namespace WebKit { +namespace blink { class WebDOMEvent; class WebDOMEventListener; class WebDOMEventListenerPrivate; @@ -177,6 +177,6 @@ inline bool operator<(const WebNode& a, const WebNode& b) return a.lessThan(b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNodeCollection.h b/third_party/WebKit/public/web/WebNodeCollection.h index 3d78b15..a01ac7b 100644 --- a/third_party/WebKit/public/web/WebNodeCollection.h +++ b/third_party/WebKit/public/web/WebNodeCollection.h @@ -38,7 +38,7 @@ namespace WebCore { class HTMLCollection; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebNode; // Provides readonly access to some properties of a DOM node. @@ -73,6 +73,6 @@ private: mutable unsigned m_current; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNodeList.h b/third_party/WebKit/public/web/WebNodeList.h index 060a640..80484366 100644 --- a/third_party/WebKit/public/web/WebNodeList.h +++ b/third_party/WebKit/public/web/WebNodeList.h @@ -38,7 +38,7 @@ namespace WebCore { class NodeList; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebNode; // Provides readonly access to some properties of a DOM node. @@ -69,6 +69,6 @@ private: WebCore::NodeList* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNotification.h b/third_party/WebKit/public/web/WebNotification.h index be6196e..f8c84cb 100644 --- a/third_party/WebKit/public/web/WebNotification.h +++ b/third_party/WebKit/public/web/WebNotification.h @@ -43,7 +43,7 @@ namespace WTF { class AtomicString; } -namespace WebKit { +namespace blink { class WebNotificationPrivate; class WebURL; @@ -126,6 +126,6 @@ inline bool operator<(const WebNotification& a, const WebNotification& b) return a.lessThan(b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNotificationPermissionCallback.h b/third_party/WebKit/public/web/WebNotificationPermissionCallback.h index 07e85ee..e1d3261 100644 --- a/third_party/WebKit/public/web/WebNotificationPermissionCallback.h +++ b/third_party/WebKit/public/web/WebNotificationPermissionCallback.h @@ -31,7 +31,7 @@ #ifndef WebNotificationPermissionCallback_h #define WebNotificationPermissionCallback_h -namespace WebKit { +namespace blink { // Callback object used with WebNotificationPresenter. class WebNotificationPermissionCallback { @@ -46,6 +46,6 @@ protected: ~WebNotificationPermissionCallback() {} }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebNotificationPresenter.h b/third_party/WebKit/public/web/WebNotificationPresenter.h index 84d0c1a..4249d04 100644 --- a/third_party/WebKit/public/web/WebNotificationPresenter.h +++ b/third_party/WebKit/public/web/WebNotificationPresenter.h @@ -35,7 +35,7 @@ #include "WebNotificationPermissionCallback.h" #include "WebSecurityOrigin.h" -namespace WebKit { +namespace blink { class WebDocument; class WebNotification; @@ -68,6 +68,6 @@ public: virtual void requestPermission(const WebSecurityOrigin&, WebNotificationPermissionCallback*) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebOptionElement.h b/third_party/WebKit/public/web/WebOptionElement.h index d7b090b..6c941e4 100644 --- a/third_party/WebKit/public/web/WebOptionElement.h +++ b/third_party/WebKit/public/web/WebOptionElement.h @@ -38,7 +38,7 @@ namespace WebCore { class HTMLOptionElement; } #endif -namespace WebKit { +namespace blink { // Provides readonly access to some properties of a DOM option element node. class WebOptionElement : public WebElement { @@ -68,6 +68,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPageOverlay.h b/third_party/WebKit/public/web/WebPageOverlay.h index 6a7e519..397ddd5 100644 --- a/third_party/WebKit/public/web/WebPageOverlay.h +++ b/third_party/WebKit/public/web/WebPageOverlay.h @@ -32,7 +32,7 @@ #include "../platform/WebCanvas.h" #include "../platform/WebRect.h" -namespace WebKit { +namespace blink { class WebPageOverlay { public: @@ -43,6 +43,6 @@ protected: virtual ~WebPageOverlay() { } }; -} // namespace WebKit +} // namespace blink #endif // WebPageOverlay_h diff --git a/third_party/WebKit/public/web/WebPagePopup.h b/third_party/WebKit/public/web/WebPagePopup.h index 28db5bf..f933096 100644 --- a/third_party/WebKit/public/web/WebPagePopup.h +++ b/third_party/WebKit/public/web/WebPagePopup.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebWidget.h" -namespace WebKit { +namespace blink { class WebWidgetClient; @@ -43,6 +43,6 @@ public: BLINK_EXPORT static WebPagePopup* create(WebWidgetClient*); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPageSerializer.h b/third_party/WebKit/public/web/WebPageSerializer.h index e6129e7..89a3a31 100644 --- a/third_party/WebKit/public/web/WebPageSerializer.h +++ b/third_party/WebKit/public/web/WebPageSerializer.h @@ -35,7 +35,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebURL.h" -namespace WebKit { +namespace blink { class WebFrame; class WebPageSerializerClient; class WebString; @@ -114,6 +114,6 @@ public: BLINK_EXPORT static WebString generateBaseTagDeclaration(const WebString& baseTarget); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPageSerializerClient.h b/third_party/WebKit/public/web/WebPageSerializerClient.h index c30ddbc..2cdcb6e 100644 --- a/third_party/WebKit/public/web/WebPageSerializerClient.h +++ b/third_party/WebKit/public/web/WebPageSerializerClient.h @@ -31,7 +31,7 @@ #ifndef WebPageSerializerClient_h #define WebPageSerializerClient_h -namespace WebKit { +namespace blink { class WebCString; class WebURL; @@ -70,6 +70,6 @@ protected: virtual ~WebPageSerializerClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPageVisibilityState.h b/third_party/WebKit/public/web/WebPageVisibilityState.h index 8eb867f..834ca6e 100644 --- a/third_party/WebKit/public/web/WebPageVisibilityState.h +++ b/third_party/WebKit/public/web/WebPageVisibilityState.h @@ -31,7 +31,7 @@ #ifndef WebPageVisibilityState_h #define WebPageVisibilityState_h -namespace WebKit { +namespace blink { // The following enum should be consistent with the PageVisibilityState enum // defined in WebCore. @@ -42,6 +42,6 @@ enum WebPageVisibilityState { WebPageVisibilityStatePreview }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPasswordFormData.h b/third_party/WebKit/public/web/WebPasswordFormData.h index bd54f7e..84dc700 100644 --- a/third_party/WebKit/public/web/WebPasswordFormData.h +++ b/third_party/WebKit/public/web/WebPasswordFormData.h @@ -36,7 +36,7 @@ #include "../platform/WebVector.h" #include "WebFormElement.h" -namespace WebKit { +namespace blink { struct WebPasswordFormData { // If the provided form is suitable for password completion, isValid() will @@ -121,6 +121,6 @@ struct WebPasswordFormData { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPasswordGeneratorClient.h b/third_party/WebKit/public/web/WebPasswordGeneratorClient.h index 50a4130..254bedd 100644 --- a/third_party/WebKit/public/web/WebPasswordGeneratorClient.h +++ b/third_party/WebKit/public/web/WebPasswordGeneratorClient.h @@ -31,7 +31,7 @@ #ifndef WebPasswordGeneratorClient_h #define WebPasswordGeneratorClient_h -namespace WebKit { +namespace blink { class WebInputElement; diff --git a/third_party/WebKit/public/web/WebPerformance.h b/third_party/WebKit/public/web/WebPerformance.h index 8309445..99d973a 100644 --- a/third_party/WebKit/public/web/WebPerformance.h +++ b/third_party/WebKit/public/web/WebPerformance.h @@ -37,7 +37,7 @@ namespace WebCore { class Performance; } -namespace WebKit { +namespace blink { class WebPerformance { public: @@ -91,6 +91,6 @@ private: WebPrivatePtr<WebCore::Performance> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPermissionClient.h b/third_party/WebKit/public/web/WebPermissionClient.h index abc172a..2de397c 100644 --- a/third_party/WebKit/public/web/WebPermissionClient.h +++ b/third_party/WebKit/public/web/WebPermissionClient.h @@ -31,7 +31,7 @@ #ifndef WebPermissionClient_h #define WebPermissionClient_h -namespace WebKit { +namespace blink { class WebDocument; class WebFrame; @@ -114,6 +114,6 @@ protected: ~WebPermissionClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPlugin.h b/third_party/WebKit/public/web/WebPlugin.h index daf962a..4d49822 100644 --- a/third_party/WebKit/public/web/WebPlugin.h +++ b/third_party/WebKit/public/web/WebPlugin.h @@ -40,7 +40,7 @@ struct NPObject; struct _NPP; -namespace WebKit { +namespace blink { class WebDataSource; class WebDragData; @@ -159,6 +159,6 @@ protected: ~WebPlugin() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginAction.h b/third_party/WebKit/public/web/WebPluginAction.h index 89f12ed..fc03998 100644 --- a/third_party/WebKit/public/web/WebPluginAction.h +++ b/third_party/WebKit/public/web/WebPluginAction.h @@ -31,7 +31,7 @@ #ifndef WebPluginAction_h #define WebPluginAction_h -namespace WebKit { +namespace blink { struct WebPluginAction { enum Type { @@ -49,6 +49,6 @@ struct WebPluginAction { : type(type), enable(enable) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginContainer.h b/third_party/WebKit/public/web/WebPluginContainer.h index 0e25adf..ddbc6d4 100644 --- a/third_party/WebKit/public/web/WebPluginContainer.h +++ b/third_party/WebKit/public/web/WebPluginContainer.h @@ -35,7 +35,7 @@ struct NPObject; -namespace WebKit { +namespace blink { class WebElement; class WebPlugin; @@ -132,6 +132,6 @@ protected: ~WebPluginContainer() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginDocument.h b/third_party/WebKit/public/web/WebPluginDocument.h index 90aa231..86b3ba7 100644 --- a/third_party/WebKit/public/web/WebPluginDocument.h +++ b/third_party/WebKit/public/web/WebPluginDocument.h @@ -37,7 +37,7 @@ namespace WebCore { class PluginDocument; } #endif -namespace WebKit { +namespace blink { class WebPlugin; // Wraps a WebDocument for full page plugins. @@ -62,6 +62,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginParams.h b/third_party/WebKit/public/web/WebPluginParams.h index af92acf..c76a879 100644 --- a/third_party/WebKit/public/web/WebPluginParams.h +++ b/third_party/WebKit/public/web/WebPluginParams.h @@ -35,7 +35,7 @@ #include "../platform/WebURL.h" #include "../platform/WebVector.h" -namespace WebKit { +namespace blink { struct WebPluginParams { WebURL url; @@ -45,6 +45,6 @@ struct WebPluginParams { bool loadManually; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginScrollbar.h b/third_party/WebKit/public/web/WebPluginScrollbar.h index 82c4e81..7977b8a 100644 --- a/third_party/WebKit/public/web/WebPluginScrollbar.h +++ b/third_party/WebKit/public/web/WebPluginScrollbar.h @@ -28,7 +28,7 @@ #include "../platform/WebCanvas.h" #include "../platform/WebScrollbar.h" -namespace WebKit { +namespace blink { class WebInputEvent; class WebPluginContainer; @@ -71,6 +71,6 @@ public: virtual bool handleInputEvent(const WebInputEvent&) = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPluginScrollbarClient.h b/third_party/WebKit/public/web/WebPluginScrollbarClient.h index bc5a124..edd7b7c 100644 --- a/third_party/WebKit/public/web/WebPluginScrollbarClient.h +++ b/third_party/WebKit/public/web/WebPluginScrollbarClient.h @@ -25,7 +25,7 @@ #ifndef WebPluginScrollbarClient_h #define WebPluginScrollbarClient_h -namespace WebKit { +namespace blink { class WebPluginScrollbar; struct WebRect; @@ -39,6 +39,6 @@ public: virtual void getTickmarks(WebPluginScrollbar*, WebVector<WebRect>*) const = 0; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPopupMenu.h b/third_party/WebKit/public/web/WebPopupMenu.h index f97b1fa..2927672 100644 --- a/third_party/WebKit/public/web/WebPopupMenu.h +++ b/third_party/WebKit/public/web/WebPopupMenu.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "WebWidget.h" -namespace WebKit { +namespace blink { class WebWidgetClient; @@ -46,6 +46,6 @@ public: BLINK_EXPORT static void setMinimumRowHeight(int); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPopupMenuInfo.h b/third_party/WebKit/public/web/WebPopupMenuInfo.h index 45339ac..9b6eca4 100644 --- a/third_party/WebKit/public/web/WebPopupMenuInfo.h +++ b/third_party/WebKit/public/web/WebPopupMenuInfo.h @@ -34,7 +34,7 @@ #include "../platform/WebVector.h" #include "WebMenuItemInfo.h" -namespace WebKit { +namespace blink { // Describes the contents of a popup menu. struct WebPopupMenuInfo { diff --git a/third_party/WebKit/public/web/WebPopupType.h b/third_party/WebKit/public/web/WebPopupType.h index 1a84dd6..c82dcce 100644 --- a/third_party/WebKit/public/web/WebPopupType.h +++ b/third_party/WebKit/public/web/WebPopupType.h @@ -31,7 +31,7 @@ #ifndef WebPopupType_h #define WebPopupType_h -namespace WebKit { +namespace blink { enum WebPopupType { WebPopupTypeNone, // Not a popup. @@ -41,6 +41,6 @@ enum WebPopupType { WebPopupTypeHelperPlugin, // An off-screen helper plugin. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPrerendererClient.h b/third_party/WebKit/public/web/WebPrerendererClient.h index 3f73fed..a0e3eca 100644 --- a/third_party/WebKit/public/web/WebPrerendererClient.h +++ b/third_party/WebKit/public/web/WebPrerendererClient.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebPrerender; diff --git a/third_party/WebKit/public/web/WebPrintParams.h b/third_party/WebKit/public/web/WebPrintParams.h index d79260a..1f49f0e 100644 --- a/third_party/WebKit/public/web/WebPrintParams.h +++ b/third_party/WebKit/public/web/WebPrintParams.h @@ -35,7 +35,7 @@ #include "../platform/WebSize.h" #include "WebPrintScalingOption.h" -namespace WebKit { +namespace blink { struct WebPrintParams { // Specifies printable content rect in points (a point is 1/72 of an inch). @@ -74,6 +74,6 @@ struct WebPrintParams { , printScalingOption(printScalingOption) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebPrintScalingOption.h b/third_party/WebKit/public/web/WebPrintScalingOption.h index 95dbb89..adecf04 100644 --- a/third_party/WebKit/public/web/WebPrintScalingOption.h +++ b/third_party/WebKit/public/web/WebPrintScalingOption.h @@ -31,7 +31,7 @@ #ifndef WebPrintScalingOption_h #define WebPrintScalingOption_h -namespace WebKit { +namespace blink { enum WebPrintScalingOption { WebPrintScalingOptionNone, // Prints the upper left of a page without scaling. Crop the page contents that don't fit on the paper. @@ -39,6 +39,6 @@ enum WebPrintScalingOption { WebPrintScalingOptionSourceSize, // Print output page size is same as the actual source page size. Do not scale/center/fit to printable area. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebRange.h b/third_party/WebKit/public/web/WebRange.h index f1eca40..3eeeeb0 100644 --- a/third_party/WebKit/public/web/WebRange.h +++ b/third_party/WebKit/public/web/WebRange.h @@ -39,7 +39,7 @@ namespace WebCore { class Range; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { struct WebFloatQuad; class WebFrame; @@ -90,6 +90,6 @@ private: WebRangePrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebRuntimeFeatures.h b/third_party/WebKit/public/web/WebRuntimeFeatures.h index d0666f87..bf7314d 100644 --- a/third_party/WebKit/public/web/WebRuntimeFeatures.h +++ b/third_party/WebKit/public/web/WebRuntimeFeatures.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { // This class is used to enable runtime features of Blink. // All features are disabled by default. @@ -167,6 +167,6 @@ private: WebRuntimeFeatures(); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h b/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h index 50c76f7..7245cd5 100644 --- a/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h +++ b/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h @@ -33,7 +33,7 @@ #include "../platform/WebPrivateOwnPtr.h" -namespace WebKit { +namespace blink { // This class wraps V8RecursionScope::BypassMicrotaskCheckpoint. Please // see V8RecursionScope.h for full usage. Short story: Embedder calls into @@ -49,7 +49,7 @@ namespace WebKit { // // ... // { -// WebKit::WebScopedMicrotaskSuppression suppression; +// blink::WebScopedMicrotaskSuppression suppression; // func->Call(global, argv, args); // } // ... diff --git a/third_party/WebKit/public/web/WebScopedUserGesture.h b/third_party/WebKit/public/web/WebScopedUserGesture.h index 98197d6..f829834 100644 --- a/third_party/WebKit/public/web/WebScopedUserGesture.h +++ b/third_party/WebKit/public/web/WebScopedUserGesture.h @@ -37,7 +37,7 @@ namespace WebCore { class UserGestureIndicator; } -namespace WebKit { +namespace blink { class WebUserGestureToken; @@ -68,6 +68,6 @@ private: WebPrivateOwnPtr<WebCore::UserGestureIndicator> m_indicator; }; -} // namespace WebKit +} // namespace blink #endif // WebScopedUserGesture_h diff --git a/third_party/WebKit/public/web/WebScriptBindings.h b/third_party/WebKit/public/web/WebScriptBindings.h index 12b9d43..ef953b6 100644 --- a/third_party/WebKit/public/web/WebScriptBindings.h +++ b/third_party/WebKit/public/web/WebScriptBindings.h @@ -40,7 +40,7 @@ template <class T> class Handle; template <class T> class Local; } -namespace WebKit { +namespace blink { class WebString; @@ -54,6 +54,6 @@ public: BLINK_EXPORT static WebString toWebString(v8::Handle<v8::String>); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebScriptController.h b/third_party/WebKit/public/web/WebScriptController.h index bc68c28..e4a9841 100644 --- a/third_party/WebKit/public/web/WebScriptController.h +++ b/third_party/WebKit/public/web/WebScriptController.h @@ -37,7 +37,7 @@ namespace v8 { class Extension; } -namespace WebKit { +namespace blink { class WebScriptController { public: @@ -59,6 +59,6 @@ private: WebScriptController(); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebScriptSource.h b/third_party/WebKit/public/web/WebScriptSource.h index baf082c..8d27096 100644 --- a/third_party/WebKit/public/web/WebScriptSource.h +++ b/third_party/WebKit/public/web/WebScriptSource.h @@ -34,7 +34,7 @@ #include "../platform/WebString.h" #include "../platform/WebURL.h" -namespace WebKit { +namespace blink { struct WebScriptSource { WebString code; @@ -49,6 +49,6 @@ struct WebScriptSource { : code(code), url(url), startLine(startLine) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSearchableFormData.h b/third_party/WebKit/public/web/WebSearchableFormData.h index af18e9d..08a8591 100644 --- a/third_party/WebKit/public/web/WebSearchableFormData.h +++ b/third_party/WebKit/public/web/WebSearchableFormData.h @@ -35,7 +35,7 @@ #include "../platform/WebURL.h" #include "WebInputElement.h" -namespace WebKit { +namespace blink { class WebFormElement; // SearchableFormData encapsulates a URL and encoding of an INPUT field that @@ -65,6 +65,6 @@ private: WebString m_encoding; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSecurityOrigin.h b/third_party/WebKit/public/web/WebSecurityOrigin.h index 7b36270..b33f09d 100644 --- a/third_party/WebKit/public/web/WebSecurityOrigin.h +++ b/third_party/WebKit/public/web/WebSecurityOrigin.h @@ -38,7 +38,7 @@ namespace WebCore { class SecurityOrigin; } namespace WTF { template <typename T> class PassRefPtr; } #endif -namespace WebKit { +namespace blink { class WebSecurityOriginPrivate; class WebString; @@ -111,6 +111,6 @@ private: WebSecurityOriginPrivate* m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSecurityPolicy.h b/third_party/WebKit/public/web/WebSecurityPolicy.h index b5a5fcc..dc834c1 100644 --- a/third_party/WebKit/public/web/WebSecurityPolicy.h +++ b/third_party/WebKit/public/web/WebSecurityPolicy.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebReferrerPolicy.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -93,6 +93,6 @@ private: WebSecurityPolicy(); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSelectElement.h b/third_party/WebKit/public/web/WebSelectElement.h index a00d480..836959c 100644 --- a/third_party/WebKit/public/web/WebSelectElement.h +++ b/third_party/WebKit/public/web/WebSelectElement.h @@ -39,7 +39,7 @@ namespace WebCore { class HTMLSelectElement; } #endif -namespace WebKit { +namespace blink { // Provides readonly access to some properties of a DOM select element node. class WebSelectElement : public WebFormControlElement { @@ -65,6 +65,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSelector.h b/third_party/WebKit/public/web/WebSelector.h index 8a5514d..00c5e6c 100644 --- a/third_party/WebKit/public/web/WebSelector.h +++ b/third_party/WebKit/public/web/WebSelector.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebString; @@ -50,6 +50,6 @@ enum WebSelectorType { // The canonical form is not guaranteed to stay the same over time. BLINK_EXPORT WebString canonicalizeSelector(WebString selector, WebSelectorType restriction = WebSelectorTypeComplex); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSerializedScriptValue.h b/third_party/WebKit/public/web/WebSerializedScriptValue.h index 5dc3fe2..b111ef0 100644 --- a/third_party/WebKit/public/web/WebSerializedScriptValue.h +++ b/third_party/WebKit/public/web/WebSerializedScriptValue.h @@ -41,7 +41,7 @@ class Value; template <class T> class Handle; } -namespace WebKit { +namespace blink { class WebString; // FIXME: Should this class be in platform? @@ -85,6 +85,6 @@ private: WebPrivatePtr<WebCore::SerializedScriptValue> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSerializedScriptValueVersion.h b/third_party/WebKit/public/web/WebSerializedScriptValueVersion.h index 0dbeb58..1150d5b 100644 --- a/third_party/WebKit/public/web/WebSerializedScriptValueVersion.h +++ b/third_party/WebKit/public/web/WebSerializedScriptValueVersion.h @@ -31,7 +31,7 @@ #ifndef WebSerializedScriptValueVersion_h #define WebSerializedScriptValueVersion_h -namespace WebKit { +namespace blink { // SerializedScriptValue wire format version. Versions higher than // this value will not be deserializable by WebSerializedScriptValue. @@ -40,6 +40,6 @@ namespace WebKit { // before deserializing individual values. const unsigned kSerializedScriptValueVersion = 3; -} // namespace WebKit +} // namespace blink #endif // WebSerializedScriptValueVersion_h diff --git a/third_party/WebKit/public/web/WebSettings.h b/third_party/WebKit/public/web/WebSettings.h index 72f6225..6b1b65c 100644 --- a/third_party/WebKit/public/web/WebSettings.h +++ b/third_party/WebKit/public/web/WebSettings.h @@ -35,7 +35,7 @@ #include "../platform/WebSize.h" #include <unicode/uscript.h> -namespace WebKit { +namespace blink { class WebString; class WebURL; @@ -202,6 +202,6 @@ protected: ~WebSettings() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSharedWorker.h b/third_party/WebKit/public/web/WebSharedWorker.h index 67fd984..3983d46 100644 --- a/third_party/WebKit/public/web/WebSharedWorker.h +++ b/third_party/WebKit/public/web/WebSharedWorker.h @@ -38,7 +38,7 @@ namespace WebCore { class ScriptExecutionContext; } -namespace WebKit { +namespace blink { class WebString; class WebMessagePortChannel; @@ -89,6 +89,6 @@ public: virtual void dispatchDevToolsMessage(const WebString&) { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSharedWorkerClient.h b/third_party/WebKit/public/web/WebSharedWorkerClient.h index 5923704..1d953c4 100644 --- a/third_party/WebKit/public/web/WebSharedWorkerClient.h +++ b/third_party/WebKit/public/web/WebSharedWorkerClient.h @@ -33,7 +33,7 @@ #include "../platform/WebMessagePortChannel.h" -namespace WebKit { +namespace blink { class WebApplicationCacheHost; class WebApplicationCacheHostClient; @@ -73,6 +73,6 @@ protected: ~WebSharedWorkerClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h b/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h index c81a5d5..e961a73 100644 --- a/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h +++ b/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h @@ -31,7 +31,7 @@ #ifndef WebSharedWorkerRepositoryClient_h #define WebSharedWorkerRepositoryClient_h -namespace WebKit { +namespace blink { class WebString; class WebSharedWorker; @@ -49,6 +49,6 @@ public: virtual void documentDetached(DocumentID) { } }; -} // namespace WebKit +} // namespace blink #endif // WebSharedWorkerRepositoryClient_h diff --git a/third_party/WebKit/public/web/WebSocket.h b/third_party/WebKit/public/web/WebSocket.h index 9a3735c..589a509 100644 --- a/third_party/WebKit/public/web/WebSocket.h +++ b/third_party/WebKit/public/web/WebSocket.h @@ -36,7 +36,7 @@ namespace WebCore { class WebSocketChannel; } -namespace WebKit { +namespace blink { class WebArrayBuffer; class WebDocument; @@ -94,6 +94,6 @@ public: virtual void disconnect() = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebSocket_h diff --git a/third_party/WebKit/public/web/WebSocketClient.h b/third_party/WebKit/public/web/WebSocketClient.h index 3d26518..35896f8 100644 --- a/third_party/WebKit/public/web/WebSocketClient.h +++ b/third_party/WebKit/public/web/WebSocketClient.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebArrayBuffer; class WebString; @@ -55,6 +55,6 @@ public: virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const WebString& reason) { } }; -} // namespace WebKit +} // namespace blink #endif // WebSocketClient_h diff --git a/third_party/WebKit/public/web/WebSpeechGrammar.h b/third_party/WebKit/public/web/WebSpeechGrammar.h index c5267f1..6c6f137 100644 --- a/third_party/WebKit/public/web/WebSpeechGrammar.h +++ b/third_party/WebKit/public/web/WebSpeechGrammar.h @@ -34,7 +34,7 @@ namespace WebCore { class SpeechGrammar; } -namespace WebKit { +namespace blink { class WebSpeechGrammar { public: @@ -57,6 +57,6 @@ private: WebPrivatePtr<WebCore::SpeechGrammar> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechGrammar_h diff --git a/third_party/WebKit/public/web/WebSpeechInputController.h b/third_party/WebKit/public/web/WebSpeechInputController.h index 9cc0d1f..6556330 100644 --- a/third_party/WebKit/public/web/WebSpeechInputController.h +++ b/third_party/WebKit/public/web/WebSpeechInputController.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { struct WebRect; class WebSecurityOrigin; @@ -67,6 +67,6 @@ protected: virtual ~WebSpeechInputController() { } }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechInputController_h diff --git a/third_party/WebKit/public/web/WebSpeechInputListener.h b/third_party/WebKit/public/web/WebSpeechInputListener.h index 1838ba0..e352a19 100644 --- a/third_party/WebKit/public/web/WebSpeechInputListener.h +++ b/third_party/WebKit/public/web/WebSpeechInputListener.h @@ -33,7 +33,7 @@ #include "WebSpeechInputResult.h" -namespace WebKit { +namespace blink { class WebString; @@ -67,6 +67,6 @@ protected: ~WebSpeechInputListener() { } }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechInputListener_h diff --git a/third_party/WebKit/public/web/WebSpeechInputResult.h b/third_party/WebKit/public/web/WebSpeechInputResult.h index 4f4ac95..2222690 100644 --- a/third_party/WebKit/public/web/WebSpeechInputResult.h +++ b/third_party/WebKit/public/web/WebSpeechInputResult.h @@ -35,7 +35,7 @@ namespace WebCore { class SpeechInputResult; } -namespace WebKit { +namespace blink { // This class holds one speech recognition result including the text and other related // fields, as received from the embedder. @@ -66,6 +66,6 @@ private: typedef WebVector<WebSpeechInputResult> WebSpeechInputResultArray; -} // namespace WebKit +} // namespace blink #endif // WebSpeechInputResult_h diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h index af1d917..432d8fd 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h +++ b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h @@ -33,7 +33,7 @@ namespace WebCore { class SpeechRecognition; } -namespace WebKit { +namespace blink { class WebSpeechRecognitionResult; class WebString; @@ -86,6 +86,6 @@ inline bool operator<(const WebSpeechRecognitionHandle& a, const WebSpeechRecogn return a.lessThan(b); } -} // namespace WebKit +} // namespace blink #endif // WebSpeechRecognitionHandle_h diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionParams.h b/third_party/WebKit/public/web/WebSpeechRecognitionParams.h index 9bd105e..fd06810 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognitionParams.h +++ b/third_party/WebKit/public/web/WebSpeechRecognitionParams.h @@ -31,7 +31,7 @@ #include "WebSecurityOrigin.h" #include "WebSpeechGrammar.h" -namespace WebKit { +namespace blink { class WebSpeechGrammar; @@ -63,6 +63,6 @@ private: WebSecurityOrigin m_origin; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechRecognitionParams_h diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h index 1a224a0..e070ca2 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h +++ b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h @@ -35,7 +35,7 @@ namespace WebCore { class SpeechRecognitionResult; } -namespace WebKit { +namespace blink { class WebSpeechRecognitionResult { public: @@ -55,6 +55,6 @@ private: WebPrivatePtr<WebCore::SpeechRecognitionResult> m_private; }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechRecognitionResult_h diff --git a/third_party/WebKit/public/web/WebSpeechRecognizer.h b/third_party/WebKit/public/web/WebSpeechRecognizer.h index df54e79..91ec057 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognizer.h +++ b/third_party/WebKit/public/web/WebSpeechRecognizer.h @@ -29,7 +29,7 @@ #include "../platform/WebCommon.h" #include "WebSpeechRecognitionHandle.h" -namespace WebKit { +namespace blink { class WebSpeechGrammar; class WebSpeechRecognitionParams; @@ -51,6 +51,6 @@ protected: virtual ~WebSpeechRecognizer() { } }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechRecognizer_h diff --git a/third_party/WebKit/public/web/WebSpeechRecognizerClient.h b/third_party/WebKit/public/web/WebSpeechRecognizerClient.h index d32451e..185509f 100644 --- a/third_party/WebKit/public/web/WebSpeechRecognizerClient.h +++ b/third_party/WebKit/public/web/WebSpeechRecognizerClient.h @@ -28,7 +28,7 @@ #include "../platform/WebVector.h" -namespace WebKit { +namespace blink { class WebSpeechRecognitionResult; class WebSpeechRecognitionHandle; @@ -94,6 +94,6 @@ protected: virtual ~WebSpeechRecognizerClient() {} }; -} // namespace WebKit +} // namespace blink #endif // WebSpeechRecognizerClient_h diff --git a/third_party/WebKit/public/web/WebSpellCheckClient.h b/third_party/WebKit/public/web/WebSpellCheckClient.h index 110a491..ec4823a 100644 --- a/third_party/WebKit/public/web/WebSpellCheckClient.h +++ b/third_party/WebKit/public/web/WebSpellCheckClient.h @@ -35,7 +35,7 @@ #include "../platform/WebVector.h" #include "WebTextCheckingType.h" -namespace WebKit { +namespace blink { class WebString; class WebTextCheckingCompletion; @@ -84,6 +84,6 @@ protected: ~WebSpellCheckClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebStorageEventDispatcher.h b/third_party/WebKit/public/web/WebStorageEventDispatcher.h index 32f260d..20c6568 100644 --- a/third_party/WebKit/public/web/WebStorageEventDispatcher.h +++ b/third_party/WebKit/public/web/WebStorageEventDispatcher.h @@ -33,7 +33,7 @@ #include "../platform/WebString.h" -namespace WebKit { +namespace blink { class WebStorageArea; class WebStorageNamespace; @@ -59,6 +59,6 @@ public: WebStorageEventDispatcher() { } }; -} // namespace WebKit +} // namespace blink #endif // WebStorageEventDispatcher_h diff --git a/third_party/WebKit/public/web/WebSurroundingText.h b/third_party/WebKit/public/web/WebSurroundingText.h index 85949a8..aa6e268 100644 --- a/third_party/WebKit/public/web/WebSurroundingText.h +++ b/third_party/WebKit/public/web/WebSurroundingText.h @@ -34,7 +34,7 @@ namespace WebCore { class SurroundingText; } -namespace WebKit { +namespace blink { class WebHitTestResult; class WebNode; @@ -65,6 +65,6 @@ protected: WebPrivateOwnPtr<WebCore::SurroundingText> m_private; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTestingSupport.h b/third_party/WebKit/public/web/WebTestingSupport.h index 8e5be8a..5d3ace8 100644 --- a/third_party/WebKit/public/web/WebTestingSupport.h +++ b/third_party/WebKit/public/web/WebTestingSupport.h @@ -28,7 +28,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebFrame; diff --git a/third_party/WebKit/public/web/WebTextAffinity.h b/third_party/WebKit/public/web/WebTextAffinity.h index 1224f61..54e1d98 100644 --- a/third_party/WebKit/public/web/WebTextAffinity.h +++ b/third_party/WebKit/public/web/WebTextAffinity.h @@ -31,7 +31,7 @@ #ifndef WebTextAffinity_h #define WebTextAffinity_h -namespace WebKit { +namespace blink { // These constants specify the preferred direction of selection. enum WebTextAffinity { @@ -39,6 +39,6 @@ enum WebTextAffinity { WebTextAffinityDownstream, // The selection is moving toward the bottom of the document. }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextAreaElement.h b/third_party/WebKit/public/web/WebTextAreaElement.h index fb7f0cc..fae3995 100644 --- a/third_party/WebKit/public/web/WebTextAreaElement.h +++ b/third_party/WebKit/public/web/WebTextAreaElement.h @@ -37,7 +37,7 @@ namespace WebCore { class HTMLTextAreaElement; } #endif -namespace WebKit { +namespace blink { // Provides access to some properties of a DOM textarea element node. class WebTextAreaElement : public WebFormControlElement { @@ -62,6 +62,6 @@ public: #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextCheckingCompletion.h b/third_party/WebKit/public/web/WebTextCheckingCompletion.h index 8bad8a8..a639954 100644 --- a/third_party/WebKit/public/web/WebTextCheckingCompletion.h +++ b/third_party/WebKit/public/web/WebTextCheckingCompletion.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { struct WebTextCheckingResult; template <typename T> class WebVector; @@ -47,6 +47,6 @@ protected: ~WebTextCheckingCompletion() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextCheckingResult.h b/third_party/WebKit/public/web/WebTextCheckingResult.h index 35bf3a4..088ab74 100644 --- a/third_party/WebKit/public/web/WebTextCheckingResult.h +++ b/third_party/WebKit/public/web/WebTextCheckingResult.h @@ -39,7 +39,7 @@ namespace WebCore { struct TextCheckingResult; } -namespace WebKit { +namespace blink { // A checked entry of text checking. struct WebTextCheckingResult { @@ -71,6 +71,6 @@ struct WebTextCheckingResult { uint32_t hash; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextCheckingType.h b/third_party/WebKit/public/web/WebTextCheckingType.h index bd050fa..486cf0e 100644 --- a/third_party/WebKit/public/web/WebTextCheckingType.h +++ b/third_party/WebKit/public/web/WebTextCheckingType.h @@ -31,7 +31,7 @@ #ifndef WebTextCheckingType_h #define WebTextCheckingType_h -namespace WebKit { +namespace blink { enum WebTextCheckingType { WebTextCheckingTypeSpelling = 1 << 1, @@ -40,6 +40,6 @@ enum WebTextCheckingType { typedef unsigned WebTextCheckingTypeMask; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextDecorationType.h b/third_party/WebKit/public/web/WebTextDecorationType.h index 7a6318f..533c46b 100644 --- a/third_party/WebKit/public/web/WebTextDecorationType.h +++ b/third_party/WebKit/public/web/WebTextDecorationType.h @@ -31,7 +31,7 @@ #ifndef WebTextDecorationType_h #define WebTextDecorationType_h -namespace WebKit { +namespace blink { enum WebTextDecorationType { WebTextDecorationTypeSpelling = 1 << 1, @@ -39,6 +39,6 @@ enum WebTextDecorationType { WebTextDecorationTypeInvisibleSpellcheck = 1 << 3, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextDirection.h b/third_party/WebKit/public/web/WebTextDirection.h index 3d51296..3bdbb9e 100644 --- a/third_party/WebKit/public/web/WebTextDirection.h +++ b/third_party/WebKit/public/web/WebTextDirection.h @@ -31,7 +31,7 @@ #ifndef WebTextDirection_h #define WebTextDirection_h -namespace WebKit { +namespace blink { // Represents text directions (or writing directions) of a DOM node. enum WebTextDirection { @@ -40,6 +40,6 @@ enum WebTextDirection { WebTextDirectionRightToLeft, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextInputInfo.h b/third_party/WebKit/public/web/WebTextInputInfo.h index cf81f17..dc3ff40 100644 --- a/third_party/WebKit/public/web/WebTextInputInfo.h +++ b/third_party/WebKit/public/web/WebTextInputInfo.h @@ -29,7 +29,7 @@ #include "../platform/WebString.h" #include "WebTextInputType.h" -namespace WebKit { +namespace blink { struct WebTextInputInfo { WebTextInputType type; @@ -77,6 +77,6 @@ inline bool operator!=(const WebTextInputInfo& a, const WebTextInputInfo& b) return !(a == b); } -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextInputType.h b/third_party/WebKit/public/web/WebTextInputType.h index fea0c45..77ea444 100644 --- a/third_party/WebKit/public/web/WebTextInputType.h +++ b/third_party/WebKit/public/web/WebTextInputType.h @@ -31,7 +31,7 @@ #ifndef WebTextInputType_h #define WebTextInputType_h -namespace WebKit { +namespace blink { enum WebTextInputType { // Input caret is not in an editable node, no input method shall be used. @@ -68,6 +68,6 @@ enum WebTextInputType { WebTextInputTypeDateTimeField, }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTextRun.h b/third_party/WebKit/public/web/WebTextRun.h index 15315cf..64504ef 100644 --- a/third_party/WebKit/public/web/WebTextRun.h +++ b/third_party/WebKit/public/web/WebTextRun.h @@ -37,7 +37,7 @@ namespace WebCore { class TextRun; } #endif -namespace WebKit { +namespace blink { struct WebTextRun { WebTextRun(const WebString& t, bool isRTL, bool hasDirectionalOverride) @@ -63,6 +63,6 @@ struct WebTextRun { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebTouchPoint.h b/third_party/WebKit/public/web/WebTouchPoint.h index bfad695..0093f0f 100644 --- a/third_party/WebKit/public/web/WebTouchPoint.h +++ b/third_party/WebKit/public/web/WebTouchPoint.h @@ -34,7 +34,7 @@ #include "../platform/WebCommon.h" #include "../platform/WebPoint.h" -namespace WebKit { +namespace blink { class WebTouchPoint { public: @@ -68,6 +68,6 @@ public: float force; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebURLLoaderOptions.h b/third_party/WebKit/public/web/WebURLLoaderOptions.h index d32b0ce..045595d 100644 --- a/third_party/WebKit/public/web/WebURLLoaderOptions.h +++ b/third_party/WebKit/public/web/WebURLLoaderOptions.h @@ -31,7 +31,7 @@ #ifndef WebURLLoaderOptions_h #define WebURLLoaderOptions_h -namespace WebKit { +namespace blink { struct WebURLLoaderOptions { @@ -58,6 +58,6 @@ struct WebURLLoaderOptions { CrossOriginRequestPolicy crossOriginRequestPolicy; }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebUserGestureIndicator.h b/third_party/WebKit/public/web/WebUserGestureIndicator.h index 25364eb..b7c7f3c 100644 --- a/third_party/WebKit/public/web/WebUserGestureIndicator.h +++ b/third_party/WebKit/public/web/WebUserGestureIndicator.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebUserGestureToken; diff --git a/third_party/WebKit/public/web/WebUserGestureToken.h b/third_party/WebKit/public/web/WebUserGestureToken.h index 7f0986d..4251dcd 100644 --- a/third_party/WebKit/public/web/WebUserGestureToken.h +++ b/third_party/WebKit/public/web/WebUserGestureToken.h @@ -37,7 +37,7 @@ namespace WebCore { class UserGestureToken; } -namespace WebKit { +namespace blink { // A WebUserGestureToken allows for storing the user gesture state of the // currently active context and reinstantiating it later on to continue @@ -70,6 +70,6 @@ private: WebPrivatePtr<WebCore::UserGestureToken> m_token; }; -} // namespace WebKit +} // namespace blink #endif // WebUserGestureToken_h diff --git a/third_party/WebKit/public/web/WebUserMediaClient.h b/third_party/WebKit/public/web/WebUserMediaClient.h index e894567..877fc7b 100644 --- a/third_party/WebKit/public/web/WebUserMediaClient.h +++ b/third_party/WebKit/public/web/WebUserMediaClient.h @@ -31,7 +31,7 @@ #ifndef WebUserMediaClient_h #define WebUserMediaClient_h -namespace WebKit { +namespace blink { class WebMediaStreamSource; class WebUserMediaRequest; @@ -45,6 +45,6 @@ public: virtual void cancelUserMediaRequest(const WebUserMediaRequest&) = 0; }; -} // namespace WebKit +} // namespace blink #endif // WebUserMediaClient_h diff --git a/third_party/WebKit/public/web/WebUserMediaRequest.h b/third_party/WebKit/public/web/WebUserMediaRequest.h index 9a33d1e..562e77b 100644 --- a/third_party/WebKit/public/web/WebUserMediaRequest.h +++ b/third_party/WebKit/public/web/WebUserMediaRequest.h @@ -40,7 +40,7 @@ namespace WebCore { class UserMediaRequest; } -namespace WebKit { +namespace blink { class WebDocument; class WebMediaConstraints; class WebMediaStream; @@ -92,6 +92,6 @@ inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& return a.equals(b); } -} // namespace WebKit +} // namespace blink #endif // WebUserMediaRequest_h diff --git a/third_party/WebKit/public/web/WebValidationMessageClient.h b/third_party/WebKit/public/web/WebValidationMessageClient.h index 354606b..8d827ec 100644 --- a/third_party/WebKit/public/web/WebValidationMessageClient.h +++ b/third_party/WebKit/public/web/WebValidationMessageClient.h @@ -33,7 +33,7 @@ #include "WebTextDirection.h" -namespace WebKit { +namespace blink { class WebString; struct WebRect; @@ -58,6 +58,6 @@ protected: virtual ~WebValidationMessageClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebView.h b/third_party/WebKit/public/web/WebView.h index 6f330bc..911ea47 100644 --- a/third_party/WebKit/public/web/WebView.h +++ b/third_party/WebKit/public/web/WebView.h @@ -38,7 +38,7 @@ #include "WebPageVisibilityState.h" #include "WebWidget.h" -namespace WebKit { +namespace blink { class WebAXObject; class WebAutofillClient; @@ -517,6 +517,6 @@ protected: ~WebView() {} }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebViewClient.h b/third_party/WebKit/public/web/WebViewClient.h index 0000ff6..740e820 100644 --- a/third_party/WebKit/public/web/WebViewClient.h +++ b/third_party/WebKit/public/web/WebViewClient.h @@ -45,7 +45,7 @@ #include "WebTextDirection.h" #include "WebWidgetClient.h" -namespace WebKit { +namespace blink { class WebAXObject; class WebColorChooser; @@ -387,6 +387,6 @@ protected: ~WebViewClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebWidget.h b/third_party/WebKit/public/web/WebWidget.h index e80763e..28753cc 100644 --- a/third_party/WebKit/public/web/WebWidget.h +++ b/third_party/WebKit/public/web/WebWidget.h @@ -39,7 +39,7 @@ #include "WebTextDirection.h" #include "WebTextInputInfo.h" -namespace WebKit { +namespace blink { class WebInputEvent; class WebLayerTreeView; @@ -262,6 +262,6 @@ protected: ~WebWidget() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h index 69bfacf..ad70699 100644 --- a/third_party/WebKit/public/web/WebWidgetClient.h +++ b/third_party/WebKit/public/web/WebWidgetClient.h @@ -37,7 +37,7 @@ #include "WebScreenInfo.h" #include "../platform/WebLayerTreeView.h" -namespace WebKit { +namespace blink { class WebGestureEvent; class WebString; @@ -176,6 +176,6 @@ protected: ~WebWidgetClient() { } }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebWindowFeatures.h b/third_party/WebKit/public/web/WebWindowFeatures.h index 5df1a4d..9e8581e 100644 --- a/third_party/WebKit/public/web/WebWindowFeatures.h +++ b/third_party/WebKit/public/web/WebWindowFeatures.h @@ -39,7 +39,7 @@ #include "core/page/WindowFeatures.h" #endif -namespace WebKit { +namespace blink { struct WebWindowFeatures { float x; @@ -127,6 +127,6 @@ struct WebWindowFeatures { #endif }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/WebWorkerInfo.h b/third_party/WebKit/public/web/WebWorkerInfo.h index 5b001144..e5d62c2 100644 --- a/third_party/WebKit/public/web/WebWorkerInfo.h +++ b/third_party/WebKit/public/web/WebWorkerInfo.h @@ -33,7 +33,7 @@ #include "../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebWorkerInfo { public: diff --git a/third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h b/third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h index c68cd36..cbb6824 100644 --- a/third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h +++ b/third_party/WebKit/public/web/WebWorkerPermissionClientProxy.h @@ -31,7 +31,7 @@ #ifndef WebWorkerPermissionClientProxy_h #define WebWorkerPermissionClientProxy_h -namespace WebKit { +namespace blink { class WebString; @@ -59,6 +59,6 @@ public: } }; -} // namespace WebKit +} // namespace blink #endif // WebWorkerPermissionClientProxy_h diff --git a/third_party/WebKit/public/web/android/WebInputEventFactory.h b/third_party/WebKit/public/web/android/WebInputEventFactory.h index 7528141..29c01b3 100644 --- a/third_party/WebKit/public/web/android/WebInputEventFactory.h +++ b/third_party/WebKit/public/web/android/WebInputEventFactory.h @@ -34,7 +34,7 @@ #include "../../platform/WebCommon.h" #include "../WebInputEvent.h" -namespace WebKit { +namespace blink { class WebKeyboardEvent; @@ -88,6 +88,6 @@ public: int modifiers); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/default/WebRenderTheme.h b/third_party/WebKit/public/web/default/WebRenderTheme.h index 6a42531..7fc653c 100644 --- a/third_party/WebKit/public/web/default/WebRenderTheme.h +++ b/third_party/WebKit/public/web/default/WebRenderTheme.h @@ -33,11 +33,11 @@ #include "../../platform/WebCommon.h" -namespace WebKit { +namespace blink { // Set caret blink interval for text input areas. BLINK_EXPORT void setCaretBlinkInterval(double); -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/gtk/WebInputEventFactory.h b/third_party/WebKit/public/web/gtk/WebInputEventFactory.h index 1f6917f..cf4bf70 100644 --- a/third_party/WebKit/public/web/gtk/WebInputEventFactory.h +++ b/third_party/WebKit/public/web/gtk/WebInputEventFactory.h @@ -39,7 +39,7 @@ typedef struct _GdkEventCrossing GdkEventCrossing; typedef struct _GdkEventScroll GdkEventScroll; typedef struct _GdkEventKey GdkEventKey; -namespace WebKit { +namespace blink { class WebKeyboardEvent; class WebMouseEvent; @@ -55,6 +55,6 @@ public: BLINK_EXPORT static WebMouseWheelEvent mouseWheelEvent(const GdkEventScroll*); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/linux/WebFontRendering.h b/third_party/WebKit/public/web/linux/WebFontRendering.h index 27ff94f..34bc45c 100644 --- a/third_party/WebKit/public/web/linux/WebFontRendering.h +++ b/third_party/WebKit/public/web/linux/WebFontRendering.h @@ -35,7 +35,7 @@ #include <SkFontHost.h> #include <SkPaint.h> -namespace WebKit { +namespace blink { class WebFontRendering { public: @@ -51,6 +51,6 @@ public: BLINK_EXPORT static void setLCDOrientation(SkFontHost::LCDOrientation); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/mac/WebInputEventFactory.h b/third_party/WebKit/public/web/mac/WebInputEventFactory.h index 2a2ae1f..51e955c 100644 --- a/third_party/WebKit/public/web/mac/WebInputEventFactory.h +++ b/third_party/WebKit/public/web/mac/WebInputEventFactory.h @@ -41,7 +41,7 @@ class NSEvent; class NSView; #endif -namespace WebKit { +namespace blink { class WebKeyboardEvent; class WebMouseEvent; @@ -57,6 +57,6 @@ public: BLINK_EXPORT static WebGestureEvent gestureEvent(NSEvent *, NSView *); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/mac/WebScrollbarTheme.h b/third_party/WebKit/public/web/mac/WebScrollbarTheme.h index 48a2afc..66cff89 100644 --- a/third_party/WebKit/public/web/mac/WebScrollbarTheme.h +++ b/third_party/WebKit/public/web/mac/WebScrollbarTheme.h @@ -33,7 +33,7 @@ #include "public/platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebScrollbarTheme { public: @@ -47,6 +47,6 @@ public: bool jumpOnTrackClick, bool redraw); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/mac/WebSubstringUtil.h b/third_party/WebKit/public/web/mac/WebSubstringUtil.h index e550481..3668cfb 100644 --- a/third_party/WebKit/public/web/mac/WebSubstringUtil.h +++ b/third_party/WebKit/public/web/mac/WebSubstringUtil.h @@ -33,7 +33,7 @@ #include "../../platform/WebCommon.h" -namespace WebKit { +namespace blink { class WebFrame; } @@ -43,7 +43,7 @@ class WebFrame; class NSAttributedString; #endif -namespace WebKit { +namespace blink { class WebSubstringUtil { public: @@ -54,6 +54,6 @@ public: size_t length); }; -} // namespace WebKit +} // namespace blink #endif diff --git a/third_party/WebKit/public/web/win/WebInputEventFactory.h b/third_party/WebKit/public/web/win/WebInputEventFactory.h index 329b06d..55b5ab2 100644 --- a/third_party/WebKit/public/web/win/WebInputEventFactory.h +++ b/third_party/WebKit/public/web/win/WebInputEventFactory.h @@ -35,7 +35,7 @@ #include <windows.h> -namespace WebKit { +namespace blink { class WebKeyboardEvent; class WebMouseEvent; @@ -56,6 +56,6 @@ public: BLINK_EXPORT static void resetLastClickState(); }; -} // namespace WebKit +} // namespace blink #endif |