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

Side by Side Diff: Source/modules/filesystem/InspectorFileSystemAgent.cpp

Issue 960333002: Fix handling of media files in InspectorFileSystemAgent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use HTMLMediaElement::supportsType instead of MIMETypeRegistry Created 5 years, 4 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 23 matching lines...) Expand all
34 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 34 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
35 #include "bindings/core/v8/UnionTypesCore.h" 35 #include "bindings/core/v8/UnionTypesCore.h"
36 #include "core/dom/DOMArrayBuffer.h" 36 #include "core/dom/DOMArrayBuffer.h"
37 #include "core/dom/DOMImplementation.h" 37 #include "core/dom/DOMImplementation.h"
38 #include "core/dom/Document.h" 38 #include "core/dom/Document.h"
39 #include "core/events/Event.h" 39 #include "core/events/Event.h"
40 #include "core/fileapi/File.h" 40 #include "core/fileapi/File.h"
41 #include "core/fileapi/FileError.h" 41 #include "core/fileapi/FileError.h"
42 #include "core/fileapi/FileReader.h" 42 #include "core/fileapi/FileReader.h"
43 #include "core/frame/LocalFrame.h" 43 #include "core/frame/LocalFrame.h"
44 #include "core/html/HTMLMediaElement.h"
44 #include "core/html/VoidCallback.h" 45 #include "core/html/VoidCallback.h"
45 #include "core/html/parser/TextResourceDecoder.h" 46 #include "core/html/parser/TextResourceDecoder.h"
46 #include "core/inspector/InspectorState.h" 47 #include "core/inspector/InspectorState.h"
47 #include "core/page/Page.h" 48 #include "core/page/Page.h"
48 #include "modules/filesystem/DOMFileSystem.h" 49 #include "modules/filesystem/DOMFileSystem.h"
49 #include "modules/filesystem/DirectoryEntry.h" 50 #include "modules/filesystem/DirectoryEntry.h"
50 #include "modules/filesystem/DirectoryReader.h" 51 #include "modules/filesystem/DirectoryReader.h"
51 #include "modules/filesystem/EntriesCallback.h" 52 #include "modules/filesystem/EntriesCallback.h"
52 #include "modules/filesystem/Entry.h" 53 #include "modules/filesystem/Entry.h"
53 #include "modules/filesystem/EntryCallback.h" 54 #include "modules/filesystem/EntryCallback.h"
54 #include "modules/filesystem/ErrorCallback.h" 55 #include "modules/filesystem/ErrorCallback.h"
55 #include "modules/filesystem/FileCallback.h" 56 #include "modules/filesystem/FileCallback.h"
56 #include "modules/filesystem/FileEntry.h" 57 #include "modules/filesystem/FileEntry.h"
57 #include "modules/filesystem/FileSystemCallbacks.h" 58 #include "modules/filesystem/FileSystemCallbacks.h"
58 #include "modules/filesystem/LocalFileSystem.h" 59 #include "modules/filesystem/LocalFileSystem.h"
59 #include "modules/filesystem/Metadata.h" 60 #include "modules/filesystem/Metadata.h"
60 #include "modules/filesystem/MetadataCallback.h" 61 #include "modules/filesystem/MetadataCallback.h"
62 #include "platform/ContentType.h"
61 #include "platform/MIMETypeRegistry.h" 63 #include "platform/MIMETypeRegistry.h"
62 #include "platform/heap/Handle.h" 64 #include "platform/heap/Handle.h"
63 #include "platform/weborigin/KURL.h" 65 #include "platform/weborigin/KURL.h"
64 #include "platform/weborigin/SecurityOrigin.h" 66 #include "platform/weborigin/SecurityOrigin.h"
65 #include "wtf/text/Base64.h" 67 #include "wtf/text/Base64.h"
66 #include "wtf/text/TextEncoding.h" 68 #include "wtf/text/TextEncoding.h"
67 69
68 using blink::TypeBuilder::Array; 70 using blink::TypeBuilder::Array;
69 71
70 typedef blink::InspectorBackendDispatcher::FileSystemCommandHandler::RequestFile SystemRootCallback RequestFileSystemRootCallback; 72 typedef blink::InspectorBackendDispatcher::FileSystemCommandHandler::RequestFile SystemRootCallback RequestFileSystemRootCallback;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 .setName(entry->name()) 291 .setName(entry->name())
290 .setIsDirectory(entry->isDirectory()); 292 .setIsDirectory(entry->isDirectory());
291 293
292 using TypeBuilder::Page::ResourceType; 294 using TypeBuilder::Page::ResourceType;
293 if (!entry->isDirectory()) { 295 if (!entry->isDirectory()) {
294 String mimeType = MIMETypeRegistry::getMIMETypeForPath(entry->name() ); 296 String mimeType = MIMETypeRegistry::getMIMETypeForPath(entry->name() );
295 ResourceType::Enum resourceType; 297 ResourceType::Enum resourceType;
296 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) { 298 if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType)) {
297 resourceType = ResourceType::Image; 299 resourceType = ResourceType::Image;
298 entryForFrontend->setIsTextFile(false); 300 entryForFrontend->setIsTextFile(false);
301 } else if (HTMLMediaElement::supportsType(ContentType(mimeType)) != WebMimeRegistry::IsNotSupported) {
302 resourceType = ResourceType::Media;
303 entryForFrontend->setIsTextFile(false);
299 } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) ) { 304 } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) ) {
300 resourceType = ResourceType::Script; 305 resourceType = ResourceType::Script;
301 entryForFrontend->setIsTextFile(true); 306 entryForFrontend->setIsTextFile(true);
302 } else if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) { 307 } else if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) {
303 resourceType = ResourceType::Document; 308 resourceType = ResourceType::Document;
304 entryForFrontend->setIsTextFile(true); 309 entryForFrontend->setIsTextFile(true);
305 } else { 310 } else {
306 resourceType = ResourceType::Other; 311 resourceType = ResourceType::Other;
307 entryForFrontend->setIsTextFile(DOMImplementation::isXMLMIMEType (mimeType) || DOMImplementation::isTextMIMEType(mimeType)); 312 entryForFrontend->setIsTextFile(DOMImplementation::isXMLMIMEType (mimeType) || DOMImplementation::isTextMIMEType(mimeType));
308 } 313 }
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 return 0; 766 return 0;
762 } 767 }
763 768
764 DEFINE_TRACE(InspectorFileSystemAgent) 769 DEFINE_TRACE(InspectorFileSystemAgent)
765 { 770 {
766 visitor->trace(m_page); 771 visitor->trace(m_page);
767 InspectorBaseAgent::trace(visitor); 772 InspectorBaseAgent::trace(visitor);
768 } 773 }
769 774
770 } // namespace blink 775 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698