Unreviewed, rolling out r142113.

http://trac.webkit.org/changeset/142113
https://bugs.webkit.org/show_bug.cgi?id=109244

tests started failing after r142081 was rolled out in r142166
(Requested by falken on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-07

* inspector/profiler/memory-instrumentation-cached-images-expected.txt:
* inspector/profiler/memory-instrumentation-cached-images.html:
* inspector/profiler/memory-instrumentation-canvas-expected.txt:
* inspector/profiler/memory-instrumentation-canvas.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b078638f914ae41c39728618162b0724a5d405d8..6850dae5d24829357d358878bd1a27b17c3ed3f4 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142113.
+        http://trac.webkit.org/changeset/142113
+        https://bugs.webkit.org/show_bug.cgi?id=109244
+
+        tests started failing after r142081 was rolled out in r142166
+        (Requested by falken on #webkit).
+
+        * inspector/profiler/memory-instrumentation-cached-images-expected.txt:
+        * inspector/profiler/memory-instrumentation-cached-images.html:
+        * inspector/profiler/memory-instrumentation-canvas-expected.txt:
+        * inspector/profiler/memory-instrumentation-canvas.html:
+
 2013-02-07  Elliott Sprehn  <esprehn@chromium.org>
 
         getComputedStyle() doesn't report intermediate values during a transition of a pseudo element

diff --git a/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt b/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt
index 7fb507f9f85c99c5e314882b24d2229b2291f2b7..9a4979747e3d9b56a39c4914e4060837e7f813e7 100644 (file)
--- a/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt
+++ b/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt
@@ -1,5 +1,5 @@
 This test checks that CachedImages size reported by the memory agent includes images decoded size. Bug 93366
 
 
-PASS: block size for path = [ProcessPrivateMemory, Image] is OK.
+PASS: block size for path = [ProcessPrivateMemory, Page, Image] is OK.
 

diff --git a/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html b/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html
index ffddea71a55a38e192c7537e2b37be35e1e35cf1..a4025cafdc1e6cddb8155a5cf69acceb620e64e0 100644 (file)
--- a/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html
+++ b/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html
@@ -14,7 +14,7 @@ function displayAndRunTest()
 function test()
 {
     var jpegDecodedSizeExpected = 20000000;
-    InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Image"], jpegDecodedSizeExpected);
+    InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Page", "Image"], jpegDecodedSizeExpected);
 }
 
 </script>

diff --git a/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt b/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt
index 2fa6ea35d9e92ee8c0d149f1bc59550df56f4657..8890b9e969c1310b83db226364fe1465af21ffdc 100644 (file)
--- a/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt
+++ b/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt
@@ -1,4 +1,4 @@
 This test checks that page's image size reported by the memory agent includes size of canvas internal image buffer.
 
- PASS: block size for path = [ProcessPrivateMemory, Image] is OK.
+ PASS: block size for path = [ProcessPrivateMemory, Page, Image] is OK.
 

diff --git a/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html b/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html
index 5b0c765a2048044d8a33b071f56a6e681c57a286..375e19fa48a6052c3f5583e1dd4db8ce3cea156d 100644 (file)
--- a/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html
+++ b/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html
@@ -17,7 +17,7 @@ function displayAndRunTest()
 function test()
 {
     var canvasImageBufferExpected = 4000000;
-    InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Image"], canvasImageBufferExpected);
+    InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Page", "Image"], canvasImageBufferExpected);
 }
 
 </script>