Changeset 125677 in webkit

Timestamp:

Aug 15, 2012 8:56:28 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Use default parameter on reportResult in InspectorFileSystemAgent
​https://bugs.webkit.org/show_bug.cgi?id=93930

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-08-15
Reviewed by Vsevolod Vlasov.

No functional change.

• inspector/InspectorFileSystemAgent.cpp:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorFileSystemAgent.cpp (modified) (17 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-15  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: Use default parameter on reportResult in InspectorFileSystemAgent
+        https://bugs.webkit.org/show_bug.cgi?id=93930
+
+        Reviewed by Vsevolod Vlasov.
+
+        No functional change.
+
+        * inspector/InspectorFileSystemAgent.cpp:
+        (WebCore):
+
 2012-08-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp

@@ -156 +156 @@
     bool didGetEntry(Entry*);
 
-    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Entry> entry)
+    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Entry> entry = 0)
     {
         if (!m_frontendProvider || !m_frontendProvider->frontend())
@@ -176 +176 @@
 bool FileSystemRootRequest::didHitError(FileError* error)
 {
-    reportResult(error->code(), 0);
+    reportResult(error->code());
     return true;
 }
@@ -209 +209 @@
     virtual ~DirectoryContentRequest()
     {
-        reportResult(FileError::ABORT_ERR, 0);
+        reportResult(FileError::ABORT_ERR);
     }
 
@@ -217 +217 @@
     bool didHitError(FileError* error)
     {
-        reportResult(error->code(), 0);
+        reportResult(error->code());
         return true;
     }
@@ -224 +224 @@
     bool didReadDirectoryEntries(EntryArray*);
 
-    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<Array<TypeBuilder::FileSystem::Entry> > entries)
+    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<Array<TypeBuilder::FileSystem::Entry> > entries = 0)
     {
         if (!m_frontendProvider || !m_frontendProvider->frontend())
@@ -253 +253 @@
     String path;
     if (!DOMFileSystemBase::crackFileSystemURL(m_url, type, path)) {
-        reportResult(FileError::SYNTAX_ERR, 0);
+        reportResult(FileError::SYNTAX_ERR);
         return;
     }
@@ -267 +267 @@
 {
     if (!entry->isDirectory()) {
-        reportResult(FileError::TYPE_MISMATCH_ERR, 0);
+        reportResult(FileError::TYPE_MISMATCH_ERR);
         return true;
     }
@@ -280 +280 @@
 {
     if (!m_directoryReader->filesystem()->scriptExecutionContext()) {
-        reportResult(FileError::ABORT_ERR, 0);
+        reportResult(FileError::ABORT_ERR);
         return;
     }
@@ -341 +341 @@
     virtual ~MetadataRequest()
     {
-        reportResult(FileError::ABORT_ERR, 0);
-    }
-
+        reportResult(FileError::ABORT_ERR);
+    }
+
+    void start(ScriptExecutionContext*);
+
+private:
     bool didHitError(FileError* error)
     {
-        reportResult(error->code(), 0);
+        reportResult(error->code());
         return true;
     }
 
-    void start(ScriptExecutionContext*);
     bool didGetEntry(Entry*);
     bool didGetMetadata(Metadata*);
 
-    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Metadata> metadata)
+    void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Metadata> metadata = 0)
     {
         if (!m_frontendProvider || !m_frontendProvider->frontend())
@@ -362 +364 @@
     }
 
-private:
     MetadataRequest(PassRefPtr<FrontendProvider> frontendProvider, int requestId, const String& url)
         : m_frontendProvider(frontendProvider)
@@ -390 +391 @@
 {
     if (!entry->filesystem()->scriptExecutionContext()) {
-        reportResult(FileError::ABORT_ERR, 0);
+        reportResult(FileError::ABORT_ERR);
         return true;
     }
@@ -421 +422 @@
     virtual ~FileContentRequest()
     {
-        reportResult(FileError::ABORT_ERR, 0, 0);
+        reportResult(FileError::ABORT_ERR);
     }
 
     void start(ScriptExecutionContext*);
-
 
     virtual bool operator==(const EventListener& other) OVERRIDE
@@ -443 +443 @@
     bool didHitError(FileError* error)
     {
-        reportResult(error->code(), 0, 0);
+        reportResult(error->code());
         return true;
     }
@@ -451 +451 @@
     void didRead();
 
-    void reportResult(FileError::ErrorCode errorCode, const String* result, const String* charset)
+    void reportResult(FileError::ErrorCode errorCode, const String* result = 0, const String* charset = 0)
     {
         if (!m_frontendProvider || !m_frontendProvider->frontend())
@@ -488 +488 @@
     String path;
     if (!DOMFileSystemBase::crackFileSystemURL(m_url, type, path)) {
-        reportResult(FileError::SYNTAX_ERR, 0, 0);
+        reportResult(FileError::SYNTAX_ERR);
         return;
     }
@@ -502 +502 @@
 {
     if (entry->isDirectory()) {
-        reportResult(FileError::TYPE_MISMATCH_ERR, 0, 0);
+        reportResult(FileError::TYPE_MISMATCH_ERR);
         return true;
     }
 
     if (!entry->filesystem()->scriptExecutionContext()) {
-        reportResult(FileError::ABORT_ERR, 0, 0);
+        reportResult(FileError::ABORT_ERR);
         return true;
     }
@@ -549 +549 @@
 }
 
-}
+} // anonymous namespace
 
 // static