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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index 174c351cc01e434ae895c39c84767ddc3dcbb290..375be28a0a54e57a2136415043cf020978f5908f 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -71,6 +71,7 @@
#include "wtf/Vector.h"
#include "wtf/text/Base64.h"
#include "wtf/text/TextEncoding.h"
+#include <memory>
namespace blink {
@@ -148,12 +149,12 @@ static bool hasTextContent(Resource* cachedResource)
return type == Resource::CSSStyleSheet || type == Resource::XSLStyleSheet || type == Resource::Script || type == Resource::Raw || type == Resource::ImportResource || type == Resource::MainResource;
}
-static PassOwnPtr<TextResourceDecoder> createResourceTextDecoder(const String& mimeType, const String& textEncodingName)
+static std::unique_ptr<TextResourceDecoder> createResourceTextDecoder(const String& mimeType, const String& textEncodingName)
{
if (!textEncodingName.isEmpty())
return TextResourceDecoder::create("text/plain", textEncodingName);
if (DOMImplementation::isXMLMIMEType(mimeType)) {
- OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("application/xml");
+ std::unique_ptr<TextResourceDecoder> decoder = TextResourceDecoder::create("application/xml");
decoder->useLenientXMLDecoding();
return decoder;
}
@@ -163,7 +164,7 @@ static PassOwnPtr<TextResourceDecoder> createResourceTextDecoder(const String& m
return TextResourceDecoder::create("text/plain", "UTF-8");
if (DOMImplementation::isTextMIMEType(mimeType))
return TextResourceDecoder::create("text/plain", "ISO-8859-1");
- return PassOwnPtr<TextResourceDecoder>();
+ return std::unique_ptr<TextResourceDecoder>();
}
static void maybeEncodeTextContent(const String& textContent, PassRefPtr<SharedBuffer> buffer, String* result, bool* base64Encoded)
@@ -188,7 +189,7 @@ bool InspectorPageAgent::sharedBufferContent(PassRefPtr<SharedBuffer> buffer, co
return false;
String textContent;
- OwnPtr<TextResourceDecoder> decoder = createResourceTextDecoder(mimeType, textEncodingName);
+ std::unique_ptr<TextResourceDecoder> decoder = createResourceTextDecoder(mimeType, textEncodingName);
WTF::TextEncoding encoding(textEncodingName);
if (decoder) {

Powered by Google App Engine
This is Rietveld 408576698