WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/inspector/InspectorController.cpp

Index: third_party/WebKit/WebCore/inspector/InspectorController.cpp
===================================================================
--- third_party/WebKit/WebCore/inspector/InspectorController.cpp	(revision 9391)
+++ third_party/WebKit/WebCore/inspector/InspectorController.cpp	(working copy)
@@ -66,6 +66,7 @@
 #include "ResourceResponse.h"
 #include "ScriptCallStack.h"
 #include "ScriptController.h"
+#include "SecurityOrigin.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include "TextEncoding.h"
@@ -78,7 +79,15 @@
 #if USE(JSC)
 #include "JSDatabase.h"
 #endif
+
+#if ENABLE(DOM_STORAGE)
+#include "Storage.h"
+#include "StorageArea.h"
+#if USE(JSC)
+#include "JSStorage.h"
 #endif
+#endif
+#endif
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 #include "JavaScriptDebugServer.h"
@@ -391,6 +400,44 @@
 };
 #endif
 
+#if ENABLE(DOM_STORAGE)
+struct InspectorDOMStorageResource : public RefCounted<InspectorDOMStorageResource> {
+    static PassRefPtr<InspectorDOMStorageResource> create(Storage* domStorage, bool isLocalStorage, Frame* frame)
+    {
+        return adoptRef(new InspectorDOMStorageResource(domStorage, isLocalStorage, frame));
+    }
+
+    void setScriptObject(JSContextRef context, JSObjectRef newScriptObject)
+    {
+        if (scriptContext && scriptObject)
+            JSValueUnprotect(scriptContext, scriptObject);
+
+        scriptObject = newScriptObject;
+        scriptContext = context;
+
+        ASSERT((context && newScriptObject) || (!context && !newScriptObject));
+        if (context && newScriptObject)
+            JSValueProtect(context, newScriptObject);
+    }
+
+    RefPtr<Storage> domStorage;
+    bool isLocalStorage;
+    RefPtr<Frame> frame;
+    JSContextRef scriptContext;
+    JSObjectRef scriptObject;
+    
+private:
+    InspectorDOMStorageResource(Storage* domStorage, bool isLocalStorage, Frame* frame)
+        : domStorage(domStorage)
+        , isLocalStorage(isLocalStorage)
+        , frame(frame)
+        , scriptContext(0)
+        , scriptObject(0)
+    {
+    }
+};
+#endif
+
 // JavaScript Callbacks 
 
 void InspectorController::addSourceToFrame(unsigned long identifier, Node* node) 
@@ -1406,6 +1453,9 @@
 #if ENABLE(DATABASE)
         m_databaseResources.clear();
 #endif
+#if ENABLE(DOM_STORAGE)
+        m_domStorageResources.clear();
+#endif
 
         if (windowVisible()) {
             resetScriptObjects();
@@ -1654,6 +1704,27 @@
 }
 #endif
 
+#if ENABLE(DOM_STORAGE)
+void InspectorController::didUseDOMStorage(StorageArea* storageArea, bool isLocalStorage, Frame* frame)
+{
+    if (!enabled())
+        return;
+
+    DOMStorageResourcesSet::iterator domStorageEnd = m_domStorageResources.end();
+    for (DOMStorageResourcesSet::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it) {
+        InspectorDOMStorageResource* resource = it->get();
+        if (equalIgnoringCase(resource->frame->document()->securityOrigin()->domain(), frame->document()->securityOrigin()->domain()) && resource->isLocalStorage == isLocalStorage)
+            return;
+    }
+    RefPtr<Storage> domStorage = Storage::create(frame, storageArea);
+    RefPtr<InspectorDOMStorageResource> resource = InspectorDOMStorageResource::create(domStorage.get(), isLocalStorage, frame);
+
+    m_domStorageResources.add(resource);
+    if (windowVisible())
+        addDOMStorageScriptResource(resource.get());
+}
+#endif
+
 void InspectorController::moveWindowBy(float x, float y) const
 {
     if (!m_page || !enabled())