diff options
| -rw-r--r-- | content/renderer/DEPS | 1 | ||||
| -rw-r--r-- | content/renderer/renderer_webstoragearea_impl.cc | 19 | ||||
| -rw-r--r-- | content/renderer/renderer_webstoragearea_impl.h | 6 | ||||
| -rw-r--r-- | content/renderer/renderer_webstoragenamespace_impl.cc | 2 |
4 files changed, 4 insertions, 24 deletions
diff --git a/content/renderer/DEPS b/content/renderer/DEPS index 92d3df3..4d577da 100644 --- a/content/renderer/DEPS +++ b/content/renderer/DEPS @@ -1,6 +1,5 @@ include_rules = [
"-chrome",
- "+chrome/renderer/content_settings_observer.h", # TODO(jam): remove after merge!
"+chrome/test",
"+content/plugin", # For shared npruntime proxying code.
"+third_party/mach_override",
diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc index 4f9a5c6..6246d4f 100644 --- a/content/renderer/renderer_webstoragearea_impl.cc +++ b/content/renderer/renderer_webstoragearea_impl.cc @@ -4,9 +4,6 @@ #include "content/renderer/renderer_webstoragearea_impl.h" -// TODO(jam): temporary include until webkit merge -#include "chrome/renderer/content_settings_observer.h" - #include "content/common/dom_storage_messages.h" #include "content/renderer/render_thread.h" #include "content/renderer/render_view.h" @@ -20,8 +17,7 @@ using WebKit::WebURL; using WebKit::WebView; RendererWebStorageAreaImpl::RendererWebStorageAreaImpl( - int64 namespace_id, const WebString& origin, DOMStorageType storage_type) - : storage_type_(storage_type) { + int64 namespace_id, const WebString& origin) { RenderThread::current()->Send( new DOMStorageHostMsg_StorageAreaId(namespace_id, origin, &storage_area_id_)); @@ -58,19 +54,8 @@ void RendererWebStorageAreaImpl::setItem( int32 render_view_id = MSG_ROUTING_CONTROL; if (web_frame) { RenderView* render_view = RenderView::FromWebView(web_frame->view()); - if (render_view) { + if (render_view) render_view_id = render_view->routing_id(); - - // TODO(jam): remove after merge - ContentSettingsObserver* content_setting = - ContentSettingsObserver::Get(render_view); - if (!content_setting->AllowStorage( - web_frame, storage_type_ == DOM_STORAGE_LOCAL)) { - result = WebStorageArea::ResultBlockedByQuota; - old_value_webkit = NullableString16(); - return; - } - } } DCHECK(render_view_id != MSG_ROUTING_CONTROL); diff --git a/content/renderer/renderer_webstoragearea_impl.h b/content/renderer/renderer_webstoragearea_impl.h index 743f59a33..dba539e 100644 --- a/content/renderer/renderer_webstoragearea_impl.h +++ b/content/renderer/renderer_webstoragearea_impl.h @@ -7,15 +7,13 @@ #pragma once #include "base/basictypes.h" -#include "content/common/dom_storage_common.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { public: RendererWebStorageAreaImpl(int64 namespace_id, - const WebKit::WebString& origin, - DOMStorageType storage_type); + const WebKit::WebString& origin); virtual ~RendererWebStorageAreaImpl(); // See WebStorageArea.h for documentation on these functions. @@ -34,8 +32,6 @@ class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { private: // The ID we use for all IPC. int64 storage_area_id_; - - const DOMStorageType storage_type_; }; #endif // CONTENT_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_ diff --git a/content/renderer/renderer_webstoragenamespace_impl.cc b/content/renderer/renderer_webstoragenamespace_impl.cc index c344c4a..25278be 100644 --- a/content/renderer/renderer_webstoragenamespace_impl.cc +++ b/content/renderer/renderer_webstoragenamespace_impl.cc @@ -34,7 +34,7 @@ WebStorageArea* RendererWebStorageNamespaceImpl::createStorageArea( // this doesn't seem practical because there's no good way to ref-count these // objects, and it'd be unclear who owned them. So, instead, we'll pay the // price in terms of wasted memory. - return new RendererWebStorageAreaImpl(namespace_id_, origin, storage_type_); + return new RendererWebStorageAreaImpl(namespace_id_, origin); } WebStorageNamespace* RendererWebStorageNamespaceImpl::copy() { |