Replace EntryArray type by an Entry[]

Source/core/inspector/InspectorFileSystemAgent.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "core/html/VoidCallback.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/loader/TextResourceDecoder.h"
 #include "core/page/Frame.h"
 #include "core/platform/MIMETypeRegistry.h"
 #include "modules/filesystem/DOMFileSystem.h"
 #include "modules/filesystem/DirectoryEntry.h"
 #include "modules/filesystem/DirectoryReader.h"
 #include "modules/filesystem/EntriesCallback.h"
-#include "modules/filesystem/EntryArray.h"
+#include "modules/filesystem/Entry.h"
 #include "modules/filesystem/EntryCallback.h"
 #include "modules/filesystem/ErrorCallback.h"
 #include "modules/filesystem/FileCallback.h"
 #include "modules/filesystem/FileEntry.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
 #include "modules/filesystem/LocalFileSystem.h"
 #include "modules/filesystem/Metadata.h"
 #include "modules/filesystem/MetadataCallback.h"
 #include "weborigin/KURL.h"
 #include "weborigin/SecurityOrigin.h"
@@ skipping 13 matching lines @@
 
 namespace FileSystemAgentState {
 static const char fileSystemAgentEnabled[] = "fileSystemAgentEnabled";
 }
 
 namespace {
 
 template<typename BaseCallback, typename Handler, typename Argument>
 class CallbackDispatcher : public BaseCallback {
 public:
-    typedef bool (Handler::*HandlingMethod)(Argument*);
+    typedef bool (Handler::*HandlingMethod)(Argument);
 
     static PassRefPtr<CallbackDispatcher> create(PassRefPtr<Handler> handler, HandlingMethod handlingMethod)
     {
         return adoptRef(new CallbackDispatcher(handler, handlingMethod));
     }
 
-    virtual bool handleEvent(Argument* argument) OVERRIDE
+    virtual bool handleEvent(Argument argument) OVERRIDE
     {
         return (m_handler.get()->*m_handlingMethod)(argument);
     }
 
 private:
     CallbackDispatcher(PassRefPtr<Handler> handler, HandlingMethod handlingMethod)
         : m_handler(handler)
         , m_handlingMethod(handlingMethod) { }
 
     RefPtr<Handler> m_handler;
     HandlingMethod m_handlingMethod;
 };
 
 template<typename BaseCallback>
 class CallbackDispatcherFactory {
 public:
     template<typename Handler, typename Argument>
-    static PassRefPtr<CallbackDispatcher<BaseCallback, Handler, Argument> > create(Handler* handler, bool (Handler::*handlingMethod)(Argument*))
+    static PassRefPtr<CallbackDispatcher<BaseCallback, Handler, Argument> > create(Handler* handler, bool (Handler::*handlingMethod)(Argument))
     {
         return CallbackDispatcher<BaseCallback, Handler, Argument>::create(PassRefPtr<Handler>(handler), handlingMethod);
     }
 };
 
 class FileSystemRootRequest : public RefCounted<FileSystemRootRequest> {
     WTF_MAKE_NONCOPYABLE(FileSystemRootRequest);
 public:
     static PassRefPtr<FileSystemRootRequest> create(PassRefPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
     {
@@ skipping 71 matching lines @@
     void start(ScriptExecutionContext*);
 
 private:
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
-    bool didReadDirectoryEntries(EntryArray*);
+    bool didReadDirectoryEntries(const EntryVector&);
 
     void reportResult(FileError::ErrorCode errorCode, PassRefPtr<Array<TypeBuilder::FileSystem::Entry> > entries = 0)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode), entries);
     }
 
     DirectoryContentRequest(PassRefPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
         : m_requestCallback(requestCallback)
         , m_url(ParsedURLString, url) { }
 
@@ skipping 41 matching lines @@
     if (!m_directoryReader->filesystem()->scriptExecutionContext()) {
         reportResult(FileError::ABORT_ERR);
         return;
     }
 
     RefPtr<EntriesCallback> successCallback = CallbackDispatcherFactory<EntriesCallback>::create(this, &DirectoryContentRequest::didReadDirectoryEntries);
     RefPtr<ErrorCallback> errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &DirectoryContentRequest::didHitError);
     m_directoryReader->readEntries(successCallback, errorCallback);
 }
 
-bool DirectoryContentRequest::didReadDirectoryEntries(EntryArray* entries)
+bool DirectoryContentRequest::didReadDirectoryEntries(const EntryVector& entries)
 {
-    if (!entries->length()) {
+    if (entries.isEmpty()) {
         reportResult(static_cast<FileError::ErrorCode>(0), m_entries);
         return true;
     }
 
-    for (unsigned i = 0; i < entries->length(); ++i) {
-        Entry* entry = entries->item(i);
+    for (size_t i = 0; i < entries.size(); ++i) {
+        RefPtr<Entry> entry = entries[i];
         RefPtr<TypeBuilder::FileSystem::Entry> entryForFrontend = TypeBuilder::FileSystem::Entry::create()
             .setUrl(entry->toURL())
             .setName(entry->name())
             .setIsDirectory(entry->isDirectory());
 
         using TypeBuilder::Page::ResourceType;
         if (!entry->isDirectory()) {
             String mimeType = MIMETypeRegistry::getMIMETypeForPath(entry->name());
             ResourceType::Enum resourceType;
             if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) {
@@ skipping 442 matching lines @@
     for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (frame->document() && frame->document()->securityOrigin()->isSameSchemeHostPort(origin))
             return frame->document();
     }
 
     *error = "No frame is available for the request";
     return 0;
 }
 
 } // namespace WebCore