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

Side by Side Diff: Source/core/fetch/ScriptResource.h

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/fetch/ScriptResource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 14 matching lines...) Expand all
25 25
26 #ifndef ScriptResource_h 26 #ifndef ScriptResource_h
27 #define ScriptResource_h 27 #define ScriptResource_h
28 28
29 #include "core/CoreExport.h" 29 #include "core/CoreExport.h"
30 #include "core/fetch/ResourceClient.h" 30 #include "core/fetch/ResourceClient.h"
31 #include "core/fetch/TextResource.h" 31 #include "core/fetch/TextResource.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class FetchRequest;
35 class ScriptResource; 36 class ScriptResource;
36 37
37 class CORE_EXPORT ScriptResourceClient : public ResourceClient { 38 class CORE_EXPORT ScriptResourceClient : public ResourceClient {
38 public: 39 public:
39 virtual ~ScriptResourceClient() { } 40 virtual ~ScriptResourceClient() { }
40 static ResourceClientType expectedType() { return ScriptType; } 41 static ResourceClientType expectedType() { return ScriptType; }
41 virtual ResourceClientType resourceClientType() const override final { retur n expectedType(); } 42 virtual ResourceClientType resourceClientType() const override final { retur n expectedType(); }
42 43
43 virtual void notifyAppendData(ScriptResource* resource) { } 44 virtual void notifyAppendData(ScriptResource* resource) { }
44 }; 45 };
45 46
46 class CORE_EXPORT ScriptResource final : public TextResource { 47 class CORE_EXPORT ScriptResource final : public TextResource {
47 public: 48 public:
48 typedef ScriptResourceClient ClientType; 49 typedef ScriptResourceClient ClientType;
49 static PassOwnPtrWillBeRawPtr<ScriptResource> create(const ResourceRequest& request, const String& charset) 50 static ResourcePtr<ScriptResource> fetch(FetchRequest&, ResourceFetcher*);
50 { 51
51 return adoptPtrWillBeNoop(new ScriptResource(request, charset)); 52 // Public for testing
52 } 53 ScriptResource(const ResourceRequest&, const String& charset);
53 54
54 virtual ~ScriptResource(); 55 virtual ~ScriptResource();
55 56
56 virtual void didAddClient(ResourceClient*) override; 57 virtual void didAddClient(ResourceClient*) override;
57 virtual void appendData(const char*, unsigned) override; 58 virtual void appendData(const char*, unsigned) override;
58 59
59 const String& script(); 60 const String& script();
60 61
61 AtomicString mimeType() const; 62 AtomicString mimeType() const;
62 63
63 bool mimeTypeAllowedByNosniff() const; 64 bool mimeTypeAllowedByNosniff() const;
64 65
65 private: 66 private:
66 ScriptResource(const ResourceRequest&, const String& charset); 67 class ScriptResourceFactory : public ResourceFactory {
68 public:
69 ScriptResourceFactory()
70 : ResourceFactory(Resource::Script) { }
71
72 Resource* create(const ResourceRequest& request, const String& charset) const override
73 {
74 return new ScriptResource(request, charset);
75 }
76 };
67 77
68 AtomicString m_script; 78 AtomicString m_script;
69 }; 79 };
70 80
71 DEFINE_RESOURCE_TYPE_CASTS(Script); 81 DEFINE_RESOURCE_TYPE_CASTS(Script);
72 82
73 } 83 }
74 84
75 #endif 85 #endif
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcherTest.cpp ('k') | Source/core/fetch/ScriptResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698