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

Side by Side Diff: third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp

Issue 2306293002: Replaced PassRefPtr copies with moves in Source/platform. (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 { 67 {
68 } 68 }
69 69
70 MHTMLArchive* MHTMLArchive::create(const KURL& url, PassRefPtr<SharedBuffer> dat a) 70 MHTMLArchive* MHTMLArchive::create(const KURL& url, PassRefPtr<SharedBuffer> dat a)
71 { 71 {
72 // MHTML pages can only be loaded from local URLs, http/https URLs, and cont ent URLs(Android specific). 72 // MHTML pages can only be loaded from local URLs, http/https URLs, and cont ent URLs(Android specific).
73 // The latter is now allowed due to full sandboxing enforcement on MHTML pag es. 73 // The latter is now allowed due to full sandboxing enforcement on MHTML pag es.
74 if (!canLoadArchive(url)) 74 if (!canLoadArchive(url))
75 return nullptr; 75 return nullptr;
76 76
77 MHTMLParser parser(data); 77 MHTMLParser parser(std::move(data));
78 HeapVector<Member<ArchiveResource>> resources = parser.parseArchive(); 78 HeapVector<Member<ArchiveResource>> resources = parser.parseArchive();
79 if (resources.isEmpty()) 79 if (resources.isEmpty())
80 return nullptr; // Invalid MHTML file. 80 return nullptr; // Invalid MHTML file.
81 81
82 MHTMLArchive* archive = new MHTMLArchive; 82 MHTMLArchive* archive = new MHTMLArchive;
83 // The first document suitable resource is the main resource of the top fram e. 83 // The first document suitable resource is the main resource of the top fram e.
84 for (size_t i = 0; i < resources.size(); ++i) { 84 for (size_t i = 0; i < resources.size(); ++i) {
85 const AtomicString& mimeType = resources[i]->mimeType(); 85 const AtomicString& mimeType = resources[i]->mimeType();
86 if (archive->mainResource() || !MIMETypeRegistry::isSupportedNonImageMIM EType(mimeType) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) || mimeType == "text/css") 86 if (archive->mainResource() || !MIMETypeRegistry::isSupportedNonImageMIM EType(mimeType) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType) || mimeType == "text/css")
87 archive->addSubresource(resources[i].get()); 87 archive->addSubresource(resources[i].get());
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 return m_subresources.get(url.getString()); 253 return m_subresources.get(url.getString());
254 } 254 }
255 255
256 DEFINE_TRACE(MHTMLArchive) 256 DEFINE_TRACE(MHTMLArchive)
257 { 257 {
258 visitor->trace(m_mainResource); 258 visitor->trace(m_mainResource);
259 visitor->trace(m_subresources); 259 visitor->trace(m_subresources);
260 } 260 }
261 261
262 } // namespace blink 262 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp ('k') | third_party/WebKit/Source/platform/mhtml/MHTMLParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698