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

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

Issue 1576423005: Revert of Fix null dereference on MemoryCache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 4 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
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 27 matching lines...) Expand all
38 38
39 namespace blink { 39 namespace blink {
40 40
41 ResourcePtr<CSSStyleSheetResource> CSSStyleSheetResource::fetch(FetchRequest& re quest, ResourceFetcher* fetcher) 41 ResourcePtr<CSSStyleSheetResource> CSSStyleSheetResource::fetch(FetchRequest& re quest, ResourceFetcher* fetcher)
42 { 42 {
43 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); 43 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
44 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textStyle); 44 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textStyle);
45 return toCSSStyleSheetResource(fetcher->requestResource(request, CSSStyleShe etResourceFactory())); 45 return toCSSStyleSheetResource(fetcher->requestResource(request, CSSStyleShe etResourceFactory()));
46 } 46 }
47 47
48 ResourcePtr<CSSStyleSheetResource> CSSStyleSheetResource::createForTest(const Re sourceRequest& request, const String& charset)
49 {
50 return new CSSStyleSheetResource(request, charset);
51 }
52
53 CSSStyleSheetResource::CSSStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset) 48 CSSStyleSheetResource::CSSStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset)
54 : StyleSheetResource(resourceRequest, CSSStyleSheet, "text/css", charset) 49 : StyleSheetResource(resourceRequest, CSSStyleSheet, "text/css", charset)
55 { 50 {
56 DEFINE_STATIC_LOCAL(const AtomicString, acceptCSS, ("text/css,*/*;q=0.1", At omicString::ConstructFromLiteral)); 51 DEFINE_STATIC_LOCAL(const AtomicString, acceptCSS, ("text/css,*/*;q=0.1", At omicString::ConstructFromLiteral));
57 52
58 // Prefer text/css but accept any type (dell.com serves a stylesheet 53 // Prefer text/css but accept any type (dell.com serves a stylesheet
59 // as text/html; see <http://bugs.webkit.org/show_bug.cgi?id=11451>). 54 // as text/html; see <http://bugs.webkit.org/show_bug.cgi?id=11451>).
60 setAccept(acceptCSS); 55 setAccept(acceptCSS);
61 } 56 }
62 57
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 179
185 if (m_parsedStyleSheetCache) 180 if (m_parsedStyleSheetCache)
186 m_parsedStyleSheetCache->removedFromMemoryCache(); 181 m_parsedStyleSheetCache->removedFromMemoryCache();
187 m_parsedStyleSheetCache = sheet; 182 m_parsedStyleSheetCache = sheet;
188 m_parsedStyleSheetCache->addedToMemoryCache(); 183 m_parsedStyleSheetCache->addedToMemoryCache();
189 184
190 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes()); 185 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
191 } 186 }
192 187
193 } 188 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.h ('k') | third_party/WebKit/Source/core/fetch/MemoryCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698