From 2b06ddc1791e9f3e004831b06a39b5b85ac9d5f0 Mon Sep 17 00:00:00 2001
From: reed <reed@chromium.org>
Date: Tue, 2 Dec 2014 20:04:40 -0800
Subject: [PATCH] Revert of rebaseline after clear change -- pdf was not
 treating clear as SRC_MODE (patchset #1 id:1 of
 https://codereview.chromium.org/759303004/)

Reason for revert:
reverted clear() change

Original issue's description:
> rebaseline after clear change -- pdf was not treating clear as SRC_MODE
>
> BUG=skia:
> NOTRY=True
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/2fb352abebc342a322d4a66c054bbff8bd565767

TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/774073002
---
 .../expected-results.json                          | 17 +++++++-----
 .../expected-results.json                          | 17 +++++++-----
 .../expected-results.json                          | 17 +++++++-----
 .../expected-results.json                          | 17 +++++++-----
 .../expected-results.json                          | 31 ++++++++++++----------
 5 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 7ca7b7f..037cac6 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -4782,7 +4782,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15967084461769578851
+          5557054264948942887
         ]
       ], 
       "reviewed-by-human": true
@@ -6587,7 +6587,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1846754159880648703
+          15617225701808152209
         ]
       ], 
       "ignore-failure": false, 
@@ -13506,7 +13506,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3186344092998755977
+          12557631619688828859
         ]
       ], 
       "ignore-failure": false, 
@@ -14221,10 +14221,13 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -17575,7 +17578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12217816694960917505
+          8564086167423775130
         ]
       ], 
       "ignore-failure": false, 
@@ -18492,7 +18495,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4163938502053643285
+          1266663168591664553
         ]
       ], 
       "ignore-failure": false, 
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 7a8ca2c..162cedd 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -3954,7 +3954,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15967084461769578851
+          5557054264948942887
         ]
       ], 
       "reviewed-by-human": true
@@ -5602,7 +5602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1846754159880648703
+          15617225701808152209
         ]
       ], 
       "ignore-failure": false, 
@@ -11875,7 +11875,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3186344092998755977
+          12557631619688828859
         ]
       ], 
       "ignore-failure": false, 
@@ -12476,10 +12476,13 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
     }, 
     "pictureimagefilter_565.png": {
       "allowed-digests": [
@@ -15422,7 +15425,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12217816694960917505
+          8564086167423775130
         ]
       ], 
       "ignore-failure": false, 
@@ -16306,7 +16309,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4163938502053643285
+          1266663168591664553
         ]
       ], 
       "ignore-failure": false, 
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index e510797..228ee32 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -5121,7 +5121,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15967084461769578851
+          5557054264948942887
         ]
       ], 
       "reviewed-by-human": true
@@ -6944,7 +6944,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3956162808902913477
+          7006120129941369043
         ]
       ], 
       "ignore-failure": false, 
@@ -13940,7 +13940,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14538925139014693261
+          11408269879068023087
         ]
       ], 
       "ignore-failure": false, 
@@ -14664,10 +14664,13 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -18084,7 +18087,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3824408873020225049
+          17889332793205793333
         ]
       ], 
       "ignore-failure": false, 
@@ -19032,7 +19035,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11258531395343605548
+          5255340625902932272
         ]
       ], 
       "ignore-failure": false, 
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 3d7b072..7907c98 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -4804,7 +4804,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15967084461769578851
+          5557054264948942887
         ]
       ], 
       "reviewed-by-human": true
@@ -6514,7 +6514,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11880185855418792365
+          8589395530227712121
         ]
       ], 
       "ignore-failure": false, 
@@ -13170,7 +13170,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17300030095663402731
+          8983923604084307345
         ]
       ], 
       "ignore-failure": false, 
@@ -13864,10 +13864,13 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -17073,7 +17076,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14795861386913800488
+          9731024951998568241
         ]
       ], 
       "ignore-failure": false, 
@@ -17971,7 +17974,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5717107989320932840
+          6406067596114174002
         ]
       ], 
       "ignore-failure": false, 
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 37ec6ad..9962ad9 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -4738,7 +4738,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15967084461769578851
+          5557054264948942887
         ]
       ], 
       "reviewed-by-human": true
@@ -4747,7 +4747,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9453365693870793221
+          14432702932234830812
         ]
       ], 
       "reviewed-by-human": true
@@ -6616,7 +6616,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11880185855418792365
+          8589395530227712121
         ]
       ], 
       "ignore-failure": false, 
@@ -6626,7 +6626,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9401717750483846956
+          7005736069988495258
         ]
       ], 
       "reviewed-by-human": true
@@ -13901,7 +13901,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17300030095663402731
+          8983923604084307345
         ]
       ], 
       "ignore-failure": false, 
@@ -13911,7 +13911,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2478851567560712402
+          17183792217564309819
         ]
       ], 
       "reviewed-by-human": true
@@ -14607,19 +14607,22 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
     }, 
     "perlinnoise_pdf-native.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          9642424294640112060
         ]
       ], 
-      "reviewed-by-human": true
+      "reviewed-by-human": false
     }, 
     "pictureimagefilter_565.png": {
       "allowed-digests": [
@@ -18007,7 +18010,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14795861386913800488
+          9731024951998568241
         ]
       ], 
       "reviewed-by-human": true
@@ -18025,7 +18028,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14795861386913800488
+          9731024951998568241
         ]
       ], 
       "ignore-failure": false, 
@@ -19073,7 +19076,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5717107989320932840
+          6406067596114174002
         ]
       ], 
       "ignore-failure": false, 
@@ -19083,7 +19086,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17381940948714139887
+          12903228223313938571
         ]
       ], 
       "reviewed-by-human": true
-- 
2.7.4