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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/loader/DocumentLoader.h
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.h b/third_party/WebKit/Source/core/loader/DocumentLoader.h
index 9bf58f7ff85cd132f6499c7539c56571fa8f6612..acdd1efa89be2e1478ee0b4a42da30983f8a5cf2 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.h
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.h
@@ -49,7 +49,6 @@
#include "public/platform/WebLoadingBehaviorFlag.h"
#include "wtf/HashSet.h"
#include "wtf/RefPtr.h"
-#include <memory>
namespace blink {
@@ -85,7 +84,7 @@ public:
ResourceFetcher* fetcher() const { return m_fetcher.get(); }
- void setSubresourceFilter(std::unique_ptr<WebDocumentSubresourceFilter>);
+ void setSubresourceFilter(PassOwnPtr<WebDocumentSubresourceFilter>);
WebDocumentSubresourceFilter* subresourceFilter() const { return m_subresourceFilter.get(); }
const SubstituteData& substituteData() const { return m_substituteData; }
@@ -171,7 +170,7 @@ private:
void finishedLoading(double finishTime);
void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final;
- void responseReceived(Resource*, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>) final;
+ void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) final;
void dataReceived(Resource*, const char* data, size_t length) final;
void processData(const char* data, size_t length);
void notifyFinished(Resource*) final;
@@ -185,7 +184,7 @@ private:
Member<LocalFrame> m_frame;
Member<ResourceFetcher> m_fetcher;
- std::unique_ptr<WebDocumentSubresourceFilter> m_subresourceFilter;
+ OwnPtr<WebDocumentSubresourceFilter> m_subresourceFilter;
Member<RawResource> m_mainResource;

Powered by Google App Engine
This is Rietveld 408576698