diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebCore/storage/LocalStorageArea.cpp | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebCore/storage/LocalStorageArea.cpp')
| -rw-r--r-- | WebCore/storage/LocalStorageArea.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/storage/LocalStorageArea.cpp b/WebCore/storage/LocalStorageArea.cpp index bec0233..27701c7 100644 --- a/WebCore/storage/LocalStorageArea.cpp +++ b/WebCore/storage/LocalStorageArea.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "LocalStorageArea.h" +#if ENABLE(DOM_STORAGE) + #include "CString.h" #include "DOMWindow.h" #include "EventNames.h" @@ -450,3 +452,6 @@ void LocalStorageArea::performSync() } } // namespace WebCore + +#endif // ENABLE(DOM_STORAGE) + |