summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 20:51:27 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 20:51:27 +0000
commit9d29dead3bb270b8397dcda0f1f99066d158305d (patch)
tree163a1d98603cb651c56d2eac2caac081eb5d5962 /cc
parentb8347ee4c93fb3873195275ab33ab51f1e444993 (diff)
downloadchromium_src-9d29dead3bb270b8397dcda0f1f99066d158305d.zip
chromium_src-9d29dead3bb270b8397dcda0f1f99066d158305d.tar.gz
chromium_src-9d29dead3bb270b8397dcda0f1f99066d158305d.tar.bz2
cc: PNG baselines for 16634015
TBR=enne BUG=247782 Review URL: https://codereview.chromium.org/16667005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/output/renderer_pixeltest.cc2
-rw-r--r--cc/test/data/blue_yellow.pngbin595 -> 594 bytes
-rw-r--r--cc/test/data/blue_yellow_anti_aliasing.pngbin0 -> 606 bytes
-rw-r--r--cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc2
4 files changed, 2 insertions, 2 deletions
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 2faa0d0..4b0c194 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -419,7 +419,7 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
FuzzyForSoftwareOnlyPixelComparator<TypeParam>(false)));
}
-TYPED_TEST(RendererPixelTest, RenderPassChangesSize) {
+TYPED_TEST(RendererPixelTest, DISABLED_RenderPassChangesSize) {
gfx::Rect viewport_rect(this->device_viewport_size_);
RenderPass::Id root_pass_id(1, 1);
diff --git a/cc/test/data/blue_yellow.png b/cc/test/data/blue_yellow.png
index 685e108..2cb051c 100644
--- a/cc/test/data/blue_yellow.png
+++ b/cc/test/data/blue_yellow.png
Binary files differ
diff --git a/cc/test/data/blue_yellow_anti_aliasing.png b/cc/test/data/blue_yellow_anti_aliasing.png
new file mode 100644
index 0000000..7b9c255
--- /dev/null
+++ b/cc/test/data/blue_yellow_anti_aliasing.png
Binary files differ
diff --git a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc
index e0f10ab..f1b0664 100644
--- a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc
+++ b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc
@@ -87,7 +87,7 @@ class BlueYellowLayerClient : public ContentLayerClient {
gfx::Rect layer_rect_;
};
-TEST_F(LayerTreeHostOnDemandRasterPixelTest, RasterPictureLayer) {
+TEST_F(LayerTreeHostOnDemandRasterPixelTest, DISABLED_RasterPictureLayer) {
// Use multiple colors in a single layer to prevent bypassing on-demand
// rasterization if a single solid color is detected in picture analysis.
gfx::Rect layer_rect(200, 200);