Index: tools/deep_memory_profiler/policy.android.webview.json |
diff --git a/tools/deep_memory_profiler/policy.android.webview.json b/tools/deep_memory_profiler/policy.android.webview.json |
index ea51c23985b1b8e4f337787d005de03c7a93c4d3..e44a791c5a0fc94cccb8f4ac6c1ba74a1f7857bc 100644 |
--- a/tools/deep_memory_profiler/policy.android.webview.json |
+++ b/tools/deep_memory_profiler/policy.android.webview.json |
@@ -320,7 +320,7 @@ |
}, |
{ |
"name": "tc-webcore-fontcache", |
- "stacktrace": ".*WebCore::FontCache::getCachedFontData.*", |
+ "stacktrace": ".*(WebCore|blink)::FontCache::getCachedFontData.*", |
"allocator": "malloc" |
}, |
{ |
@@ -330,177 +330,177 @@ |
}, |
{ |
"name": "tc-renderstyle", |
- "stacktrace": ".*WebCore::RenderStyle::create.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderStyle::create.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-renderstyle", |
- "stacktrace": ".*WebCore::RenderStyle::clone.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderStyle::clone.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-sharedbuf", |
- "stacktrace": ".*WebCore::SharedBuffer::create.*", |
+ "stacktrace": ".*(WebCore|blink)::SharedBuffer::create.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-sharedbuf", |
- "stacktrace": ".*WebCore::SharedBuffer::buffer.*", |
+ "stacktrace": ".*(WebCore|blink)::SharedBuffer::buffer.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-sharedbuf", |
- "stacktrace": ".*WebCore::SharedBuffer::append.*", |
+ "stacktrace": ".*(WebCore|blink)::SharedBuffer::append.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-XHRcreate", |
- "stacktrace": ".*WebCore::XMLHttpRequest::create .*", |
+ "stacktrace": ".*(WebCore|blink)::XMLHttpRequest::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-XHRreceived", |
- "stacktrace": ".*WebCore::XMLHttpRequest::didReceiveData.*", |
+ "stacktrace": ".*(WebCore|blink)::XMLHttpRequest::didReceiveData.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-docwriter-add", |
- "stacktrace": ".*WebCore::DocumentWriter::addData.*", |
+ "stacktrace": ".*(WebCore|blink)::DocumentWriter::addData.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::HTML[a-zA-Z0-9_]*Element::create .*", |
+ "stacktrace": ".*(WebCore|blink)::HTML[a-zA-Z0-9_]*Element::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::Text::create .*", |
+ "stacktrace": ".*(WebCore|blink)::Text::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::Comment::create .*", |
+ "stacktrace": ".*(WebCore|blink)::Comment::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::HTMLDocument::create .*", |
+ "stacktrace": ".*(WebCore|blink)::HTMLDocument::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::CSSStyleRule::create .*", |
+ "stacktrace": ".*(WebCore|blink)::CSSStyleRule::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::Attribute::create .*", |
+ "stacktrace": ".*(WebCore|blink)::Attribute::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-and-doc", |
- "stacktrace": ".*WebCore::DOMWindow::create .*", |
+ "stacktrace": ".*(WebCore|blink)::DOMWindow::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-node-factory", |
- "stacktrace": ".*WebCore::HTML[a-zA-Z0-9_]*Factory::create[a-zA-Z0-9_]*Element.*", |
+ "stacktrace": ".*(WebCore|blink)::HTML[a-zA-Z0-9_]*Factory::create[a-zA-Z0-9_]*Element.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-element-wrapper", |
- "stacktrace": ".*WebCore::createHTML[a-zA-Z0-9_]*ElementWrapper.*", |
+ "stacktrace": ".*(WebCore|blink)::createHTML[a-zA-Z0-9_]*ElementWrapper.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-stylepropertyset", |
- "stacktrace": ".*WebCore::StylePropertySet::create .*", |
+ "stacktrace": ".*(WebCore|blink)::StylePropertySet::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-style-createsheet", |
- "stacktrace": ".*WebCore::StyleElement::createSheet.*", |
+ "stacktrace": ".*(WebCore|blink)::StyleElement::createSheet.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-resource", |
- "stacktrace": ".*WebCore::ResourceFetcher::requestResource .*", |
+ "stacktrace": ".*(WebCore|blink)::ResourceFetcher::requestResource .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-script-execute", |
- "stacktrace": ".*WebCore::ScriptLoader::execute.*", |
+ "stacktrace": ".*(WebCore|blink)::ScriptLoader::execute.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-events-related", |
- "stacktrace": ".*WebCore::createAttributeEventListener.*", |
+ "stacktrace": ".*(WebCore|blink)::createAttributeEventListener.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-events-related", |
- "stacktrace": ".*WebCore::V8LazyEventListener::create.*", |
+ "stacktrace": ".*(WebCore|blink)::V8LazyEventListener::create.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-events-related", |
- "stacktrace": ".*WebCore::V8EventListener::create.*", |
+ "stacktrace": ".*(WebCore|blink)::V8EventListener::create.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-events-related", |
- "stacktrace": ".*WebCore::Event::create .*", |
+ "stacktrace": ".*(WebCore|blink)::Event::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-events-related", |
- "stacktrace": ".*WebCore::EventListener::create .*", |
+ "stacktrace": ".*(WebCore|blink)::EventListener::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-document-write", |
- "stacktrace": ".*WebCore::Document::write.*", |
+ "stacktrace": ".*(WebCore|blink)::Document::write.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-element-create-renderer", |
- "stacktrace": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*", |
+ "stacktrace": ".*(WebCore|blink)::[a-zA-Z0-9_]*Element::createRenderer .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderLayer.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderLayer.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderBlock.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderBlock.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderWidget.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderWidget.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderView.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderView.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderViewImpl.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderViewImpl.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderStyle.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderStyle.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webcore-render-catch-all", |
- "stacktrace": ".*WebCore::RenderText.*", |
+ "stacktrace": ".*(WebCore|blink)::RenderText.*", |
"allocator": "malloc" |
}, |
{ |
@@ -510,7 +510,7 @@ |
}, |
{ |
"name": "tc-webcore-setInnerHTML-except-node", |
- "stacktrace": ".*WebCore::Element::setInnerHTML.*", |
+ "stacktrace": ".*(WebCore|blink)::Element::setInnerHTML.*", |
"allocator": "malloc" |
}, |
{ |
@@ -530,17 +530,17 @@ |
}, |
{ |
"name": "tc-webcore-everything-create", |
- "stacktrace": ".*WebCore::[a-zA-Z0-9_]*::create .*", |
+ "stacktrace": ".*(WebCore|blink)::[a-zA-Z0-9_]*::create .*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webkit-from-v8-catch-all", |
- "stacktrace": ".*(WTF::|WebCore::|WebKit::).*v8::.*", |
+ "stacktrace": ".*(WTF::|WebCore::|blink::|WebKit::).*v8::.*", |
"allocator": "malloc" |
}, |
{ |
"name": "tc-webkit-catch-all", |
- "stacktrace": ".*(WTF::|WebCore::|WebKit::).*", |
+ "stacktrace": ".*(WTF::|WebCore::|blink::|WebKit::).*", |
"allocator": "malloc" |
}, |
{ |