| Index: webkit/dom_storage/dom_storage_area.cc
|
| ===================================================================
|
| --- webkit/dom_storage/dom_storage_area.cc (revision 0)
|
| +++ webkit/dom_storage/dom_storage_area.cc (working copy)
|
| @@ -1,80 +1,47 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/browser/in_process_webkit/dom_storage_area.h"
|
| +#include "webkit/dom_storage/dom_storage_area.h"
|
|
|
| -#include "base/logging.h"
|
| -#include "content/browser/in_process_webkit/dom_storage_context.h"
|
| -#include "content/browser/in_process_webkit/dom_storage_namespace.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
|
| -#include "webkit/glue/webkit_glue.h"
|
| +namespace dom_storage {
|
|
|
| -using WebKit::WebSecurityOrigin;
|
| -using WebKit::WebStorageArea;
|
| -using WebKit::WebString;
|
| -using WebKit::WebURL;
|
| -
|
| DOMStorageArea::DOMStorageArea(
|
| - const string16& origin,
|
| - int64 id,
|
| - DOMStorageNamespace* owner)
|
| - : origin_(origin),
|
| - origin_url_(origin),
|
| - id_(id),
|
| - owner_(owner) {
|
| - DCHECK(owner_);
|
| + const GURL& origin, const FilePath& backing_file) {
|
| }
|
|
|
| DOMStorageArea::~DOMStorageArea() {
|
| }
|
|
|
| -unsigned DOMStorageArea::Length() {
|
| - CreateWebStorageAreaIfNecessary();
|
| - return storage_area_->length();
|
| +int DOMStorageArea::Length() {
|
| + return 0;
|
| }
|
|
|
| -NullableString16 DOMStorageArea::Key(unsigned index) {
|
| - CreateWebStorageAreaIfNecessary();
|
| - return storage_area_->key(index);
|
| +NullableString16 DOMStorageArea::Key(int index) {
|
| + return NullableString16(true);
|
| }
|
|
|
| NullableString16 DOMStorageArea::GetItem(const string16& key) {
|
| - CreateWebStorageAreaIfNecessary();
|
| - return storage_area_->getItem(key);
|
| + return NullableString16(true);
|
| }
|
|
|
| -NullableString16 DOMStorageArea::SetItem(
|
| +bool DOMStorageArea::SetItem(
|
| const string16& key, const string16& value,
|
| - WebStorageArea::Result* result) {
|
| - CreateWebStorageAreaIfNecessary();
|
| - WebString old_value;
|
| - storage_area_->setItem(key, value, WebURL(), *result, old_value);
|
| - return old_value;
|
| + NullableString16* old_value) {
|
| + return false;
|
| }
|
|
|
| -NullableString16 DOMStorageArea::RemoveItem(const string16& key) {
|
| - CreateWebStorageAreaIfNecessary();
|
| - WebString old_value;
|
| - storage_area_->removeItem(key, WebURL(), old_value);
|
| - return old_value;
|
| +bool DOMStorageArea::RemoveItem(
|
| + const string16& key,
|
| + NullableString16* old_value) {
|
| + return false;
|
| }
|
|
|
| bool DOMStorageArea::Clear() {
|
| - CreateWebStorageAreaIfNecessary();
|
| - bool somethingCleared;
|
| - storage_area_->clear(WebURL(), somethingCleared);
|
| - return somethingCleared;
|
| + return false;
|
| }
|
|
|
| void DOMStorageArea::PurgeMemory() {
|
| - storage_area_.reset();
|
| }
|
|
|
| -void DOMStorageArea::CreateWebStorageAreaIfNecessary() {
|
| - if (!storage_area_.get())
|
| - storage_area_.reset(owner_->CreateWebStorageArea(origin_));
|
| -}
|
| +} // namespace dom_storage
|
|
|