diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
commit | 211c0a1dd5c10c60c3383748b13e17e6bdeaea54 (patch) | |
tree | 268920a5f40744663dd4bf8d405d35d324926f95 /src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h | |
parent | fd44f52df9275e717292f5c7e90015fc9bf14603 (diff) | |
parent | 35a740fa663d4669a45ada9c37c46546e59bbb82 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into widgets-ng
Diffstat (limited to 'src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h index d3f078567..fe21a4590 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h @@ -20,7 +20,7 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef StorageAreaImpl_h @@ -30,6 +30,7 @@ #include "StorageArea.h" +#include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> namespace WebCore { @@ -40,19 +41,19 @@ namespace WebCore { class StorageAreaImpl : public StorageArea { public: - StorageAreaImpl(StorageType, SecurityOrigin*, PassRefPtr<StorageSyncManager>); + static PassRefPtr<StorageAreaImpl> create(StorageType, PassRefPtr<SecurityOrigin>, PassRefPtr<StorageSyncManager>, unsigned quota); virtual ~StorageAreaImpl(); // The HTML5 DOM Storage API (and contains) virtual unsigned length() const; - virtual String key(unsigned index, ExceptionCode& ec) const; + virtual String key(unsigned index) const; virtual String getItem(const String& key) const; virtual void setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame); virtual void removeItem(const String& key, Frame* sourceFrame); virtual void clear(Frame* sourceFrame); virtual bool contains(const String& key) const; - PassRefPtr<StorageAreaImpl> copy(SecurityOrigin*); + PassRefPtr<StorageAreaImpl> copy(); void close(); // Could be called from a background thread. @@ -60,12 +61,11 @@ namespace WebCore { SecurityOrigin* securityOrigin(); private: - StorageAreaImpl(SecurityOrigin*, StorageAreaImpl*); + StorageAreaImpl(StorageType, PassRefPtr<SecurityOrigin>, PassRefPtr<StorageSyncManager>, unsigned quota); + StorageAreaImpl(StorageAreaImpl*); void blockUntilImportComplete() const; - void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame); - StorageType m_storageType; RefPtr<SecurityOrigin> m_securityOrigin; RefPtr<StorageMap> m_storageMap; |