update deep-memory-profiler policy for webcore.

    
ScriptExecute has changed to ScriptLoader.
(crrev.com/18261015)
HTMLElement::setInnerHTML has changed to Element:setInnerHTML.
(crrev.com/44333002)
CachedResource has changed to ResourceFetcher with cached property.
Node::createRendererIfNeeded is deprecated and replaced to
[a-zA-Z0-9_]*Element::createRender.
    
Bug=None
NOTRY=True

Review URL: https://codereview.chromium.org/392443002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282911 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 40 insertions, 58 deletions

diff --git a/tools/deep_memory_profiler/policy.android.renderer.json b/tools/deep_memory_profiler/policy.android.renderer.json
index 09620c8c..a2383a1 100644
--- a/tools/deep_memory_profiler/policy.android.renderer.json
+++ b/tools/deep_memory_profiler/policy.android.renderer.json
@@ -49,11 +49,11 @@
     "tc-webcore-element-wrapper",
     "tc-webcore-stylepropertyset",
     "tc-webcore-style-createsheet",
-    "tc-webcore-cachedresource",
+    "tc-webcore-resource",
     "tc-webcore-script-execute",
     "tc-webcore-events-related",
     "tc-webcore-document-write",
-    "tc-webcore-node-create-renderer",
+    "tc-webcore-element-create-renderer",
     "tc-webcore-image-frame-generator",
     "tc-webcore-render-catch-all",
     "tc-webcore-setInnerHTML-except-node",
@@ -382,18 +382,13 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::data .*",
-      "allocator": "malloc"
-    },
-    {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::load .*",
+      "name": "tc-webcore-resource",
+      "stacktrace": ".*WebCore::ResourceFetcher::requestResource .*",
       "allocator": "malloc"
     },
     {
       "name": "tc-webcore-script-execute",
-      "stacktrace": ".*WebCore::ScriptElement::execute.*",
+      "stacktrace": ".*WebCore::ScriptLoader::execute.*",
       "allocator": "malloc"
     },
     {
@@ -427,8 +422,8 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-node-create-renderer",
-      "stacktrace": ".*WebCore::Node::createRendererIfNeeded.*",
+      "name": "tc-webcore-element-create-renderer",
+      "stacktrace": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*",
       "allocator": "malloc"
     },
     {
@@ -478,7 +473,7 @@
     },
     {
       "name": "tc-webcore-setInnerHTML-except-node",
-      "stacktrace": ".*WebCore::HTMLElement::setInnerHTML.*",
+      "stacktrace": ".*WebCore::Element::setInnerHTML.*",
       "allocator": "malloc"
     },
     {
diff --git a/tools/deep_memory_profiler/policy.android.webview.json b/tools/deep_memory_profiler/policy.android.webview.json
index 3377719..ea51c23 100644
--- a/tools/deep_memory_profiler/policy.android.webview.json
+++ b/tools/deep_memory_profiler/policy.android.webview.json
@@ -57,11 +57,11 @@
     "tc-webcore-element-wrapper",
     "tc-webcore-stylepropertyset",
     "tc-webcore-style-createsheet",
-    "tc-webcore-cachedresource",
+    "tc-webcore-resource",
     "tc-webcore-script-execute",
     "tc-webcore-events-related",
     "tc-webcore-document-write",
-    "tc-webcore-node-create-renderer",
+    "tc-webcore-element-create-renderer",
     "tc-webcore-render-catch-all",
     "tc-webcore-setInnerHTML-except-node",
     "tc-wtf-StringImpl-user-catch-all",
@@ -424,18 +424,13 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::data .*",
-      "allocator": "malloc"
-    },
-    {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::load .*",
+      "name": "tc-webcore-resource",
+      "stacktrace": ".*WebCore::ResourceFetcher::requestResource .*",
       "allocator": "malloc"
     },
     {
       "name": "tc-webcore-script-execute",
-      "stacktrace": ".*WebCore::ScriptElement::execute.*",
+      "stacktrace": ".*WebCore::ScriptLoader::execute.*",
       "allocator": "malloc"
     },
     {
@@ -469,8 +464,8 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-node-create-renderer",
-      "stacktrace": ".*WebCore::Node::createRendererIfNeeded.*",
+      "name": "tc-webcore-element-create-renderer",
+      "stacktrace": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*",
       "allocator": "malloc"
     },
     {
@@ -515,7 +510,7 @@
     },
     {
       "name": "tc-webcore-setInnerHTML-except-node",
-      "stacktrace": ".*WebCore::HTMLElement::setInnerHTML.*",
+      "stacktrace": ".*WebCore::Element::setInnerHTML.*",
       "allocator": "malloc"
     },
     {
diff --git a/tools/deep_memory_profiler/policy.l2.json b/tools/deep_memory_profiler/policy.l2.json
index a443e9d..a88223e 100644
--- a/tools/deep_memory_profiler/policy.l2.json
+++ b/tools/deep_memory_profiler/policy.l2.json
@@ -38,11 +38,11 @@
     "tc-webcore-element-wrapper",
     "tc-webcore-stylepropertyset",
     "tc-webcore-style-createsheet",
-    "tc-webcore-cachedresource",
+    "tc-webcore-resource",
     "tc-webcore-script-execute",
     "tc-webcore-events-related",
     "tc-webcore-document-write",
-    "tc-webcore-node-create-renderer",
+    "tc-webcore-element-create-renderer",
     "tc-webcore-render-catch-all",
     "tc-webcore-setInnerHTML-except-node",
     "tc-wtf-StringImpl-user-catch-all",
@@ -316,18 +316,13 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::data .*",
-      "allocator": "malloc"
-    },
-    {
-      "name": "tc-webcore-cachedresource",
-      "stacktrace": ".*WebCore::CachedResource::load .*",
+      "name": "tc-webcore-resource",
+      "stacktrace": ".*WebCore::ResourceFetcher::requestResource .*", 
       "allocator": "malloc"
     },
     {
       "name": "tc-webcore-script-execute",
-      "stacktrace": ".*WebCore::ScriptElement::execute.*",
+      "stacktrace": ".*WebCore::ScriptLoader::execute.*",
       "allocator": "malloc"
     },
     {
@@ -361,8 +356,8 @@
       "allocator": "malloc"
     },
     {
-      "name": "tc-webcore-node-create-renderer",
-      "stacktrace": ".*WebCore::Node::createRendererIfNeeded.*",
+      "name": "tc-webcore-element-create-renderer",
+      "stacktrace": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*",
       "allocator": "malloc"
     },
     {
@@ -407,7 +402,7 @@
     },
     {
       "name": "tc-webcore-setInnerHTML-except-node",
-      "stacktrace": ".*WebCore::HTMLElement::setInnerHTML.*",
+      "stacktrace": ".*WebCore::Element::setInnerHTML.*",
       "allocator": "malloc"
     },
     {
diff --git a/tools/deep_memory_profiler/sorter.malloc-component.json b/tools/deep_memory_profiler/sorter.malloc-component.json
index d8064f6..ed82672 100644
--- a/tools/deep_memory_profiler/sorter.malloc-component.json
+++ b/tools/deep_memory_profiler/sorter.malloc-component.json
@@ -17,11 +17,11 @@
       "tc-webcore-element-wrapper",
       "tc-webcore-stylepropertyset",
       "tc-webcore-style-createsheet",
-      "tc-webcore-cachedresource",
+      "tc-webcore-resource",
       "tc-webcore-script-execute",
       "tc-webcore-events-related",
       "tc-webcore-document-write",
-      "tc-webcore-node-create-renderer",
+      "tc-webcore-element-create-renderer",
       "tc-webcore-render-catch-all",
       "tc-webcore-setInnerHTML-except-node",
       "tc-wtf-StringImpl-user-catch-all",
@@ -125,16 +125,12 @@
       "backtrace_function": ".*WebCore::StyleElement::createSheet.*"
     },
     {
-      "name": "tc-webcore-cachedresource",
-      "backtrace_function": ".*WebCore::CachedResource::data .*"
-    },
-    {
-      "name": "tc-webcore-cachedresource",
-      "backtrace_function": ".*WebCore::CachedResource::load .*"
+      "name": "tc-webcore-resource",
+      "backtrace_function": ".*WebCore::ResourceFetcher::requestResource .*"
     },
     {
       "name": "tc-webcore-script-execute",
-      "backtrace_function": ".*WebCore::ScriptElement::execute.*"
+      "backtrace_function": ".*WebCore::ScriptLoader::execute.*"
     },
     {
       "name": "tc-webcore-events-related",
@@ -161,8 +157,9 @@
       "backtrace_function": ".*WebCore::Document::write.*"
     },
     {
-      "name": "tc-webcore-node-create-renderer",
-      "backtrace_function": ".*WebCore::Node::createRendererIfNeeded.*"
+      "name": "tc-webcore-element-create-renderer",
+      "stacktrace": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*",
+      "allocator": "malloc"
     },
     {
       "name": "tc-webcore-render-catch-all",
@@ -198,7 +195,7 @@
     },
     {
       "name": "tc-webcore-setInnerHTML-except-node",
-      "backtrace_function": ".*WebCore::HTMLElement::setInnerHTML.*"
+      "backtrace_function": ".*WebCore::Element::setInnerHTML.*"
     },
     {
       "name": "tc-wtf-StringImpl-user-catch-all",
diff --git a/tools/deep_memory_profiler/sorters/malloc.WebCore.json b/tools/deep_memory_profiler/sorters/malloc.WebCore.json
index 8eb0776..3bc24b5 100644
--- a/tools/deep_memory_profiler/sorters/malloc.WebCore.json
+++ b/tools/deep_memory_profiler/sorters/malloc.WebCore.json
@@ -46,12 +46,12 @@
       "backtrace_function": ".*WebCore::StyleElement::createSheet.*"
     },
     {
-      "name": "CachedResource",
-      "backtrace_function": ".*WebCore::CachedResource::(data|load) .*"
+      "name": "Resource",
+      "backtrace_function": ".*WebCore::ResourceFetcher::requestResource .*"
     },
     {
-      "name": "ScriptElement-execute",
-      "backtrace_function": ".*WebCore::ScriptElement::execute.*"
+      "name": "ScriptLoader-execute",
+      "backtrace_function": ".*WebCore::ScriptLoader::execute.*"
     },
     {
       "name": "Events",
@@ -62,8 +62,8 @@
       "backtrace_function": ".*WebCore::Document::write.*"
     },
     {
-      "name": "Node-createRenderer",
-      "backtrace_function": ".*WebCore::Node::createRendererIfNeeded.*"
+      "name": "Element-createRenderer",
+      "backtrace_function": ".*WebCore::[a-zA-Z0-9_]*Element::createRenderer .*"
     },
     {
       "name": "ImageFrameGenerator",
@@ -75,7 +75,7 @@
     },
     {
       "name": "setInnerHTML",
-      "backtrace_function": ".*WebCore::HTMLElement::setInnerHTML.*"
+      "backtrace_function": ".*WebCore::Element::setInnerHTML.*"
     },
     {
       "name": "Others-create",