| Index: webkit/renderer/dom_storage/dom_storage_cached_area.cc
|
| ===================================================================
|
| --- webkit/renderer/dom_storage/dom_storage_cached_area.cc (revision 0)
|
| +++ webkit/renderer/dom_storage/dom_storage_cached_area.cc (working copy)
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/dom_storage/dom_storage_cached_area.h"
|
| +#include "webkit/renderer/dom_storage/dom_storage_cached_area.h"
|
|
|
| #include "base/basictypes.h"
|
| #include "base/time.h"
|
| #include "base/metrics/histogram.h"
|
| -#include "webkit/dom_storage/dom_storage_map.h"
|
| -#include "webkit/dom_storage/dom_storage_proxy.h"
|
| +#include "webkit/common/dom_storage/dom_storage_map.h"
|
| +#include "webkit/renderer/dom_storage/dom_storage_proxy.h"
|
|
|
| namespace dom_storage {
|
|
|
| @@ -91,7 +91,7 @@
|
|
|
| void DomStorageCachedArea::ApplyMutation(
|
| const NullableString16& key, const NullableString16& new_value) {
|
| - if (!map_ || ignore_all_mutations_)
|
| + if (!map_.get() || ignore_all_mutations_)
|
| return;
|
|
|
| if (key.is_null()) {
|
| @@ -135,11 +135,11 @@
|
| }
|
|
|
| size_t DomStorageCachedArea::MemoryBytesUsedByCache() const {
|
| - return map_ ? map_->bytes_used() : 0;
|
| + return map_.get() ? map_->bytes_used() : 0;
|
| }
|
|
|
| void DomStorageCachedArea::Prime(int connection_id) {
|
| - DCHECK(!map_);
|
| + DCHECK(!map_.get());
|
|
|
| // The LoadArea method is actually synchronous, but we have to
|
| // wait for an asyncly delivered message to know when incoming
|
|
|