Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: Source/core/inspector/InspectorFileSystemAgent.cpp

Issue 103083002: Decouple FileSystem and WebSQL callbacks from VoidCallback and it non-refcounted (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 #include "core/inspector/InspectorFileSystemAgent.h" 32 #include "core/inspector/InspectorFileSystemAgent.h"
33 33
34 #include "bindings/v8/ExceptionStatePlaceholder.h" 34 #include "bindings/v8/ExceptionStatePlaceholder.h"
35 #include "core/dom/DOMImplementation.h" 35 #include "core/dom/DOMImplementation.h"
36 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
37 #include "core/events/Event.h" 37 #include "core/events/Event.h"
38 #include "core/fetch/TextResourceDecoder.h" 38 #include "core/fetch/TextResourceDecoder.h"
39 #include "core/fileapi/File.h" 39 #include "core/fileapi/File.h"
40 #include "core/fileapi/FileError.h" 40 #include "core/fileapi/FileError.h"
41 #include "core/fileapi/FileReader.h" 41 #include "core/fileapi/FileReader.h"
42 #include "core/html/VoidCallback.h"
43 #include "core/inspector/InspectorPageAgent.h" 42 #include "core/inspector/InspectorPageAgent.h"
44 #include "core/inspector/InspectorState.h" 43 #include "core/inspector/InspectorState.h"
45 #include "core/frame/Frame.h" 44 #include "core/frame/Frame.h"
46 #include "modules/filesystem/DOMFileSystem.h" 45 #include "modules/filesystem/DOMFileSystem.h"
47 #include "modules/filesystem/DirectoryEntry.h" 46 #include "modules/filesystem/DirectoryEntry.h"
48 #include "modules/filesystem/DirectoryReader.h" 47 #include "modules/filesystem/DirectoryReader.h"
49 #include "modules/filesystem/EntriesCallback.h" 48 #include "modules/filesystem/EntriesCallback.h"
50 #include "modules/filesystem/Entry.h" 49 #include "modules/filesystem/Entry.h"
51 #include "modules/filesystem/EntryCallback.h" 50 #include "modules/filesystem/EntryCallback.h"
52 #include "modules/filesystem/ErrorCallback.h" 51 #include "modules/filesystem/ErrorCallback.h"
53 #include "modules/filesystem/FileCallback.h" 52 #include "modules/filesystem/FileCallback.h"
54 #include "modules/filesystem/FileEntry.h" 53 #include "modules/filesystem/FileEntry.h"
55 #include "modules/filesystem/FileSystemCallbacks.h" 54 #include "modules/filesystem/FileSystemCallbacks.h"
55 #include "modules/filesystem/FileSystemVoidCallback.h"
56 #include "modules/filesystem/LocalFileSystem.h" 56 #include "modules/filesystem/LocalFileSystem.h"
57 #include "modules/filesystem/Metadata.h" 57 #include "modules/filesystem/Metadata.h"
58 #include "modules/filesystem/MetadataCallback.h" 58 #include "modules/filesystem/MetadataCallback.h"
59 #include "platform/MIMETypeRegistry.h" 59 #include "platform/MIMETypeRegistry.h"
60 #include "platform/weborigin/KURL.h" 60 #include "platform/weborigin/KURL.h"
61 #include "platform/weborigin/SecurityOrigin.h" 61 #include "platform/weborigin/SecurityOrigin.h"
62 #include "wtf/ArrayBuffer.h" 62 #include "wtf/ArrayBuffer.h"
63 #include "wtf/text/Base64.h" 63 #include "wtf/text/Base64.h"
64 #include "wtf/text/TextEncoding.h" 64 #include "wtf/text/TextEncoding.h"
65 65
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 return; 489 return;
490 } 490 }
491 491
492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType , m_charset, true); 492 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType , m_charset, true);
493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer-> byteLength()); 493 String result = decoder->decode(static_cast<char*>(buffer->data()), buffer-> byteLength());
494 result.append(decoder->flush()); 494 result.append(decoder->flush());
495 m_charset = decoder->encoding().name(); 495 m_charset = decoder->encoding().name();
496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset); 496 reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
497 } 497 }
498 498
499 class DeleteEntryRequest : public VoidCallback { 499 class DeleteEntryRequest : public FileSystemVoidCallback {
500 public: 500 public:
501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url) 501 static PassRefPtr<DeleteEntryRequest> create(PassRefPtr<DeleteEntryCallback> requestCallback, const KURL& url)
502 { 502 {
503 return adoptRef(new DeleteEntryRequest(requestCallback, url)); 503 return adoptRef(new DeleteEntryRequest(requestCallback, url));
504 } 504 }
505 505
506 virtual ~DeleteEntryRequest() 506 virtual ~DeleteEntryRequest()
507 { 507 {
508 reportResult(FileError::ABORT_ERR); 508 reportResult(FileError::ABORT_ERR);
509 } 509 }
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t raverseNext()) { 705 for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().t raverseNext()) {
706 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin)) 706 if (frame->document() && frame->document()->securityOrigin()->isSameSche meHostPort(origin))
707 return frame->document(); 707 return frame->document();
708 } 708 }
709 709
710 *error = "No frame is available for the request"; 710 *error = "No frame is available for the request";
711 return 0; 711 return 0;
712 } 712 }
713 713
714 } // namespace WebCore 714 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorDatabaseAgent.cpp ('k') | Source/modules/filesystem/DOMFileSystemBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698