3 files changed, 1 insertions, 28 deletions

diff --git a/webkit/api/public/WebStorageArea.h b/webkit/api/public/WebStorageArea.h
index 664b418..b67aea6 100644
--- a/webkit/api/public/WebStorageArea.h
+++ b/webkit/api/public/WebStorageArea.h
@@ -37,24 +37,12 @@ namespace WebKit {
     class WebString;
 
     // In WebCore, there's one distinct StorageArea per origin per StorageNamespace. This
-    // class wraps a StorageArea. With the possible exception of lock/unlock all of these
-    // methods map very obviously to the WebStorage (often called DOM Storage) spec.
+    // class wraps a StorageArea.  All the methods have obvious connections to the spec:
     // http://dev.w3.org/html5/webstorage/
     class WebStorageArea {
     public:
         virtual ~WebStorageArea() { }
 
-        // Lock the storage area. Before calling any other other methods on this interface,
-        // you should always call lock and wait for it to return. InvalidateCache tells you
-        // that since the last time you locked the cache, someone else has modified it.
-        // BytesLeftInQuota tells you how many bytes are currently unused in the quota.
-        // These are both optimizations and can be ignored if you'd like.
-        virtual void lock(bool& invalidateCache, size_t& bytesLeftInQuota) = 0;
-
-        // Unlock the storage area. You should call this at the end of the JavaScript context
-        // or when you're about to execute anything synchronous per the DOM Storage spec.
-        virtual void unlock() = 0;
-
         // The number of key/value pairs in the storage area.
         virtual unsigned length() = 0;
 
diff --git a/webkit/api/src/WebStorageAreaImpl.cpp b/webkit/api/src/WebStorageAreaImpl.cpp
index 13f79d2..c835424 100644
--- a/webkit/api/src/WebStorageAreaImpl.cpp
+++ b/webkit/api/src/WebStorageAreaImpl.cpp
@@ -47,19 +47,6 @@ WebStorageAreaImpl::~WebStorageAreaImpl()
 {
 }
 
-void WebStorageAreaImpl::lock(bool& invalidateCache, size_t& bytesLeftInQuota)
-{
-    // FIXME: Enable locking.  http://crbug.com/16877
-    invalidateCache = false;
-    // FIXME: Enable quota support.  http://crbug.com/16876
-    bytesLeftInQuota = 0;
-}
-
-void WebStorageAreaImpl::unlock()
-{
-    // FIXME: Enable locking.  http://crbug.com/16877
-}
-
 unsigned WebStorageAreaImpl::length()
 {
     return m_storageArea->length();
diff --git a/webkit/api/src/WebStorageAreaImpl.h b/webkit/api/src/WebStorageAreaImpl.h
index 648ee3e..5c57ae2 100644
--- a/webkit/api/src/WebStorageAreaImpl.h
+++ b/webkit/api/src/WebStorageAreaImpl.h
@@ -42,8 +42,6 @@ namespace WebKit {
     public:
         WebStorageAreaImpl(PassRefPtr<WebCore::StorageArea> storageArea);
         virtual ~WebStorageAreaImpl();
-        virtual void lock(bool& invalidateCache, size_t& bytesLeftInQuota);
-        virtual void unlock();
         virtual unsigned length();
         virtual WebString key(unsigned index);
         virtual WebString getItem(const WebString& key);