Changeset 83841 in webkit

Timestamp:

Apr 14, 2011 5:32:17 AM (13 years ago)

Author:

loislo@chromium.org

Message:

2011-04-14 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector:Duplicated display of storage db when running Web SQL from an iframe.
​https://bugs.webkit.org/show_bug.cgi?id=57830

There was created a new InspectorDatabaseResource entry for every didOpenDatabase event.
Moreover there is new WebCore::Database for each didOpenDatabase event.
I decided to change the old instance of the Database to a new one if they both use the same file.

• inspector/InspectorDatabaseAgent.cpp: (WebCore::InspectorDatabaseAgent::didOpenDatabase): (WebCore::InspectorDatabaseAgent::findByFileName):
• inspector/InspectorDatabaseAgent.h:
• inspector/InspectorDatabaseResource.h: (WebCore::InspectorDatabaseResource::setDatabase):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDatabaseAgent.cpp (modified) (2 diffs)
• inspector/InspectorDatabaseAgent.h (modified) (1 diff)
• inspector/InspectorDatabaseResource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector:Duplicated display of storage db when running Web SQL from an iframe.
+        https://bugs.webkit.org/show_bug.cgi?id=57830
+
+        There was created a new InspectorDatabaseResource entry for every didOpenDatabase event.
+        Moreover there is new WebCore::Database for each didOpenDatabase event.
+        I decided to change the old instance of the Database to a new one if they both use the same file.
+
+        * inspector/InspectorDatabaseAgent.cpp:
+        (WebCore::InspectorDatabaseAgent::didOpenDatabase):
+        (WebCore::InspectorDatabaseAgent::findByFileName):
+        * inspector/InspectorDatabaseAgent.h:
+        * inspector/InspectorDatabaseResource.h:
+        (WebCore::InspectorDatabaseResource::setDatabase):
+
 2011-04-14  Zoltan Herczeg  <zherczeg@inf.u-szeged.hu>
 

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

@@ -221 +221 @@
 void InspectorDatabaseAgent::didOpenDatabase(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
 {
+    if (InspectorDatabaseResource* resource = findByFileName(database->fileName())) {
+        resource->setDatabase(database);
+        return;
+    }
+
     RefPtr<InspectorDatabaseResource> resource = InspectorDatabaseResource::create(database, domain, name, version);
     m_resources.set(resource->id(), resource);
@@ -294 +299 @@
 }
 
+InspectorDatabaseResource* InspectorDatabaseAgent::findByFileName(const String& fileName)
+{
+    for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
+        if (it->second->database()->fileName() == fileName)
+            return it->second.get();
+    }
+    return 0;
+}
+
 Database* InspectorDatabaseAgent::databaseForId(int databaseId)
 {

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h

@@ -71 +71 @@
 
     Database* databaseForId(int databaseId);
+    InspectorDatabaseResource* findByFileName(const String& fileName);
 
     InstrumentingAgents* m_instrumentingAgents;

trunk/Source/WebCore/inspector/InspectorDatabaseResource.h

@@ -49 +49 @@
     void bind(InspectorFrontend::Database*);
     Database* database() { return m_database.get(); }
+    void setDatabase(PassRefPtr<Database> database) { m_database = database; }
     int id() const { return m_id; }