Changeset 141690 in webkit

Timestamp:

Feb 2, 2013 4:54:34 AM (11 years ago)

Author:

vivek.vg@samsung.com

Message:

Web Inspector: Refactor InspectorDOMStorageAgent::getDOMStorageEntries to report the error messages
​https://bugs.webkit.org/show_bug.cgi?id=108611

Reviewed by Pavel Feldman.

Added reporting of various error messages. Moved the modification of output
parameter at a later stage when there are no errors reported.

No new tests as code refactoring.

• inspector/InspectorDOMStorageAgent.cpp:

(WebCore::hadException):
(WebCore):
(WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDOMStorageAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-02  Vivek Galatage  <vivek.vg@samsung.com>
+
+        Web Inspector: Refactor InspectorDOMStorageAgent::getDOMStorageEntries to report the error messages
+        https://bugs.webkit.org/show_bug.cgi?id=108611
+
+        Reviewed by Pavel Feldman.
+
+        Added reporting of various error messages. Moved the modification of output
+        parameter at a later stage when there are no errors reported.
+
+        No new tests as code refactoring.
+
+        * inspector/InspectorDOMStorageAgent.cpp:
+        (WebCore::hadException):
+        (WebCore):
+        (WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
+
 2013-02-02  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp

@@ -57 +57 @@
 };
 
+static bool hadException(ExceptionCode ec, ErrorString* errorString)
+{
+    switch (ec) {
+    case 0:
+        return false;
+    case SECURITY_ERR:
+        *errorString = "Security error";
+        return true;
+    default:
+        *errorString = "Unknown DOM storage error";
+        return true;
+    }
+}
+
 InspectorDOMStorageAgent::InspectorDOMStorageAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
     : InspectorBaseAgent<InspectorDOMStorageAgent>("DOMStorage", instrumentingAgents, state)
@@ -110 +124 @@
 }
 
-void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString*, const String& storageId, RefPtr<TypeBuilder::Array<TypeBuilder::Array<String> > >& entries)
-{
-    // FIXME: consider initializing this array after 2 checks below. The checks should return error messages in this case.
-    entries = TypeBuilder::Array<TypeBuilder::Array<String> >::create();
-
+void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString* errorString, const String& storageId, RefPtr<TypeBuilder::Array<TypeBuilder::Array<String> > >& entries)
+{
     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
-    if (!storageResource)
-        return;
+    if (!storageResource) {
+        *errorString = "Storage resource not found for the given storage identifier";
+        return;
+    }
     Frame* frame = storageResource->frame();
-    if (!frame)
-        return;
-
-    // FIXME: Exceptions are not reported here.
+    if (!frame) {
+        *errorString = "Frame not found";
+        return;
+    }
+
+    RefPtr<TypeBuilder::Array<TypeBuilder::Array<String> > > storageEntries = TypeBuilder::Array<TypeBuilder::Array<String> >::create();
+
     ExceptionCode ec = 0;
     StorageArea* storageArea = storageResource->storageArea();
     for (unsigned i = 0; i < storageArea->length(ec, frame); ++i) {
         String name(storageArea->key(i, ec, frame));
-        if (ec)
+        if (hadException(ec, errorString))
             return;
         String value(storageArea->getItem(name, ec, frame));
-        if (ec)
+        if (hadException(ec, errorString))
             return;
         RefPtr<TypeBuilder::Array<String> > entry = TypeBuilder::Array<String>::create();
         entry->addItem(name);
         entry->addItem(value);
-        entries->addItem(entry);
-    }
+        storageEntries->addItem(entry);
+    }
+    entries = storageEntries.release();
 }