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

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

Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // because setCSSStyleSheet() may cause scripts to be executed, which could destroy 'c' if it is an instance of HTMLLinkElement. 80 // because setCSSStyleSheet() may cause scripts to be executed, which could destroy 'c' if it is an instance of HTMLLinkElement.
81 // see the comment of HTMLLinkElement::setCSSStyleSheet. 81 // see the comment of HTMLLinkElement::setCSSStyleSheet.
82 Resource::didAddClient(c); 82 Resource::didAddClient(c);
83 83
84 if (!isLoading()) 84 if (!isLoading())
85 static_cast<StyleSheetResourceClient*>(c)->setCSSStyleSheet(resourceRequ est().url(), response().url(), encoding(), this); 85 static_cast<StyleSheetResourceClient*>(c)->setCSSStyleSheet(resourceRequ est().url(), response().url(), encoding(), this);
86 } 86 }
87 87
88 const String CSSStyleSheetResource::sheetText(MIMETypeCheck mimeTypeCheck) const 88 const String CSSStyleSheetResource::sheetText(MIMETypeCheck mimeTypeCheck) const
89 { 89 {
90 ASSERT(!isPurgeable());
91
92 if (!data() || data()->isEmpty() || !canUseSheet(mimeTypeCheck)) 90 if (!data() || data()->isEmpty() || !canUseSheet(mimeTypeCheck))
93 return String(); 91 return String();
94 92
95 if (!m_decodedSheetText.isNull()) 93 if (!m_decodedSheetText.isNull())
96 return m_decodedSheetText; 94 return m_decodedSheetText;
97 95
98 // Don't cache the decoded text, regenerating is cheap and it can use quite a bit of memory 96 // Don't cache the decoded text, regenerating is cheap and it can use quite a bit of memory
99 return decodedText(); 97 return decodedText();
100 } 98 }
101 99
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // This stylesheet resource did conflict with another resource and was 171 // This stylesheet resource did conflict with another resource and was
174 // not added to the cache. 172 // not added to the cache.
175 setParsedStyleSheetCache(nullptr); 173 setParsedStyleSheetCache(nullptr);
176 return; 174 return;
177 } 175 }
178 setParsedStyleSheetCache(sheet); 176 setParsedStyleSheetCache(sheet);
179 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes()); 177 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
180 } 178 }
181 179
182 } // namespace blink 180 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698