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

Side by Side Diff: third_party/WebKit/Source/core/fetch/XSLStyleSheetResource.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + address review comments Created 4 years, 10 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 17 matching lines...) Expand all
28 28
29 #include "core/fetch/FetchRequest.h" 29 #include "core/fetch/FetchRequest.h"
30 #include "core/fetch/ResourceClientWalker.h" 30 #include "core/fetch/ResourceClientWalker.h"
31 #include "core/fetch/ResourceFetcher.h" 31 #include "core/fetch/ResourceFetcher.h"
32 #include "core/fetch/StyleSheetResourceClient.h" 32 #include "core/fetch/StyleSheetResourceClient.h"
33 #include "platform/RuntimeEnabledFeatures.h" 33 #include "platform/RuntimeEnabledFeatures.h"
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 ResourcePtr<XSLStyleSheetResource> XSLStyleSheetResource::fetchSynchronously(Fet chRequest& request, ResourceFetcher* fetcher) 38 PassRefPtrWillBeRawPtr<XSLStyleSheetResource> XSLStyleSheetResource::fetchSynchr onously(FetchRequest& request, ResourceFetcher* fetcher)
39 { 39 {
40 request.mutableResourceRequest().setTimeoutInterval(10); 40 request.mutableResourceRequest().setTimeoutInterval(10);
41 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT); 41 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT);
42 ResourceLoaderOptions options(request.options()); 42 ResourceLoaderOptions options(request.options());
43 options.synchronousPolicy = RequestSynchronously; 43 options.synchronousPolicy = RequestSynchronously;
44 request.setOptions(options); 44 request.setOptions(options);
45 ResourcePtr<XSLStyleSheetResource> resource = toXSLStyleSheetResource(fetche r->requestResource(request, XSLStyleSheetResourceFactory())); 45 RefPtrWillBeRawPtr<XSLStyleSheetResource> resource = toXSLStyleSheetResource (fetcher->requestResource(request, XSLStyleSheetResourceFactory()));
46 if (resource && resource->m_data) 46 if (resource && resource->m_data)
47 resource->m_sheet = resource->decodedText(); 47 resource->m_sheet = resource->decodedText();
48 return resource; 48 return resource;
49 } 49 }
50 50
51 ResourcePtr<XSLStyleSheetResource> XSLStyleSheetResource::fetch(FetchRequest& re quest, ResourceFetcher* fetcher) 51 PassRefPtrWillBeRawPtr<XSLStyleSheetResource> XSLStyleSheetResource::fetch(Fetch Request& request, ResourceFetcher* fetcher)
52 { 52 {
53 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); 53 ASSERT(RuntimeEnabledFeatures::xsltEnabled());
54 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT); 54 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textXSLT);
55 return toXSLStyleSheetResource(fetcher->requestResource(request, XSLStyleShe etResourceFactory())); 55 return toXSLStyleSheetResource(fetcher->requestResource(request, XSLStyleShe etResourceFactory()));
56 } 56 }
57 57
58 XSLStyleSheetResource::XSLStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset) 58 XSLStyleSheetResource::XSLStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset)
59 : StyleSheetResource(resourceRequest, XSLStyleSheet, "text/xsl", charset) 59 : StyleSheetResource(resourceRequest, XSLStyleSheet, "text/xsl", charset)
60 { 60 {
61 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); 61 ASSERT(RuntimeEnabledFeatures::xsltEnabled());
(...skipping 16 matching lines...) Expand all
78 { 78 {
79 if (m_data.get()) 79 if (m_data.get())
80 m_sheet = decodedText(); 80 m_sheet = decodedText();
81 81
82 ResourceClientWalker<StyleSheetResourceClient> w(m_clients); 82 ResourceClientWalker<StyleSheetResourceClient> w(m_clients);
83 while (StyleSheetResourceClient* c = w.next()) 83 while (StyleSheetResourceClient* c = w.next())
84 c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet); 84 c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
85 } 85 }
86 86
87 } // namespace blink 87 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/XSLStyleSheetResource.h ('k') | third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698