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

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 832933005: Oilpan: fix webkit unit tests following r187980. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 namespace blink { 82 namespace blink {
83 83
84 static Resource* createResource(Resource::Type type, const ResourceRequest& requ est, const String& charset) 84 static Resource* createResource(Resource::Type type, const ResourceRequest& requ est, const String& charset)
85 { 85 {
86 switch (type) { 86 switch (type) {
87 case Resource::Image: 87 case Resource::Image:
88 return new ImageResource(request); 88 return new ImageResource(request);
89 case Resource::CSSStyleSheet: 89 case Resource::CSSStyleSheet:
90 return new CSSStyleSheetResource(request, charset); 90 return new CSSStyleSheetResource(request, charset);
91 case Resource::Script: 91 case Resource::Script:
92 return new ScriptResource(request, charset); 92 return ScriptResource::create(request, charset).leakPtr();
93 case Resource::SVGDocument: 93 case Resource::SVGDocument:
94 return new DocumentResource(request, Resource::SVGDocument); 94 return new DocumentResource(request, Resource::SVGDocument);
95 case Resource::Font: 95 case Resource::Font:
96 return new FontResource(request); 96 return new FontResource(request);
97 case Resource::MainResource: 97 case Resource::MainResource:
98 case Resource::Raw: 98 case Resource::Raw:
99 case Resource::TextTrack: 99 case Resource::TextTrack:
100 case Resource::Media: 100 case Resource::Media:
101 return new RawResource(request, type); 101 return new RawResource(request, type);
102 case Resource::XSLStyleSheet: 102 case Resource::XSLStyleSheet:
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 1575
1576 void ResourceFetcher::trace(Visitor* visitor) 1576 void ResourceFetcher::trace(Visitor* visitor)
1577 { 1577 {
1578 visitor->trace(m_document); 1578 visitor->trace(m_document);
1579 visitor->trace(m_loaders); 1579 visitor->trace(m_loaders);
1580 visitor->trace(m_nonBlockingLoaders); 1580 visitor->trace(m_nonBlockingLoaders);
1581 ResourceLoaderHost::trace(visitor); 1581 ResourceLoaderHost::trace(visitor);
1582 } 1582 }
1583 1583
1584 } 1584 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698