| Index: third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
|
| index f73104b922a4b344db713a6327bd24f7e95bb851..1b9e7c06f487c6423b7e7801bc66ac6ba2b9fc86 100644
|
| --- a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
|
| +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
|
| @@ -48,9 +48,9 @@ const char* HTMLImportsController::supplementName()
|
|
|
| void HTMLImportsController::provideTo(Document& master)
|
| {
|
| - OwnPtrWillBeRawPtr<HTMLImportsController> controller = adoptPtrWillBeNoop(new HTMLImportsController(master));
|
| + RawPtr<HTMLImportsController> controller = new HTMLImportsController(master);
|
| master.setImportsController(controller.get());
|
| - WillBeHeapSupplement<Document>::provideTo(master, supplementName(), controller.release());
|
| + HeapSupplement<Document>::provideTo(master, supplementName(), controller.release());
|
| }
|
|
|
| void HTMLImportsController::removeFrom(Document& master)
|
| @@ -58,7 +58,7 @@ void HTMLImportsController::removeFrom(Document& master)
|
| HTMLImportsController* controller = master.importsController();
|
| ASSERT(controller);
|
| controller->dispose();
|
| - static_cast<WillBeHeapSupplementable<Document>&>(master).removeSupplement(supplementName());
|
| + static_cast<HeapSupplementable<Document>&>(master).removeSupplement(supplementName());
|
| master.setImportsController(nullptr);
|
| }
|
|
|
| @@ -104,7 +104,7 @@ HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImportL
|
| if (mode == HTMLImport::Async)
|
| UseCounter::count(root()->document(), UseCounter::HTMLImportsAsyncAttribute);
|
|
|
| - OwnPtrWillBeRawPtr<HTMLImportChild> child = adoptPtrWillBeNoop(new HTMLImportChild(url, loader, mode));
|
| + RawPtr<HTMLImportChild> child = new HTMLImportChild(url, loader, mode);
|
| child->setClient(client);
|
| parent->appendImport(child.get());
|
| loader->addImport(child.get());
|
| @@ -125,7 +125,7 @@ HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild
|
| }
|
|
|
| request.setCrossOriginAccessControl(master()->getSecurityOrigin(), CrossOriginAttributeAnonymous);
|
| - RefPtrWillBeRawPtr<RawResource> resource = RawResource::fetchImport(request, parent->document()->fetcher());
|
| + RawPtr<RawResource> resource = RawResource::fetchImport(request, parent->document()->fetcher());
|
| if (!resource)
|
| return nullptr;
|
|
|
| @@ -176,7 +176,7 @@ DEFINE_TRACE(HTMLImportsController)
|
| {
|
| visitor->trace(m_root);
|
| visitor->trace(m_loaders);
|
| - WillBeHeapSupplement<Document>::trace(visitor);
|
| + HeapSupplement<Document>::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|