Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1625)

Unified Diff: Source/web/StorageAreaProxy.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/StorageAreaProxy.h ('k') | Source/web/StorageNamespaceProxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/StorageAreaProxy.cpp
diff --git a/Source/web/StorageAreaProxy.cpp b/Source/web/StorageAreaProxy.cpp
index de26f06dcd8ce07be46cff5eb43c7193571e408a..e669b1faaf79bfb96d98dfe2fe1d586d756a7c3c 100644
--- a/Source/web/StorageAreaProxy.cpp
+++ b/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());
« no previous file with comments | « Source/web/StorageAreaProxy.h ('k') | Source/web/StorageNamespaceProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698