Skip to content

Commit

Permalink
Revert "Turn on Analytic AA in Chrome (take 4)"
Browse files Browse the repository at this point in the history
This reverts commit 1b4f5e9.

Reason for revert: rebaseline-cl did not pull results for all
platforms.

TBR=liyuqian@chromium.org

Cr-Commit-Position: refs/heads/master@{#434568}
  • Loading branch information
fmalita committed Nov 26, 2016
1 parent 2349585 commit 53d5e24
Show file tree
Hide file tree
Showing 8,449 changed files with 247 additions and 382 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified cc/test/data/background_filter_on_scaled_layer_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cc/test/data/background_filter_rotated_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cc/test/data/rotated_drop_shadow_filter_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cc/test/data/rotated_filter_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cc/test/data/scaled_render_surface_layer_sw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions skia/config/SkUserConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
# define SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
#endif

#ifndef SK_ANALYTIC_AA
# define SK_ANALYTIC_AA
#endif

///////////////////////// Imported from BUILD.gn and skia_common.gypi

/* In some places Skia can use static initializers for global initialization,
Expand Down Expand Up @@ -265,6 +261,10 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
// Enabling the screenspace AA tessellating path renderer needs rebaselines.
#define SK_DISABLE_SCREENSPACE_TESS_AA_PATH_RENDERER

// Disable analytic AA until we fix all the Chrome tests.
// (we now set analytic AA as default in Skia.)
#define SK_NO_ANALYTIC_AA

// ===== End Chrome-specific definitions =====

#endif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<style>
body {
margin: 0;
}
div {
width: 200px;
height: 200px;
background-color: green;
border-radius: 100px;
}
</style>
</head>
<body>
<div></div>
<div></div>
</body>
</html>
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html lang="en">
<head>
<style>
#back {
width: 1000px;
height: 600px;
background-color: green;
}
#front {
width: 800px;
height: 400px;
background-color: red;
border: 50px solid blue;
padding: 50px;
-webkit-mask-image: url(resources/circle-alpha.svg);
mask-source-type: alpha;
-webkit-mask-size: 200px auto;
-webkit-mask-repeat: repeat;
-webkit-mask-origin: border-box;
-webkit-mask-clip: border-box;
}
</style>
</head>

<body>
<div id="back">
<div id="front" />
</div>
</body>
</html>

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!doctype html>
<html>
<head>
<style type="text/css">
.greenSquare {
position: absolute;
top:50px;
left:50px;
width: 100px;
height: 100px;
border-bottom-right-radius: 50px 50px;
border-top-left-radius: 50px 50px;
background-color: green;
}

.yellowSquare {
position: absolute;
top: 20px;
left: 250px;
width: 120px;
height: 120px;
border-top-right-radius: 60px 60px;
border-bottom-left-radius: 70px 60px;
background-color: yellow;
}

.green-shadow {
position: absolute;
top: 150px;
left: 150px;
width: 120px;
height: 120px;
border-bottom-right-radius: 60px 60px;
border-top-left-radius: 60px 60px;
background-color: black;
}

.yellow-shadow {
position: absolute;
top: 160px;
left: 350px;
width: 140px;
height: 140px;
border-top-right-radius: 70px 70px;
border-bottom-left-radius: 80px 70px;
background-color: black;
}

.container {
position: absolute;
}
</style>
</head>
<body>
<div class="container">
<div id="yellowShadow" class="yellow-shadow"></div>
<div id="yellow" class="yellowSquare"></div>
<div id="greenShadow" class="green-shadow"></div>
<div id="green" class="greenSquare"></div>
</div>
</body>
</html>
Diff not rendered.

This file was deleted.

Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE HTML>
<html>
<body>
Test that verifies that rounded corners with overflow:hidden composite correctly. <br>
This page should show a green box with rounded corners on top of a yellow box with square corners.
<div style="width:100px; height:100px; background-color:yellow;">
<div style="width:100px; height:100px; background-color:green; border-radius:40px;"></div>
</div>
</body>
</html>
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<title>Test SVG in -webkit-cross-fade image with identical but differently sized SVG elsewhere</title>
<style>
div {
background-image: url("data:image/svg+xml,<svg viewBox='0 0 100 100' xmlns='http://www.w3.org/2000/svg'><circle cx='50' cy='50' r='35' fill='green'/></svg>");
}
.tst {
width: 100px;
height: 100px;
}
#ref {
width: 300px;
height: 300px;
}
</style>
<p>There should be three circles below. One big and two small ones.
<div id=ref></div>
<div class=tst></div>
<div class=tst></div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!DOCTYPE html>
<title>Test SVG in -webkit-cross-fade image</title>
<p>There should be four green circles below.
<div>
<img width=100 src="data:image/svg+xml,<svg width='100' height='100' xmlns='http://www.w3.org/2000/svg'><circle cx='50' cy='50' r='25' fill='green'/></svg>">
<img width=100 src="data:image/svg+xml,<svg width='100' height='100' xmlns='http://www.w3.org/2000/svg'><circle cx='50' cy='50' r='25' fill='green'/></svg>">
<img width=100 src="data:image/svg+xml,<svg width='100' height='100' xmlns='http://www.w3.org/2000/svg'><circle cx='50' cy='50' r='25' fill='green'/></svg>">
<img width=100 src="data:image/svg+xml,<svg width='100' height='100' xmlns='http://www.w3.org/2000/svg'><circle cx='50' cy='50' r='25' fill='green'/></svg>">
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<style>
#boxpos {
position: absolute;
background-color: green;
}
.box {
position: relative;
-webkit-clip-path: url(#equitri);
height: 100px;
width: 100px;
background: red;
}
</style>
<div id="boxpos">
<div class="box"></div>
</div>

<svg id="tri">
<clipPath id="equitri" clipPathUnits="objectBoundingBox">
<polygon points=".5 0, 0 .86, 1 .86, .5 0" />
</clipPath>
</svg>
Diff not rendered.

This file was deleted.

Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
layer at (0,0) size 480x360
LayoutView at (0,0) size 480x360
layer at (0,0) size 480x360
LayoutBlockFlow {HTML} at (0,0) size 480x360
LayoutBlockFlow {BODY} at (8,8) size 464x344
LayoutSVGRoot {svg} at (0,0) size 480x360
LayoutSVGHiddenContainer {defs} at (0,0) size 0x0
LayoutSVGContainer {g} at (160,140) size 160x80
LayoutSVGContainer {g} at (-60,-20) size 160x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,160.00)}]
LayoutSVGContainer {g} at (-60,-20) size 160x80
LayoutSVGEllipse {circle} at (-40,-40) size 80x80 [transform={m=((2.00,0.00)(0.00,1.00)) t=(20.00,20.00)}] [fill={[type=SOLID] [color=#FF0000]}] [cx=0.00] [cy=0.00] [r=40.00]
LayoutSVGContainer {g} at (-40,-40) size 80x80 [transform={m=((2.00,0.00)(0.00,1.00)) t=(20.00,20.00)}]
LayoutSVGEllipse {circle} at (-40,-40) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [cx=0.00] [cy=0.00] [r=40.00]
LayoutSVGContainer {g} at (10,311) size 231x36
LayoutSVGText {text} at (10,311) size 231x36 contains 1 chunk(s)
LayoutSVGInlineText {#text} at (10,311) size 231x36
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 231.00: "$Revision: 1.7 $"
LayoutSVGRect {rect} at (1,1) size 478x358 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
Loading

0 comments on commit 53d5e24

Please sign in to comment.