Index: third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp |
diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp |
index ad829bc1d99588bb8d620d421d18e290daaddfbe..28cdafbcc5cf0cf445b88c2f06f576113bbd5df7 100644 |
--- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp |
@@ -46,7 +46,8 @@ using namespace HTMLNames; |
CSSDefaultStyleSheets& CSSDefaultStyleSheets::instance() |
{ |
- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSDefaultStyleSheets>, cssDefaultStyleSheets, (adoptPtrWillBeNoop(new CSSDefaultStyleSheets()))); |
+ WTF_ANNOTATE_SCOPED_MEMORY_LEAK; |
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<CSSDefaultStyleSheets>, cssDefaultStyleSheets, (adoptPtrWillBeNoop(new CSSDefaultStyleSheets))); |
haraken
2015/11/30 01:48:47
What happens if we insert WTF_ANNOTATE_SCOPED_MEMO
sof
2015/11/30 21:53:39
I think it will mostly be non-harmful, with or wit
|
return *cssDefaultStyleSheets; |
} |
@@ -106,6 +107,7 @@ CSSDefaultStyleSheets::CSSDefaultStyleSheets() |
RuleSet* CSSDefaultStyleSheets::defaultViewSourceStyle() |
{ |
if (!m_defaultViewSourceStyle) { |
+ WTF_ANNOTATE_SCOPED_MEMORY_LEAK; |
m_defaultViewSourceStyle = RuleSet::create(); |
// Loaded stylesheet is leaked on purpose. |
RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(loadResourceAsASCIIString("view-source.css")); |
@@ -117,6 +119,7 @@ RuleSet* CSSDefaultStyleSheets::defaultViewSourceStyle() |
RuleSet* CSSDefaultStyleSheets::defaultXHTMLMobileProfileStyle() |
{ |
if (!m_defaultXHTMLMobileProfileStyle) { |
+ WTF_ANNOTATE_SCOPED_MEMORY_LEAK; |
m_defaultXHTMLMobileProfileStyle = RuleSet::create(); |
// Loaded stylesheet is leaked on purpose. |
RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(loadResourceAsASCIIString("xhtmlmp.css")); |
@@ -128,6 +131,7 @@ RuleSet* CSSDefaultStyleSheets::defaultXHTMLMobileProfileStyle() |
RuleSet* CSSDefaultStyleSheets::defaultMobileViewportStyle() |
{ |
if (!m_defaultMobileViewportStyle) { |
+ WTF_ANNOTATE_SCOPED_MEMORY_LEAK; |
m_defaultMobileViewportStyle = RuleSet::create(); |
m_mobileViewportStyleSheet = parseUASheet(loadResourceAsASCIIString("viewportAndroid.css")); |
m_defaultMobileViewportStyle->addRulesFromSheet(m_mobileViewportStyleSheet.get(), screenEval()); |
@@ -139,6 +143,7 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(const Element& el |
{ |
// FIXME: We should assert that the sheet only styles SVG elements. |
if (element.isSVGElement() && !m_svgStyleSheet) { |
+ WTF_ANNOTATE_SCOPED_MEMORY_LEAK; |
m_svgStyleSheet = parseUASheet(loadResourceAsASCIIString("svg.css")); |
m_defaultStyle->addRulesFromSheet(svgStyleSheet(), screenEval()); |
m_defaultPrintStyle->addRulesFromSheet(svgStyleSheet(), printEval()); |