[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:35:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 27d72260bb89607e1e9b8291e24d47f15f92ed68
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 26 16:53:25 2010 +0000
2010-11-26 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r72701.
http://trac.webkit.org/changeset/72701
https://bugs.webkit.org/show_bug.cgi?id=50114
REGRESSION: bad transform matrix on content layer (Requested
by backer on #webkit).
* compositing/lots-of-img-layers-with-opacity.html: Removed.
* compositing/lots-of-img-layers.html: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.checksum: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.png: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.txt: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.checksum: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.png: Removed.
* platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.txt: Removed.
* platform/chromium-gpu/test_expectations.txt:
* platform/mac/compositing/lots-of-img-layers-expected.checksum: Removed.
* platform/mac/compositing/lots-of-img-layers-expected.png: Removed.
* platform/mac/compositing/lots-of-img-layers-expected.txt: Removed.
* platform/mac/compositing/lots-of-img-layers-with-opacity-expected.checksum: Removed.
* platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png: Removed.
* platform/mac/compositing/lots-of-img-layers-with-opacity-expected.txt: Removed.
2010-11-26 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r72701.
http://trac.webkit.org/changeset/72701
https://bugs.webkit.org/show_bug.cgi?id=50114
REGRESSION: bad transform matrix on content layer (Requested
by backer on #webkit).
* WebCore.gypi:
* platform/graphics/chromium/Canvas2DLayerChromium.cpp:
(WebCore::Canvas2DLayerChromium::updateContents):
* platform/graphics/chromium/Canvas2DLayerChromium.h:
* platform/graphics/chromium/ContentLayerChromium.cpp:
(WebCore::ContentLayerChromium::cleanupResources):
(WebCore::ContentLayerChromium::updateContents):
(WebCore::ContentLayerChromium::updateTextureRect):
(WebCore::ContentLayerChromium::draw):
* platform/graphics/chromium/ContentLayerChromium.h:
* platform/graphics/chromium/ImageLayerChromium.cpp:
(WebCore::ImageLayerChromium::updateContents):
* platform/graphics/chromium/ImageLayerChromium.h:
* platform/graphics/chromium/LayerChromium.h:
(WebCore::LayerChromium::contentsDirty):
(WebCore::LayerChromium::updateContents):
(WebCore::LayerChromium::draw):
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::LayerRendererChromium):
(WebCore::LayerRendererChromium::prepareToDrawLayers):
(WebCore::LayerRendererChromium::drawLayers):
(WebCore::LayerRendererChromium::updateLayersRecursive):
(WebCore::LayerRendererChromium::useRenderSurface):
(WebCore::LayerRendererChromium::drawLayer):
(WebCore::LayerRendererChromium::initializeSharedObjects):
(WebCore::LayerRendererChromium::cleanupSharedObjects):
* platform/graphics/chromium/LayerRendererChromium.h:
* platform/graphics/chromium/LayerTexture.cpp: Removed.
* platform/graphics/chromium/LayerTexture.h: Removed.
* platform/graphics/chromium/PluginLayerChromium.cpp:
(WebCore::PluginLayerChromium::updateContents):
* platform/graphics/chromium/PluginLayerChromium.h:
* platform/graphics/chromium/RenderSurfaceChromium.cpp:
(WebCore::RenderSurfaceChromium::RenderSurfaceChromium):
(WebCore::RenderSurfaceChromium::cleanupResources):
(WebCore::RenderSurfaceChromium::prepareContentsTexture):
* platform/graphics/chromium/RenderSurfaceChromium.h:
* platform/graphics/chromium/TextureManager.cpp: Removed.
* platform/graphics/chromium/TextureManager.h: Removed.
* platform/graphics/chromium/VideoLayerChromium.cpp:
(WebCore::VideoLayerChromium::updateContents):
* platform/graphics/chromium/VideoLayerChromium.h:
* platform/graphics/chromium/WebGLLayerChromium.cpp:
(WebCore::WebGLLayerChromium::updateContents):
* platform/graphics/chromium/WebGLLayerChromium.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72770 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 64fb53e..dc5ab80 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,28 @@
+2010-11-26 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r72701.
+ http://trac.webkit.org/changeset/72701
+ https://bugs.webkit.org/show_bug.cgi?id=50114
+
+ REGRESSION: bad transform matrix on content layer (Requested
+ by backer on #webkit).
+
+ * compositing/lots-of-img-layers-with-opacity.html: Removed.
+ * compositing/lots-of-img-layers.html: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.checksum: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.png: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.txt: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.checksum: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.png: Removed.
+ * platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.txt: Removed.
+ * platform/chromium-gpu/test_expectations.txt:
+ * platform/mac/compositing/lots-of-img-layers-expected.checksum: Removed.
+ * platform/mac/compositing/lots-of-img-layers-expected.png: Removed.
+ * platform/mac/compositing/lots-of-img-layers-expected.txt: Removed.
+ * platform/mac/compositing/lots-of-img-layers-with-opacity-expected.checksum: Removed.
+ * platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png: Removed.
+ * platform/mac/compositing/lots-of-img-layers-with-opacity-expected.txt: Removed.
+
2010-11-26 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Steve Block.
diff --git a/LayoutTests/compositing/lots-of-img-layers-with-opacity.html b/LayoutTests/compositing/lots-of-img-layers-with-opacity.html
deleted file mode 100644
index 1744689..0000000
--- a/LayoutTests/compositing/lots-of-img-layers-with-opacity.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<body style="overflow:hidden">
-<script>
-for (var i=0; i<350; ++i) {
- var img = document.createElement("img");
- img.style.webkitTransform = "rotate("+(i/2)+"deg) translateZ(0)";
- img.style.webkitTransformOrigin = "300px 300px";
- img.style.position = "absolute";
- img.style.opacity = 0.2;
- document.body.appendChild(img);
- img.src = "resources/apple.jpg";
-}
-</script>
-</body>
-
diff --git a/LayoutTests/compositing/lots-of-img-layers.html b/LayoutTests/compositing/lots-of-img-layers.html
deleted file mode 100644
index f22389e..0000000
--- a/LayoutTests/compositing/lots-of-img-layers.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<body style="overflow:hidden">
-<script>
-for (var i=0; i<350; ++i) {
- var img = document.createElement("img");
- img.style.webkitTransform = "rotate("+i+"deg) translateZ(0)";
- img.style.webkitTransformOrigin = "300px 300px";
- img.style.position = "absolute";
- document.body.appendChild(img);
- img.src = "resources/apple.jpg";
-}
-</script>
-</body>
-
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.checksum b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.checksum
deleted file mode 100644
index 6bc3769..0000000
--- a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-87fa5eccd988570bd19aaa2505cc8c2d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.png b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index 809e653..0000000
Binary files a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.txt b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.txt
deleted file mode 100644
index c75f32b..0000000
--- a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-expected.txt
+++ /dev/null
@@ -1,705 +0,0 @@
-layer at (0,0) size 800x733
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.checksum b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.checksum
deleted file mode 100644
index 09b3f42..0000000
--- a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-49186f5dccb4d787d4b8e7319c9dde10
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.png b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 9d75ba5..0000000
Binary files a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.txt b/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.txt
deleted file mode 100644
index f027408..0000000
--- a/LayoutTests/platform/chromium-gpu-win/compositing/lots-of-img-layers-with-opacity-expected.txt
+++ /dev/null
@@ -1,705 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index d52831a..918f591 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -361,11 +361,6 @@ BUGWK48029 MAC : compositing/tiling/huge-layer-with-layer-children-resize.html =
BUGWK47243 LINUX : fast/canvas/webgl/uniform-location.html = TIMEOUT TEXT
BUGWK47243 WIN : fast/canvas/webgl/uniform-location.html = CRASH
-// These tests are too slow with our MESA backend. We can re-enable when we have
-// bots running tests on real hardware.
-BUGWK49629 SKIP : compositing/lots-of-img-layers.html = PASS
-BUGWK49629 SKIP : compositing/lots-of-img-layers-with-opacity.html = PASS
-
BUG57431 WIN LINUX : fast/canvas/canvas-strokeRect.html = TEXT
BUG57432 WIN LINUX : fast/canvas/drawImage-with-negative-source-destination.html = TEXT
BUG58534 WIN LINUX : canvas/philip/tests/2d.composite.globalAlpha.fill.html = TEXT
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.checksum b/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.checksum
deleted file mode 100644
index 21594a1..0000000
--- a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-54b5f5706764ae516d703ec56deb5ed5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.png b/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index f0b2a0a..0000000
Binary files a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.txt b/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.txt
deleted file mode 100644
index c75f32b..0000000
--- a/LayoutTests/platform/mac/compositing/lots-of-img-layers-expected.txt
+++ /dev/null
@@ -1,705 +0,0 @@
-layer at (0,0) size 800x733
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.checksum b/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.checksum
deleted file mode 100644
index 4f6ba4a..0000000
--- a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-95819652f710fd9d5ea67486f5e62357
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png b/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 59501c3..0000000
Binary files a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.txt b/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.txt
deleted file mode 100644
index f027408..0000000
--- a/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.txt
+++ /dev/null
@@ -1,705 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
- RenderBlock {HTML} at (0,0) size 800x8
- RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
-layer at (8,8) size 214x232
- RenderImage {IMG} at (8,8) size 214x232
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5a6a8a9..34eeb1c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,58 @@
+2010-11-26 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r72701.
+ http://trac.webkit.org/changeset/72701
+ https://bugs.webkit.org/show_bug.cgi?id=50114
+
+ REGRESSION: bad transform matrix on content layer (Requested
+ by backer on #webkit).
+
+ * WebCore.gypi:
+ * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+ (WebCore::Canvas2DLayerChromium::updateContents):
+ * platform/graphics/chromium/Canvas2DLayerChromium.h:
+ * platform/graphics/chromium/ContentLayerChromium.cpp:
+ (WebCore::ContentLayerChromium::cleanupResources):
+ (WebCore::ContentLayerChromium::updateContents):
+ (WebCore::ContentLayerChromium::updateTextureRect):
+ (WebCore::ContentLayerChromium::draw):
+ * platform/graphics/chromium/ContentLayerChromium.h:
+ * platform/graphics/chromium/ImageLayerChromium.cpp:
+ (WebCore::ImageLayerChromium::updateContents):
+ * platform/graphics/chromium/ImageLayerChromium.h:
+ * platform/graphics/chromium/LayerChromium.h:
+ (WebCore::LayerChromium::contentsDirty):
+ (WebCore::LayerChromium::updateContents):
+ (WebCore::LayerChromium::draw):
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::LayerRendererChromium):
+ (WebCore::LayerRendererChromium::prepareToDrawLayers):
+ (WebCore::LayerRendererChromium::drawLayers):
+ (WebCore::LayerRendererChromium::updateLayersRecursive):
+ (WebCore::LayerRendererChromium::useRenderSurface):
+ (WebCore::LayerRendererChromium::drawLayer):
+ (WebCore::LayerRendererChromium::initializeSharedObjects):
+ (WebCore::LayerRendererChromium::cleanupSharedObjects):
+ * platform/graphics/chromium/LayerRendererChromium.h:
+ * platform/graphics/chromium/LayerTexture.cpp: Removed.
+ * platform/graphics/chromium/LayerTexture.h: Removed.
+ * platform/graphics/chromium/PluginLayerChromium.cpp:
+ (WebCore::PluginLayerChromium::updateContents):
+ * platform/graphics/chromium/PluginLayerChromium.h:
+ * platform/graphics/chromium/RenderSurfaceChromium.cpp:
+ (WebCore::RenderSurfaceChromium::RenderSurfaceChromium):
+ (WebCore::RenderSurfaceChromium::cleanupResources):
+ (WebCore::RenderSurfaceChromium::prepareContentsTexture):
+ * platform/graphics/chromium/RenderSurfaceChromium.h:
+ * platform/graphics/chromium/TextureManager.cpp: Removed.
+ * platform/graphics/chromium/TextureManager.h: Removed.
+ * platform/graphics/chromium/VideoLayerChromium.cpp:
+ (WebCore::VideoLayerChromium::updateContents):
+ * platform/graphics/chromium/VideoLayerChromium.h:
+ * platform/graphics/chromium/WebGLLayerChromium.cpp:
+ (WebCore::WebGLLayerChromium::updateContents):
+ * platform/graphics/chromium/WebGLLayerChromium.h:
+
2010-11-26 Jeremy Orlow <jorlow at chromium.org>
Unreviewed build fix.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index dbc8979..4cc6792 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2495,8 +2495,6 @@
'platform/graphics/chromium/LayerChromium.h',
'platform/graphics/chromium/LayerRendererChromium.cpp',
'platform/graphics/chromium/LayerRendererChromium.h',
- 'platform/graphics/chromium/LayerTexture.cpp',
- 'platform/graphics/chromium/LayerTexture.h',
'platform/graphics/chromium/MediaPlayerPrivateChromium.h',
'platform/graphics/chromium/PlatformIcon.h',
'platform/graphics/chromium/PluginLayerChromium.cpp',
@@ -2505,8 +2503,6 @@
'platform/graphics/chromium/RenderSurfaceChromium.cpp',
'platform/graphics/chromium/SimpleFontDataChromiumWin.cpp',
'platform/graphics/chromium/SimpleFontDataLinux.cpp',
- 'platform/graphics/chromium/TextureManager.cpp',
- 'platform/graphics/chromium/TextureManager.h',
'platform/graphics/chromium/TransparencyWin.cpp',
'platform/graphics/chromium/TransparencyWin.h',
'platform/graphics/chromium/UniscribeHelper.cpp',
diff --git a/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp b/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp
index adf84a9..c2cde19 100644
--- a/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp
@@ -56,9 +56,9 @@ Canvas2DLayerChromium::~Canvas2DLayerChromium()
layerRendererContext()->deleteTexture(m_textureId);
}
-void Canvas2DLayerChromium::updateContentsIfDirty()
+void Canvas2DLayerChromium::updateContents()
{
- if (!m_contentsDirty || !m_drawingBuffer)
+ if (!m_drawingBuffer)
return;
if (m_textureChanged) { // We have to generate a new backing texture.
GraphicsContext3D* context = layerRendererContext();
diff --git a/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h b/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h
index 44ef050..0031229 100644
--- a/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h
@@ -46,7 +46,7 @@ public:
static PassRefPtr<Canvas2DLayerChromium> create(DrawingBuffer*, GraphicsLayerChromium* owner);
virtual ~Canvas2DLayerChromium();
virtual bool drawsContent() { return true; }
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
void setTextureChanged();
unsigned textureId() const;
diff --git a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
index 1cff598..375a74b 100644
--- a/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
@@ -36,7 +36,6 @@
#include "GraphicsContext3D.h"
#include "LayerRendererChromium.h"
-#include "LayerTexture.h"
#include "RenderLayerBacking.h"
#if PLATFORM(SKIA)
@@ -124,7 +123,12 @@ ContentLayerChromium::~ContentLayerChromium()
void ContentLayerChromium::cleanupResources()
{
LayerChromium::cleanupResources();
- m_contentsTexture.clear();
+ if (layerRenderer()) {
+ if (m_contentsTexture) {
+ layerRenderer()->deleteLayerTexture(m_contentsTexture);
+ m_contentsTexture = 0;
+ }
+ }
}
bool ContentLayerChromium::requiresClippedUpdateRect() const
@@ -164,7 +168,7 @@ void ContentLayerChromium::calculateClippedUpdateRect(IntRect& dirtyRect, IntRec
drawRect = layerOriginTransform.mapRect(dirtyRect);
}
-void ContentLayerChromium::updateContentsIfDirty()
+void ContentLayerChromium::updateContents()
{
RenderLayerBacking* backing = static_cast<RenderLayerBacking*>(m_owner->client());
if (!backing || backing->paintingGoesToWindow())
@@ -179,7 +183,6 @@ void ContentLayerChromium::updateContentsIfDirty()
IntRect updateRect;
IntSize requiredTextureSize;
IntSize bitmapSize;
- IntRect boundsRect(IntPoint(0, 0), m_bounds);
// FIXME: Remove this test when tiled layers are implemented.
if (requiresClippedUpdateRect()) {
@@ -197,11 +200,6 @@ void ContentLayerChromium::updateContentsIfDirty()
return;
}
- // If the texture needs to be reallocated then we must redraw the entire
- // contents of the layer.
- if (!m_contentsTexture || !m_contentsTexture->isValid(requiredTextureSize, GraphicsContext3D::RGBA))
- dirtyRect = boundsRect;
-
// If the portion of the large layer that's visible hasn't changed
// then we don't need to update it, _unless_ its contents have changed
// in which case we only update the dirty bits.
@@ -218,10 +216,11 @@ void ContentLayerChromium::updateContentsIfDirty()
}
} else {
dirtyRect = IntRect(m_dirtyRect);
+ IntRect boundsRect(IntPoint(0, 0), m_bounds);
requiredTextureSize = m_bounds;
// If the texture needs to be reallocated then we must redraw the entire
// contents of the layer.
- if (!m_contentsTexture || !m_contentsTexture->isValid(requiredTextureSize, GraphicsContext3D::RGBA))
+ if (requiredTextureSize != m_allocatedTextureSize)
dirtyRect = boundsRect;
else {
// Clip the dirtyRect to the size of the layer to avoid drawing
@@ -290,27 +289,35 @@ void ContentLayerChromium::updateContentsIfDirty()
#error "Need to implement for your platform."
#endif
+ unsigned textureId = m_contentsTexture;
+ if (!textureId)
+ textureId = layerRenderer()->createLayerTexture();
+
if (pixels)
- updateTextureRect(pixels, requiredTextureSize, updateRect);
+ updateTextureRect(pixels, bitmapSize, requiredTextureSize, updateRect, textureId);
}
-void ContentLayerChromium::updateTextureRect(void* pixels, const IntSize& requiredTextureSize, const IntRect& updateRect)
+void ContentLayerChromium::updateTextureRect(void* pixels, const IntSize& bitmapSize, const IntSize& requiredTextureSize, const IntRect& updateRect, unsigned textureId)
{
if (!pixels)
return;
GraphicsContext3D* context = layerRendererContext();
- if (!m_contentsTexture)
- m_contentsTexture = LayerTexture::create(context, layerRenderer()->textureManager());
+ context->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId);
- if (!m_contentsTexture->reserve(requiredTextureSize, GraphicsContext3D::RGBA)) {
- m_skipsDraw = true;
- return;
- }
-
- m_contentsTexture->bindTexture();
+ // If the texture id or size changed since last time then we need to tell GL
+ // to re-allocate a texture.
+ if (m_contentsTexture != textureId || requiredTextureSize != m_allocatedTextureSize) {
+ ASSERT(bitmapSize == requiredTextureSize);
+ GLC(context, context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, requiredTextureSize.width(), requiredTextureSize.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, pixels));
- GLC(context, context->texSubImage2D(GraphicsContext3D::TEXTURE_2D, 0, updateRect.x(), updateRect.y(), updateRect.width(), updateRect.height(), GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, pixels));
+ m_contentsTexture = textureId;
+ m_allocatedTextureSize = requiredTextureSize;
+ } else {
+ ASSERT(updateRect.width() <= m_allocatedTextureSize.width() && updateRect.height() <= m_allocatedTextureSize.height());
+ ASSERT(updateRect.width() == bitmapSize.width() && updateRect.height() == bitmapSize.height());
+ GLC(context, context->texSubImage2D(GraphicsContext3D::TEXTURE_2D, 0, updateRect.x(), updateRect.y(), updateRect.width(), updateRect.height(), GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, pixels));
+ }
m_dirtyRect.setSize(FloatSize());
// Large layers always stay dirty, because they need to update when the content rect changes.
@@ -323,12 +330,11 @@ void ContentLayerChromium::draw()
return;
ASSERT(layerRenderer());
-
const ContentLayerChromium::SharedValues* sv = layerRenderer()->contentLayerSharedValues();
ASSERT(sv && sv->initialized());
GraphicsContext3D* context = layerRendererContext();
GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));
- m_contentsTexture->bindTexture();
+ GLC(context, context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_contentsTexture));
layerRenderer()->useShader(sv->contentShaderProgram());
GLC(context, context->uniform1i(sv->shaderSamplerLocation(), 0));
@@ -346,7 +352,6 @@ void ContentLayerChromium::draw()
drawOpacity(), sv->shaderMatrixLocation(),
sv->shaderAlphaLocation());
}
- m_contentsTexture->unreserve();
}
}
diff --git a/WebCore/platform/graphics/chromium/ContentLayerChromium.h b/WebCore/platform/graphics/chromium/ContentLayerChromium.h
index 9c180ad..32c2c49 100644
--- a/WebCore/platform/graphics/chromium/ContentLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/ContentLayerChromium.h
@@ -35,12 +35,9 @@
#if USE(ACCELERATED_COMPOSITING)
#include "LayerChromium.h"
-#include "TextureManager.h"
namespace WebCore {
-class LayerTexture;
-
// A Layer that requires a GraphicsContext to render its contents.
class ContentLayerChromium : public LayerChromium {
friend class LayerRendererChromium;
@@ -49,7 +46,7 @@ public:
virtual ~ContentLayerChromium();
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
virtual void draw();
virtual bool drawsContent() { return m_owner && m_owner->drawsContent(); }
@@ -79,12 +76,14 @@ public:
protected:
ContentLayerChromium(GraphicsLayerChromium* owner);
- void updateTextureRect(void* pixels, const IntSize& requiredTextureSize, const IntRect& updateRect);
+ void updateTextureRect(void* pixels, const IntSize& bitmapSize, const IntSize& requiredTextureSize,
+ const IntRect& updateRect, unsigned textureId);
virtual void cleanupResources();
bool requiresClippedUpdateRect() const;
- OwnPtr<LayerTexture> m_contentsTexture;
+ unsigned m_contentsTexture;
+ IntSize m_allocatedTextureSize;
bool m_skipsDraw;
private:
diff --git a/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp b/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
index cd299c1..adcbb82 100644
--- a/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
@@ -36,7 +36,6 @@
#include "Image.h"
#include "LayerRendererChromium.h"
-#include "LayerTexture.h"
#if PLATFORM(SKIA)
#include "NativeImageSkia.h"
@@ -72,7 +71,7 @@ void ImageLayerChromium::setContents(Image* contents)
setNeedsDisplay();
}
-void ImageLayerChromium::updateContentsIfDirty()
+void ImageLayerChromium::updateContents()
{
ASSERT(layerRenderer());
@@ -80,11 +79,12 @@ void ImageLayerChromium::updateContentsIfDirty()
if (requiresClippedUpdateRect()) {
// Use the base version of updateContents which draws a subset of the
// image to a bitmap, as the pixel contents can't be uploaded directly.
- ContentLayerChromium::updateContentsIfDirty();
+ ContentLayerChromium::updateContents();
return;
}
void* pixels = 0;
+ IntSize requiredTextureSize;
IntSize bitmapSize;
NativeImagePtr nativeImage = m_contents->nativeImageForCurrentFrame();
@@ -93,33 +93,22 @@ void ImageLayerChromium::updateContentsIfDirty()
// The layer contains an Image.
NativeImageSkia* skiaImage = static_cast<NativeImageSkia*>(nativeImage);
const SkBitmap* skiaBitmap = skiaImage;
- bitmapSize = IntSize(skiaBitmap->width(), skiaBitmap->height());
+ requiredTextureSize = IntSize(skiaBitmap->width(), skiaBitmap->height());
ASSERT(skiaBitmap);
-#elif PLATFORM(CG)
- // NativeImagePtr is a CGImageRef on Mac OS X.
- int width = CGImageGetWidth(nativeImage);
- int height = CGImageGetHeight(nativeImage);
- bitmapSize = IntSize(width, height);
-#endif
-
- // Clip the dirty rect to the bitmap dimensions.
- IntRect dirtyRect(m_dirtyRect);
- dirtyRect.intersect(IntRect(IntPoint(0, 0), bitmapSize));
-
- if (!m_contentsTexture || !m_contentsTexture->isValid(bitmapSize, GraphicsContext3D::RGBA))
- dirtyRect = IntRect(IntPoint(0, 0), bitmapSize);
- else if (!m_contentsDirty) {
- m_contentsTexture->reserve(bitmapSize, GraphicsContext3D::RGBA);
- return;
- }
-#if PLATFORM(SKIA)
SkAutoLockPixels lock(*skiaBitmap);
SkBitmap::Config skiaConfig = skiaBitmap->config();
// FIXME: do we need to support more image configurations?
- if (skiaConfig == SkBitmap::kARGB_8888_Config)
+ if (skiaConfig == SkBitmap::kARGB_8888_Config) {
pixels = skiaBitmap->getPixels();
+ bitmapSize = IntSize(skiaBitmap->width(), skiaBitmap->height());
+ }
#elif PLATFORM(CG)
+ // NativeImagePtr is a CGImageRef on Mac OS X.
+ int width = CGImageGetWidth(nativeImage);
+ int height = CGImageGetHeight(nativeImage);
+ requiredTextureSize = IntSize(width, height);
+ bitmapSize = requiredTextureSize;
// FIXME: we should get rid of this temporary copy where possible.
int tempRowBytes = width * 4;
Vector<uint8_t> tempVector;
@@ -156,8 +145,16 @@ void ImageLayerChromium::updateContentsIfDirty()
#error "Need to implement for your platform."
#endif
+ unsigned textureId = m_contentsTexture;
+ if (!textureId)
+ textureId = layerRenderer()->createLayerTexture();
+
+ // Clip the dirty rect to the bitmap dimensions.
+ IntRect dirtyRect(m_dirtyRect);
+ dirtyRect.intersect(IntRect(IntPoint(0, 0), bitmapSize));
+
if (pixels)
- updateTextureRect(pixels, bitmapSize, dirtyRect);
+ updateTextureRect(pixels, bitmapSize, requiredTextureSize, dirtyRect, textureId);
}
}
diff --git a/WebCore/platform/graphics/chromium/ImageLayerChromium.h b/WebCore/platform/graphics/chromium/ImageLayerChromium.h
index a5c1450..b91f04a 100644
--- a/WebCore/platform/graphics/chromium/ImageLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/ImageLayerChromium.h
@@ -49,7 +49,7 @@ class ImageLayerChromium : public ContentLayerChromium {
public:
static PassRefPtr<ImageLayerChromium> create(GraphicsLayerChromium* owner = 0);
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
virtual bool drawsContent() { return m_contents; }
void setContents(Image* image);
diff --git a/WebCore/platform/graphics/chromium/LayerChromium.h b/WebCore/platform/graphics/chromium/LayerChromium.h
index ac95285..86f3580 100644
--- a/WebCore/platform/graphics/chromium/LayerChromium.h
+++ b/WebCore/platform/graphics/chromium/LayerChromium.h
@@ -151,13 +151,15 @@ public:
void setOwner(GraphicsLayerChromium* owner) { m_owner = owner; }
+ bool contentsDirty() { return m_contentsDirty; }
+
// Returns the rect containtaining this layer in the current view's coordinate system.
const IntRect getDrawRect() const;
// These methods typically need to be overwritten by derived classes.
virtual bool drawsContent() { return false; }
- virtual void updateContentsIfDirty() { }
- virtual void draw() { }
+ virtual void updateContents() { };
+ virtual void draw() { };
void drawDebugBorder();
@@ -195,12 +197,6 @@ public:
LayerRendererChromium* layerRenderer() const { return m_layerRenderer.get(); }
- static unsigned createShaderProgram(GraphicsContext3D*, const char* vertexShaderSource, const char* fragmentShaderSource);
-
- static void drawTexturedQuad(GraphicsContext3D*, const TransformationMatrix& projectionMatrix, const TransformationMatrix& layerMatrix,
- float width, float height, float opacity,
- int matrixLocation, int alphaLocation);
-
protected:
GraphicsLayerChromium* m_owner;
LayerChromium(GraphicsLayerChromium* owner);
@@ -215,8 +211,14 @@ protected:
// Returns true if any of the layer's descendants has content to draw.
bool descendantsDrawContent();
+ static void drawTexturedQuad(GraphicsContext3D*, const TransformationMatrix& projectionMatrix, const TransformationMatrix& layerMatrix,
+ float width, float height, float opacity,
+ int matrixLocation, int alphaLocation);
+
static void toGLMatrix(float*, const TransformationMatrix&);
+ static unsigned createShaderProgram(GraphicsContext3D*, const char* vertexShaderSource, const char* fragmentShaderSource);
+
IntSize m_bounds;
FloatRect m_dirtyRect;
bool m_contentsDirty;
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
index 18beea2..91580cc 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
@@ -37,9 +37,7 @@
#include "Canvas2DLayerChromium.h"
#include "GraphicsContext3D.h"
#include "LayerChromium.h"
-#include "LayerTexture.h"
#include "NotImplemented.h"
-#include "TextureManager.h"
#include "WebGLLayerChromium.h"
#if PLATFORM(SKIA)
#include "NativeImageSkia.h"
@@ -50,9 +48,6 @@
namespace WebCore {
-// FIXME: Make this limit adjustable and give it a useful value.
-static size_t textureMemoryLimitBytes = 64 * 1024 * 1024;
-
static TransformationMatrix orthoMatrix(float left, float right, float bottom, float top)
{
float deltaX = right - left;
@@ -103,6 +98,7 @@ LayerRendererChromium::LayerRendererChromium(PassRefPtr<GraphicsContext3D> conte
: m_rootLayerTextureId(0)
, m_rootLayerTextureWidth(0)
, m_rootLayerTextureHeight(0)
+ , m_textureLayerShaderProgram(0)
, m_rootLayer(0)
, m_scrollPosition(IntPoint(-1, -1))
, m_currentShader(0)
@@ -248,12 +244,11 @@ void LayerRendererChromium::prepareToDrawLayers(const IntRect& visibleRect, cons
0.5 * visibleRect.height() + scrollDelta.y(), 0);
scrolledLayerMatrix.scale3d(1, -1, 1);
- const RenderSurfaceChromium::SharedValues* rsv = renderSurfaceSharedValues();
- useShader(rsv->shaderProgram());
- GLC(m_context, m_context->uniform1i(rsv->shaderSamplerLocation(), 0));
+ useShader(m_textureLayerShaderProgram);
+ GLC(m_context, m_context->uniform1i(m_textureLayerShaderSamplerLocation, 0));
LayerChromium::drawTexturedQuad(m_context.get(), m_projectionMatrix, scrolledLayerMatrix,
visibleRect.width(), visibleRect.height(), 1,
- rsv->shaderMatrixLocation(), rsv->shaderAlphaLocation());
+ m_textureLayerShaderMatrixLocation, m_textureLayerShaderAlphaLocation);
GLC(m_context, m_context->copyTexSubImage2D(GraphicsContext3D::TEXTURE_2D, 0, 0, 0, 0, 0, contentRect.width(), contentRect.height()));
}
@@ -357,19 +352,18 @@ void LayerRendererChromium::drawLayers(const IntRect& visibleRect, const IntRect
if (!renderSurfaceLayer->m_renderSurface->m_layerList.size())
continue;
- if (useRenderSurface(renderSurfaceLayer->m_renderSurface.get())) {
- if (renderSurfaceLayer != m_rootLayer) {
- GLC(m_context, m_context->disable(GraphicsContext3D::SCISSOR_TEST));
- GLC(m_context, m_context->clearColor(0, 0, 0, 0));
- GLC(m_context, m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT));
- GLC(m_context, m_context->enable(GraphicsContext3D::SCISSOR_TEST));
- }
-
- Vector<LayerChromium*>& layerList = renderSurfaceLayer->m_renderSurface->m_layerList;
- ASSERT(layerList.size());
- for (unsigned layerIndex = 0; layerIndex < layerList.size(); ++layerIndex)
- drawLayer(layerList[layerIndex], renderSurfaceLayer->m_renderSurface.get());
+ useRenderSurface(renderSurfaceLayer->m_renderSurface.get());
+ if (renderSurfaceLayer != m_rootLayer) {
+ GLC(m_context, m_context->disable(GraphicsContext3D::SCISSOR_TEST));
+ GLC(m_context, m_context->clearColor(0, 0, 0, 0));
+ GLC(m_context, m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT));
+ GLC(m_context, m_context->enable(GraphicsContext3D::SCISSOR_TEST));
}
+
+ Vector<LayerChromium*>& layerList = renderSurfaceLayer->m_renderSurface->m_layerList;
+ ASSERT(layerList.size());
+ for (unsigned layerIndex = 0; layerIndex < layerList.size(); ++layerIndex)
+ drawLayer(layerList[layerIndex], renderSurfaceLayer->m_renderSurface.get());
}
GLC(m_context, m_context->disable(GraphicsContext3D::SCISSOR_TEST));
@@ -513,7 +507,7 @@ void LayerRendererChromium::updateLayersRecursive(LayerChromium* layer, const Tr
// Layer's opacity will be applied when drawing the render surface.
renderSurface->m_drawOpacity = layer->opacity();
if (layer->superlayer()->preserves3D())
- renderSurface->m_drawOpacity *= layer->superlayer()->drawOpacity();
+ renderSurface->m_drawOpacity *= layer->superlayer()->m_drawOpacity;
layer->m_drawOpacity = 1;
TransformationMatrix layerOriginTransform = combinedTransform;
@@ -604,7 +598,7 @@ void LayerRendererChromium::updateLayersRecursive(LayerChromium* layer, const Tr
if (sublayer->m_renderSurface) {
RenderSurfaceChromium* sublayerRenderSurface = sublayer->m_renderSurface.get();
- const IntRect& contentRect = sublayerRenderSurface->contentRect();
+ const IntRect& contentRect = sublayerRenderSurface->m_contentRect;
FloatRect sublayerRect(-0.5 * contentRect.width(), -0.5 * contentRect.height(),
contentRect.width(), contentRect.height());
layer->m_drawableContentRect.unite(enclosingIntRect(sublayerRenderSurface->m_drawTransform.mapRect(sublayerRect)));
@@ -677,10 +671,10 @@ bool LayerRendererChromium::useRenderSurface(RenderSurfaceChromium* renderSurfac
GLC(m_context, m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_offscreenFramebufferId));
- if (!renderSurface->prepareContentsTexture())
- return false;
+ renderSurface->prepareContentsTexture();
- renderSurface->m_contentsTexture->framebufferTexture2D();
+ GLC(m_context, m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0,
+ GraphicsContext3D::TEXTURE_2D, renderSurface->m_contentsTextureId, 0));
#if !defined ( NDEBUG )
if (m_context->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) != GraphicsContext3D::FRAMEBUFFER_COMPLETE) {
@@ -696,7 +690,15 @@ bool LayerRendererChromium::useRenderSurface(RenderSurfaceChromium* renderSurfac
void LayerRendererChromium::drawLayer(LayerChromium* layer, RenderSurfaceChromium* targetSurface)
{
if (layer->m_renderSurface && layer->m_renderSurface != targetSurface) {
- layer->m_renderSurface->draw();
+ GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, layer->m_renderSurface->m_contentsTextureId));
+ useShader(m_textureLayerShaderProgram);
+
+ setScissorToRect(layer->m_renderSurface->m_scissorRect);
+
+ IntRect contentRect = layer->m_renderSurface->m_contentRect;
+ LayerChromium::drawTexturedQuad(m_context.get(), m_projectionMatrix, layer->m_renderSurface->m_drawTransform,
+ contentRect.width(), contentRect.height(), layer->m_renderSurface->m_drawOpacity,
+ m_textureLayerShaderMatrixLocation, m_textureLayerShaderAlphaLocation);
return;
}
@@ -719,8 +721,12 @@ void LayerRendererChromium::drawLayer(LayerChromium* layer, RenderSurfaceChromiu
if (layer->drawsContent()) {
// Update the contents of the layer if necessary.
- layer->updateContentsIfDirty();
- m_context->makeContextCurrent();
+ if (layer->contentsDirty()) {
+ // Update the backing texture contents for any dirty portion of the layer.
+ layer->updateContents();
+ m_context->makeContextCurrent();
+ }
+
layer->draw();
}
@@ -783,6 +789,46 @@ bool LayerRendererChromium::initializeSharedObjects()
{
makeContextCurrent();
+ // The following program composites layers whose contents are the results of a previous
+ // render operation and therefore doesn't perform any color swizzling. It is used
+ // in scrolling and for compositing offscreen textures.
+ char textureLayerVertexShaderString[] =
+ "attribute vec4 a_position; \n"
+ "attribute vec2 a_texCoord; \n"
+ "uniform mat4 matrix; \n"
+ "varying vec2 v_texCoord; \n"
+ "void main() \n"
+ "{ \n"
+ " gl_Position = matrix * a_position; \n"
+ " v_texCoord = a_texCoord; \n"
+ "} \n";
+ char textureLayerFragmentShaderString[] =
+ "precision mediump float; \n"
+ "varying vec2 v_texCoord; \n"
+ "uniform sampler2D s_texture; \n"
+ "uniform float alpha; \n"
+ "void main() \n"
+ "{ \n"
+ " vec4 texColor = texture2D(s_texture, v_texCoord); \n"
+ " gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha; \n"
+ "} \n";
+
+ m_textureLayerShaderProgram = LayerChromium::createShaderProgram(m_context.get(), textureLayerVertexShaderString, textureLayerFragmentShaderString);
+ if (!m_textureLayerShaderProgram) {
+ LOG_ERROR("LayerRendererChromium: Failed to create scroll shader program");
+ cleanupSharedObjects();
+ return false;
+ }
+
+ GLC(m_context, m_textureLayerShaderSamplerLocation = m_context->getUniformLocation(m_textureLayerShaderProgram, "s_texture"));
+ GLC(m_context, m_textureLayerShaderMatrixLocation = m_context->getUniformLocation(m_textureLayerShaderProgram, "matrix"));
+ GLC(m_context, m_textureLayerShaderAlphaLocation = m_context->getUniformLocation(m_textureLayerShaderProgram, "alpha"));
+ if (m_textureLayerShaderSamplerLocation == -1 || m_textureLayerShaderMatrixLocation == -1 || m_textureLayerShaderAlphaLocation == -1) {
+ LOG_ERROR("Failed to initialize texture layer shader.");
+ cleanupSharedObjects();
+ return false;
+ }
+
// Create a texture object to hold the contents of the root layer.
m_rootLayerTextureId = createLayerTexture();
if (!m_rootLayerTextureId) {
@@ -807,15 +853,13 @@ bool LayerRendererChromium::initializeSharedObjects()
m_canvasLayerSharedValues = adoptPtr(new CanvasLayerChromium::SharedValues(m_context.get()));
m_videoLayerSharedValues = adoptPtr(new VideoLayerChromium::SharedValues(m_context.get()));
m_pluginLayerSharedValues = adoptPtr(new PluginLayerChromium::SharedValues(m_context.get()));
- m_renderSurfaceSharedValues = adoptPtr(new RenderSurfaceChromium::SharedValues(m_context.get()));
if (!m_layerSharedValues->initialized() || !m_contentLayerSharedValues->initialized() || !m_canvasLayerSharedValues->initialized()
- || !m_videoLayerSharedValues->initialized() || !m_pluginLayerSharedValues->initialized() || !m_renderSurfaceSharedValues->initialized()) {
+ || !m_videoLayerSharedValues->initialized() || !m_pluginLayerSharedValues->initialized()) {
cleanupSharedObjects();
return false;
}
- m_textureManager = TextureManager::create(m_context.get(), textureMemoryLimitBytes, m_maxTextureSize);
return true;
}
@@ -828,7 +872,11 @@ void LayerRendererChromium::cleanupSharedObjects()
m_canvasLayerSharedValues.clear();
m_videoLayerSharedValues.clear();
m_pluginLayerSharedValues.clear();
- m_renderSurfaceSharedValues.clear();
+
+ if (m_textureLayerShaderProgram) {
+ GLC(m_context, m_context->deleteProgram(m_textureLayerShaderProgram));
+ m_textureLayerShaderProgram = 0;
+ }
if (m_rootLayerTextureId) {
deleteLayerTexture(m_rootLayerTextureId);
@@ -837,8 +885,6 @@ void LayerRendererChromium::cleanupSharedObjects()
if (m_offscreenFramebufferId)
GLC(m_context, m_context->deleteFramebuffer(m_offscreenFramebufferId));
-
- m_textureManager.clear();
}
} // namespace WebCore
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.h b/WebCore/platform/graphics/chromium/LayerRendererChromium.h
index c0e610a..531d652 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.h
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.h
@@ -108,7 +108,6 @@ public:
const CanvasLayerChromium::SharedValues* canvasLayerSharedValues() const { return m_canvasLayerSharedValues.get(); }
const VideoLayerChromium::SharedValues* videoLayerSharedValues() const { return m_videoLayerSharedValues.get(); }
const PluginLayerChromium::SharedValues* pluginLayerSharedValues() const { return m_pluginLayerSharedValues.get(); }
- const RenderSurfaceChromium::SharedValues* renderSurfaceSharedValues() const { return m_renderSurfaceSharedValues.get(); }
void resizeOnscreenContent(const IntSize&);
@@ -116,10 +115,6 @@ public:
IntRect rootLayerContentRect() const { return m_rootContentRect; }
void getFramebufferPixels(void *pixels, const IntRect& rect);
- TextureManager* textureManager() const { return m_textureManager.get(); }
-
- void setScissorToRect(const IntRect&);
-
private:
explicit LayerRendererChromium(PassRefPtr<GraphicsContext3D> graphicsContext3D);
void updateLayersRecursive(LayerChromium* layer, const TransformationMatrix& parentMatrix, Vector<LayerChromium*>& renderSurfaceLayerList, Vector<LayerChromium*>& layerList);
@@ -128,6 +123,8 @@ private:
bool isLayerVisible(LayerChromium*, const TransformationMatrix&, const IntRect& visibleRect);
+ void setScissorToRect(const IntRect&);
+
void setDrawViewportRect(const IntRect&, bool flipY);
bool useRenderSurface(RenderSurfaceChromium*);
@@ -143,6 +140,13 @@ private:
int m_rootLayerTextureWidth;
int m_rootLayerTextureHeight;
+ // Shader uniform locations used by layers whose contents are the results of a
+ // previous rendering operation.
+ unsigned m_textureLayerShaderProgram;
+ int m_textureLayerShaderSamplerLocation;
+ int m_textureLayerShaderMatrixLocation;
+ int m_textureLayerShaderAlphaLocation;
+
TransformationMatrix m_projectionMatrix;
RefPtr<LayerChromium> m_rootLayer;
@@ -182,9 +186,6 @@ private:
OwnPtr<CanvasLayerChromium::SharedValues> m_canvasLayerSharedValues;
OwnPtr<VideoLayerChromium::SharedValues> m_videoLayerSharedValues;
OwnPtr<PluginLayerChromium::SharedValues> m_pluginLayerSharedValues;
- OwnPtr<RenderSurfaceChromium::SharedValues> m_renderSurfaceSharedValues;
-
- OwnPtr<TextureManager> m_textureManager;
RefPtr<GraphicsContext3D> m_context;
diff --git a/WebCore/platform/graphics/chromium/LayerTexture.cpp b/WebCore/platform/graphics/chromium/LayerTexture.cpp
deleted file mode 100644
index 32bfa0b..0000000
--- a/WebCore/platform/graphics/chromium/LayerTexture.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerTexture.h"
-
-#include "GraphicsContext3D.h"
-#include "TextureManager.h"
-
-namespace WebCore {
-
-LayerTexture::LayerTexture(GraphicsContext3D* context, TextureManager* manager)
- : m_context(context)
- , m_textureManager(manager)
- , m_token(0)
- , m_format(0)
- , m_textureId(0)
-{
-}
-
-LayerTexture::~LayerTexture()
-{
- if (m_token)
- m_textureManager->releaseToken(m_token);
-}
-
-bool LayerTexture::isValid(const IntSize& size, unsigned format)
-{
- return m_token && size == m_size && format == m_format && m_textureManager->hasTexture(m_token);
-}
-
-bool LayerTexture::reserve(const IntSize& size, unsigned format)
-{
- if (!m_token)
- m_token = m_textureManager->getToken();
-
- if (size == m_size && format == m_format && m_textureManager->hasTexture(m_token))
- m_textureManager->protectTexture(m_token);
- else {
- m_textureId = m_textureManager->requestTexture(m_token, size, format);
- if (m_textureId) {
- m_size = size;
- m_format = format;
- }
- }
-
- return m_textureId;
-}
-
-void LayerTexture::unreserve()
-{
- if (m_token)
- m_textureManager->unprotectTexture(m_token);
-}
-
-void LayerTexture::bindTexture()
-{
- m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_textureId);
-}
-
-void LayerTexture::framebufferTexture2D()
-{
- m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_textureId, 0);
-}
-
-}
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
diff --git a/WebCore/platform/graphics/chromium/LayerTexture.h b/WebCore/platform/graphics/chromium/LayerTexture.h
deleted file mode 100644
index 312adfa..0000000
--- a/WebCore/platform/graphics/chromium/LayerTexture.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef LayerTexture_h
-#define LayerTexture_h
-
-#include "IntSize.h"
-#include "TextureManager.h"
-
-#include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class GraphicsContext3D;
-class TextureManager;
-
-class LayerTexture : public Noncopyable {
-public:
- static PassOwnPtr<LayerTexture> create(GraphicsContext3D* context, TextureManager* manager)
- {
- return adoptPtr(new LayerTexture(context, manager));
- }
- ~LayerTexture();
-
- bool isValid(const IntSize&, unsigned format);
- bool reserve(const IntSize&, unsigned format);
- void unreserve();
-
- void bindTexture();
- void framebufferTexture2D();
-
-private:
- LayerTexture(GraphicsContext3D*, TextureManager*);
-
- RefPtr<GraphicsContext3D> m_context;
- TextureManager* m_textureManager;
- TextureToken m_token;
- IntSize m_size;
- unsigned m_format;
- unsigned m_textureId;
-};
-
-}
-
-#endif
-
diff --git a/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp b/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp
index 878c142..2d1852f 100644
--- a/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/PluginLayerChromium.cpp
@@ -102,7 +102,7 @@ void PluginLayerChromium::setTextureId(unsigned id)
m_textureId = id;
}
-void PluginLayerChromium::updateContentsIfDirty()
+void PluginLayerChromium::updateContents()
{
}
diff --git a/WebCore/platform/graphics/chromium/PluginLayerChromium.h b/WebCore/platform/graphics/chromium/PluginLayerChromium.h
index 853b328..44a6cc9 100644
--- a/WebCore/platform/graphics/chromium/PluginLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/PluginLayerChromium.h
@@ -38,7 +38,7 @@ class PluginLayerChromium : public LayerChromium {
public:
static PassRefPtr<PluginLayerChromium> create(GraphicsLayerChromium* owner = 0);
virtual bool drawsContent() { return true; }
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
virtual void draw();
void setTextureId(unsigned textureId);
diff --git a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
index e9fdf01..816fd3d 100644
--- a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
+++ b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
@@ -31,67 +31,12 @@
#include "GraphicsContext3D.h"
#include "LayerRendererChromium.h"
-#include "LayerTexture.h"
namespace WebCore {
-RenderSurfaceChromium::SharedValues::SharedValues(GraphicsContext3D* context)
- : m_context(context)
- , m_shaderProgram(0)
- , m_shaderSamplerLocation(-1)
- , m_shaderMatrixLocation(-1)
- , m_shaderAlphaLocation(-1)
- , m_initialized(false)
-{
- // The following program composites layers whose contents are the results of a previous
- // render operation and therefore doesn't perform any color swizzling. It is used
- // in scrolling and for compositing offscreen textures.
- char renderSurfaceVertexShaderString[] =
- "attribute vec4 a_position; \n"
- "attribute vec2 a_texCoord; \n"
- "uniform mat4 matrix; \n"
- "varying vec2 v_texCoord; \n"
- "void main() \n"
- "{ \n"
- " gl_Position = matrix * a_position; \n"
- " v_texCoord = a_texCoord; \n"
- "} \n";
- char renderSurfaceFragmentShaderString[] =
- "precision mediump float; \n"
- "varying vec2 v_texCoord; \n"
- "uniform sampler2D s_texture; \n"
- "uniform float alpha; \n"
- "void main() \n"
- "{ \n"
- " vec4 texColor = texture2D(s_texture, v_texCoord); \n"
- " gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha; \n"
- "} \n";
-
- m_shaderProgram = LayerChromium::createShaderProgram(m_context, renderSurfaceVertexShaderString, renderSurfaceFragmentShaderString);
- if (!m_shaderProgram) {
- LOG_ERROR("RenderSurfaceChromium: Failed to create shader program");
- return;
- }
-
- GLC(m_context, m_shaderSamplerLocation = m_context->getUniformLocation(m_shaderProgram, "s_texture"));
- GLC(m_context, m_shaderMatrixLocation = m_context->getUniformLocation(m_shaderProgram, "matrix"));
- GLC(m_context, m_shaderAlphaLocation = m_context->getUniformLocation(m_shaderProgram, "alpha"));
- if (m_shaderSamplerLocation == -1 || m_shaderMatrixLocation == -1 || m_shaderAlphaLocation == -1) {
- LOG_ERROR("Failed to initialize texture layer shader.");
- return;
- }
- m_initialized = true;
-}
-
-RenderSurfaceChromium::SharedValues::~SharedValues()
-{
- if (m_shaderProgram)
- GLC(m_context, m_context->deleteProgram(m_shaderProgram));
-}
-
RenderSurfaceChromium::RenderSurfaceChromium(LayerChromium* owningLayer)
: m_owningLayer(owningLayer)
- , m_skipsDraw(false)
+ , m_contentsTextureId(0)
{
}
@@ -102,12 +47,14 @@ RenderSurfaceChromium::~RenderSurfaceChromium()
void RenderSurfaceChromium::cleanupResources()
{
- if (!m_contentsTexture)
+ if (!m_contentsTextureId)
return;
ASSERT(layerRenderer());
- m_contentsTexture.clear();
+ layerRenderer()->deleteLayerTexture(m_contentsTextureId);
+ m_contentsTextureId = 0;
+ m_allocatedTextureSize = IntSize();
}
LayerRendererChromium* RenderSurfaceChromium::layerRenderer()
@@ -116,41 +63,25 @@ LayerRendererChromium* RenderSurfaceChromium::layerRenderer()
return m_owningLayer->layerRenderer();
}
-bool RenderSurfaceChromium::prepareContentsTexture()
+void RenderSurfaceChromium::prepareContentsTexture()
{
- IntSize requiredSize(m_contentRect.size());
- TextureManager* textureManager = layerRenderer()->textureManager();
-
- if (!m_contentsTexture)
- m_contentsTexture = LayerTexture::create(layerRenderer()->context(), textureManager);
+ ASSERT(m_owningLayer);
- if (!m_contentsTexture->reserve(requiredSize, GraphicsContext3D::RGBA)) {
- m_skipsDraw = true;
- return false;
+ if (!m_contentsTextureId) {
+ m_contentsTextureId = layerRenderer()->createLayerTexture();
+ ASSERT(m_contentsTextureId);
+ m_allocatedTextureSize = IntSize();
}
- m_skipsDraw = false;
- return true;
-}
-
-void RenderSurfaceChromium::draw()
-{
- if (m_skipsDraw)
- return;
-
- m_contentsTexture->bindTexture();
-
- const RenderSurfaceChromium::SharedValues* sv = layerRenderer()->renderSurfaceSharedValues();
- ASSERT(sv && sv->initialized());
-
- layerRenderer()->useShader(sv->shaderProgram());
- layerRenderer()->setScissorToRect(m_scissorRect);
-
- LayerChromium::drawTexturedQuad(layerRenderer()->context(), layerRenderer()->projectionMatrix(), m_drawTransform,
- m_contentRect.width(), m_contentRect.height(), m_drawOpacity,
- sv->shaderMatrixLocation(), sv->shaderAlphaLocation());
-
- m_contentsTexture->unreserve();
+ IntSize requiredSize(m_contentRect.width(), m_contentRect.height());
+ if (m_allocatedTextureSize != requiredSize) {
+ GraphicsContext3D* context = m_owningLayer->layerRenderer()->context();
+ GLC(context, context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_contentsTextureId));
+ GLC(context, context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA,
+ requiredSize.width(), requiredSize.height(), 0, GraphicsContext3D::RGBA,
+ GraphicsContext3D::UNSIGNED_BYTE, 0));
+ m_allocatedTextureSize = requiredSize;
+ }
}
}
diff --git a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h
index a93218f..1f33527 100644
--- a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h
+++ b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h
@@ -31,15 +31,13 @@
#include "FloatRect.h"
#include "IntRect.h"
-#include "TextureManager.h"
#include "TransformationMatrix.h"
#include <wtf/Noncopyable.h>
namespace WebCore {
-class LayerChromium;
class LayerRendererChromium;
-class LayerTexture;
+class LayerChromium;
class RenderSurfaceChromium : public Noncopyable {
friend class LayerRendererChromium;
@@ -47,45 +45,20 @@ public:
explicit RenderSurfaceChromium(LayerChromium*);
~RenderSurfaceChromium();
- bool prepareContentsTexture();
+ void prepareContentsTexture();
void cleanupResources();
- void draw();
FloatPoint contentRectCenter() const { return FloatRect(m_contentRect).center(); }
IntRect contentRect() const { return m_contentRect; }
- // Stores values that are shared between instances of this class that are
- // associated with the same LayerRendererChromium (and hence the same GL
- // context).
- class SharedValues {
- public:
- explicit SharedValues(GraphicsContext3D*);
- ~SharedValues();
-
- unsigned shaderProgram() const { return m_shaderProgram; }
- int shaderSamplerLocation() const { return m_shaderSamplerLocation; }
- int shaderMatrixLocation() const { return m_shaderMatrixLocation; }
- int shaderAlphaLocation() const { return m_shaderAlphaLocation; }
- bool initialized() const { return m_initialized; }
-
- private:
- GraphicsContext3D* m_context;
-
- unsigned m_shaderProgram;
- int m_shaderSamplerLocation;
- int m_shaderMatrixLocation;
- int m_shaderAlphaLocation;
- bool m_initialized;
- };
-
private:
LayerRendererChromium* layerRenderer();
LayerChromium* m_owningLayer;
IntRect m_contentRect;
- bool m_skipsDraw;
- OwnPtr<LayerTexture> m_contentsTexture;
+ unsigned m_contentsTextureId;
float m_drawOpacity;
+ IntSize m_allocatedTextureSize;
TransformationMatrix m_drawTransform;
TransformationMatrix m_originTransform;
IntRect m_scissorRect;
diff --git a/WebCore/platform/graphics/chromium/TextureManager.cpp b/WebCore/platform/graphics/chromium/TextureManager.cpp
deleted file mode 100644
index d786481..0000000
--- a/WebCore/platform/graphics/chromium/TextureManager.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "TextureManager.h"
-
-#include "LayerRendererChromium.h"
-
-namespace WebCore {
-
-static size_t memoryUseBytes(IntSize size, unsigned textureFormat)
-{
- // FIXME: This assumes all textures are 4 bytes/pixel, like RGBA.
- return size.width() * size.height() * 4;
-}
-
-TextureManager::TextureManager(GraphicsContext3D* context, size_t memoryLimitBytes, int maxTextureSize)
- : m_context(context)
- , m_memoryLimitBytes(memoryLimitBytes)
- , m_memoryUseBytes(0)
- , m_maxTextureSize(maxTextureSize)
- , m_nextToken(1)
-{
-}
-
-TextureToken TextureManager::getToken()
-{
- return m_nextToken++;
-}
-
-void TextureManager::releaseToken(TextureToken token)
-{
- TextureMap::iterator it = m_textures.find(token);
- if (it != m_textures.end())
- removeTexture(token, it->second);
-}
-
-bool TextureManager::hasTexture(TextureToken token)
-{
- if (m_textures.contains(token)) {
- // If someone asks about a texture put it at the end of the LRU list.
- m_textureLRUSet.remove(token);
- m_textureLRUSet.add(token);
- return true;
- }
- return false;
-}
-
-void TextureManager::protectTexture(TextureToken token)
-{
- ASSERT(hasTexture(token));
- ASSERT(!m_textures.get(token).isProtected);
- TextureInfo info = m_textures.take(token);
- info.isProtected = true;
- m_textures.add(token, info);
-}
-
-void TextureManager::unprotectTexture(TextureToken token)
-{
- TextureMap::iterator it = m_textures.find(token);
- if (it != m_textures.end()) {
- TextureInfo info = it->second;
- if (info.isProtected) {
- info.isProtected = false;
- m_textures.remove(it);
- m_textures.add(token, info);
- }
- }
-}
-
-bool TextureManager::reduceMemoryToLimit(size_t limit)
-{
- while (m_memoryUseBytes > limit) {
- ASSERT(!m_textureLRUSet.isEmpty());
- bool foundCandidate = false;
- for (ListHashSet<TextureToken>::iterator lruIt = m_textureLRUSet.begin(); lruIt != m_textureLRUSet.end(); ++lruIt) {
- TextureToken token = *lruIt;
- TextureInfo info = m_textures.get(token);
- if (info.isProtected)
- continue;
- removeTexture(token, info);
- foundCandidate = true;
- break;
- }
- if (!foundCandidate)
- return false;
- }
- return true;
-}
-
-void TextureManager::addTexture(TextureToken token, TextureInfo info)
-{
- ASSERT(!m_textureLRUSet.contains(token));
- ASSERT(!m_textures.contains(token));
- m_memoryUseBytes += memoryUseBytes(info.size, info.format);
- m_textures.set(token, info);
- m_textureLRUSet.add(token);
-}
-
-void TextureManager::removeTexture(TextureToken token, TextureInfo info)
-{
- ASSERT(m_textureLRUSet.contains(token));
- ASSERT(m_textures.contains(token));
- m_memoryUseBytes -= memoryUseBytes(info.size, info.format);
- m_textures.remove(token);
- ASSERT(m_textureLRUSet.contains(token));
- m_textureLRUSet.remove(token);
- GLC(m_context, m_context->deleteTexture(info.textureId));
-}
-
-unsigned TextureManager::requestTexture(TextureToken token, IntSize size, unsigned format, bool* newTexture)
-{
- if (size.width() > m_maxTextureSize || size.height() > m_maxTextureSize)
- return 0;
-
- TextureMap::iterator it = m_textures.find(token);
- if (it != m_textures.end()) {
- ASSERT(it->second.size != size || it->second.format != format);
- removeTexture(token, it->second);
- }
-
- size_t memoryRequiredBytes = memoryUseBytes(size, format);
- if (memoryRequiredBytes > m_memoryLimitBytes || !reduceMemoryToLimit(m_memoryLimitBytes - memoryRequiredBytes))
- return 0;
-
- unsigned textureId = m_context->createTexture();
- GLC(m_context, textureId = m_context->createTexture());
- GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId));
- // Do basic linear filtering on resize.
- GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
- GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
- // NPOT textures in GL ES only work when the wrap mode is set to GraphicsContext3D::CLAMP_TO_EDGE.
- GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
- GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
- GLC(m_context, m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GraphicsContext3D::UNSIGNED_BYTE, 0));
- TextureInfo info;
- info.size = size;
- info.format = format;
- info.textureId = textureId;
- info.isProtected = true;
- addTexture(token, info);
- return textureId;
-}
-
-}
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/WebCore/platform/graphics/chromium/TextureManager.h b/WebCore/platform/graphics/chromium/TextureManager.h
deleted file mode 100644
index 1e850cd..0000000
--- a/WebCore/platform/graphics/chromium/TextureManager.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TextureManager_h
-#define TextureManager_h
-
-#include "GraphicsContext3D.h"
-#include "IntRect.h"
-#include "IntSize.h"
-
-#include <wtf/HashMap.h>
-#include <wtf/ListHashSet.h>
-
-namespace WebCore {
-
-typedef int TextureToken;
-
-class TextureManager : public Noncopyable {
-public:
- static PassOwnPtr<TextureManager> create(GraphicsContext3D* context, size_t memoryLimitBytes, int maxTextureSize)
- {
- return adoptPtr(new TextureManager(context, memoryLimitBytes, maxTextureSize));
- }
-
- TextureToken getToken();
- void releaseToken(TextureToken);
- bool hasTexture(TextureToken);
-
- unsigned requestTexture(TextureToken, IntSize, unsigned textureFormat, bool* newTexture = 0);
-
- void protectTexture(TextureToken);
- void unprotectTexture(TextureToken);
-
-private:
- TextureManager(GraphicsContext3D*, size_t memoryLimitBytes, int maxTextureSize);
-
- struct TextureInfo {
- IntSize size;
- unsigned format;
- unsigned textureId;
- bool isProtected;
- };
-
- bool reduceMemoryToLimit(size_t);
- void addTexture(TextureToken, TextureInfo);
- void removeTexture(TextureToken, TextureInfo);
-
- RefPtr<GraphicsContext3D> m_context;
-
- typedef HashMap<TextureToken, TextureInfo> TextureMap;
- TextureMap m_textures;
- ListHashSet<TextureToken> m_textureLRUSet;
-
- size_t m_memoryLimitBytes;
- size_t m_memoryUseBytes;
- int m_maxTextureSize;
- TextureToken m_nextToken;
-};
-
-}
-
-#endif
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index d6bd871..feb7ebc 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -200,11 +200,8 @@ void VideoLayerChromium::cleanupResources()
}
}
-void VideoLayerChromium::updateContentsIfDirty()
+void VideoLayerChromium::updateContents()
{
- if (!m_contentsDirty)
- return;
-
RenderLayerBacking* backing = static_cast<RenderLayerBacking*>(m_owner->client());
if (!backing || backing->paintingGoesToWindow())
return;
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.h b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
index 0992ab7..05b6578 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
@@ -45,7 +45,7 @@ public:
static PassRefPtr<VideoLayerChromium> create(GraphicsLayerChromium* owner = 0,
VideoFrameProvider* = 0);
virtual ~VideoLayerChromium();
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
virtual bool drawsContent() { return true; }
virtual void draw();
diff --git a/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp b/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp
index 5b34bb9..2055ae6 100644
--- a/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp
@@ -50,11 +50,8 @@ WebGLLayerChromium::WebGLLayerChromium(GraphicsLayerChromium* owner)
{
}
-void WebGLLayerChromium::updateContentsIfDirty()
+void WebGLLayerChromium::updateContents()
{
- if (!m_contentsDirty)
- return;
-
GraphicsContext3D* rendererContext = layerRendererContext();
ASSERT(m_context);
if (m_textureChanged) {
diff --git a/WebCore/platform/graphics/chromium/WebGLLayerChromium.h b/WebCore/platform/graphics/chromium/WebGLLayerChromium.h
index c67cc2c..11b8db7 100644
--- a/WebCore/platform/graphics/chromium/WebGLLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/WebGLLayerChromium.h
@@ -45,7 +45,7 @@ class WebGLLayerChromium : public CanvasLayerChromium {
public:
static PassRefPtr<WebGLLayerChromium> create(GraphicsLayerChromium* owner = 0);
virtual bool drawsContent() { return m_context; }
- virtual void updateContentsIfDirty();
+ virtual void updateContents();
void setContext(const GraphicsContext3D* context);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list