Changeset 41334 in webkit

Timestamp:

Mar 1, 2009 8:42:26 AM (15 years ago)

Author:

timothy@apple.com

Message:

Pass securityOrigin->host() instead of securityOrigin->domain() to WebInspector
when creating databases, localStorage or sessionStorage. Changing document.domain
should have no affect on databases, localStorage and sessionStorage in Web Inspector.

​https://bugs.webkit.org/show_bug.cgi?id=23844

Reviewed by Timothy Hatcher.

• inspector/InspectorController.cpp: (WebCore::InspectorController::addDOMStorageScriptResource): (WebCore::InspectorController::didUseDOMStorage):
• storage/Database.cpp: (WebCore::Database::openDatabase):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (2 diffs)
• storage/Database.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-01  Yael Aharon  <yael.aharon@nokia.com>
+
+        Pass securityOrigin->host() instead of securityOrigin->domain() to WebInspector
+        when creating databases, localStorage or sessionStorage. Changing document.domain
+        should have no affect on databases, localStorage and sessionStorage in Web Inspector.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23844
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::addDOMStorageScriptResource):
+        (WebCore::InspectorController::didUseDOMStorage):
+        * storage/Database.cpp:
+        (WebCore::Database::openDatabase):
+
 2009-03-01  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -2296 +2296 @@
     }
 
-    JSValueRef domainValue = JSValueMakeString(m_scriptContext, jsStringRef(resource->frame->document()->securityOrigin()->domain()).get());
+    JSValueRef domainValue = JSValueMakeString(m_scriptContext, jsStringRef(resource->frame->document()->securityOrigin()->host()).get());
     JSValueRef isLocalStorageValue = JSValueMakeBoolean(m_scriptContext, resource->isLocalStorage);
 
@@ -2735 +2735 @@
     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)
+        if (equalIgnoringCase(resource->frame->document()->securityOrigin()->host(), frame->document()->securityOrigin()->host()) && resource->isLocalStorage == isLocalStorage)
             return;
     }

trunk/WebCore/storage/Database.cpp

@@ -115 +115 @@
 
     if (Page* page = document->frame()->page())
-        page->inspectorController()->didOpenDatabase(database.get(), document->domain(), name, expectedVersion);
+        page->inspectorController()->didOpenDatabase(database.get(), document->securityOrigin()->host(), name, expectedVersion);
 
     return database;