WebKit-side: Implement StorageArea::containsItem(...) for the chromium port too. Cleanup some depre…

WebKit/chromium/src/StorageAreaProxy.cpp

 /*
  * Copyright (C) 2009 Google Inc. All Rights Reserved.
  *           (C) 2008 Apple Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 #include "platform/WebString.h"
 #include "platform/WebURL.h"
 #include "WebViewImpl.h"
 
 namespace WebCore {
 
 // FIXME: storageArea argument should be a PassOwnPtr.
 StorageAreaProxy::StorageAreaProxy(WebKit::WebStorageArea* storageArea, StorageType storageType)
     : m_storageArea(adoptPtr(storageArea))
     , m_storageType(storageType)
+    , m_cachedCanAccessSetting(false)
+    , m_cachedCanAccessSettingForFrame(0)
 {
 }
 
 StorageAreaProxy::~StorageAreaProxy()
 {
 }
 
 unsigned StorageAreaProxy::length(Frame* frame) const
 {
     if (canAccessStorage(frame))
@@ skipping 35 matching lines @@
 
 void StorageAreaProxy::clear(Frame* frame)
 {
     if (!canAccessStorage(frame))
         return;
     m_storageArea->clear(frame->document()->url());
 }
 
 bool StorageAreaProxy::contains(const String& key, Frame* frame) const
 {
-    return !getItem(key, frame).isNull();
+    if (!canAccessStorage(frame))
+        return false;
+    return m_storageArea->containsItem(key);
 }
 
 bool StorageAreaProxy::canAccessStorage(Frame* frame) const
 {
     if (!frame->page())
         return false;
+    if (m_cachedCanAccessSettingForFrame == reinterpret_cast<void*>(frame))
+        return m_cachedCanAccessSetting;
+
     WebKit::WebFrameImpl* webFrame = WebKit::WebFrameImpl::fromFrame(frame);
     WebKit::WebViewImpl* webView = webFrame->viewImpl();
-    return !webView->permissionClient() || webView->permissionClient()->allowStorage(webFrame, m_storageType == LocalStorage);
+    m_cachedCanAccessSetting = !webView->permissionClient() || webView->permissionClient()->allowStorage(webFrame, m_storageType == LocalStorage);
+    m_cachedCanAccessSettingForFrame = reinterpret_cast<void*>(frame);
+    return m_cachedCanAccessSetting;
 }
 
 void StorageAreaProxy::dispatchLocalStorageEvent(PageGroup* pageGroup, const String& key, const String& oldValue, const String& newValue,
                                                  SecurityOrigin* securityOrigin, const KURL& pageURL, WebKit::WebStorageArea* sourceAreaInstance, bool originatedInProcess)
 {
     const HashSet<Page*>& pages = pageGroup->pages();
     for (HashSet<Page*>::const_iterator it = pages.begin(); it != pages.end(); ++it) {
         for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
             Storage* storage = frame->domWindow()->optionalLocalStorage();
             if (storage && frame->document()->securityOrigin()->equal(securityOrigin) && !isEventSource(storage, sourceAreaInstance))
@@ skipping 32 matching lines @@
 }
 
 bool StorageAreaProxy::isEventSource(Storage* storage, WebKit::WebStorageArea* sourceAreaInstance)
 {
     ASSERT(storage);
     StorageAreaProxy* areaProxy = static_cast<StorageAreaProxy*>(storage->area());
     return areaProxy->m_storageArea == sourceAreaInstance;
 }
 
 } // namespace WebCore