stop using SkXfermode -- use SkBlendMode instead

stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can (next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=

Committed: https://crrev.com/cc9c70f3fd05091ebb4966ee2f70efed0532fd3e
Cr-Commit-Position: refs/heads/master@{#433788}

[reed1, 2016-11-16 20:50:26]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

BUG=
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

[reed1, 2016-11-16 20:50:27]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

[reed1, 2016-11-16 20:51:09]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly blind) refactoring from one enum name to another.

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

[reed1, 2016-11-16 20:51:24]

reed@google.com changed reviewers:
+ fmalita@chromium.org

[f(malita), 2016-11-16 21:10:58]

non-owner LGTM, w/ some nits.

https://codereview.chromium.org/2502373003/diff/1/cc/ipc/shared_quad_state_st...
File cc/ipc/shared_quad_state_struct_traits.h (right):

https://codereview.chromium.org/2502373003/diff/1/cc/ipc/shared_quad_state_st...
cc/ipc/shared_quad_state_struct_traits.h:103: if (data.blend_mode() >
(int)SkBlendMode::kLastMode)
nit: static_cast<uint32_t>?

https://codereview.chromium.org/2502373003/diff/1/cc/playback/compositing_dis...
File cc/playback/compositing_display_item.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/playback/compositing_dis...
cc/playback/compositing_display_item.cc:102:
paint.setBlendMode(static_cast<SkBlendMode>(xfermode_));
nit: cast no longer needed.

https://codereview.chromium.org/2502373003/diff/1/cc/proto/skia_conversions_u...
File cc/proto/skia_conversions_unittest.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/proto/skia_conversions_u...
cc/proto/skia_conversions_unittest.cc:28: for (size_t i = 0; i <
(size_t)SkBlendMode::kLastMode; i++) {
nit: static_cast

https://codereview.chromium.org/2502373003/diff/1/cc/quads/shared_quad_state.cc
File cc/quads/shared_quad_state.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/quads/shared_quad_state....
cc/quads/shared_quad_state.cc:13: extern const char*
SkBlendMode_Name(SkBlendMode);
Is this not declared in a public Skia header?

https://codereview.chromium.org/2502373003/diff/1/skia/ext/benchmarking_canva...
File skia/ext/benchmarking_canvas.cc (right):

https://codereview.chromium.org/2502373003/diff/1/skia/ext/benchmarking_canva...
skia/ext/benchmarking_canvas.cc:24: extern const char*
SkBlendMode_Name(SkBlendMode);
Ditto.

https://codereview.chromium.org/2502373003/diff/1/ui/gfx/canvas.cc
File ui/gfx/canvas.cc (right):

https://codereview.chromium.org/2502373003/diff/1/ui/gfx/canvas.cc#newcode239
ui/gfx/canvas.cc:239: paint.setBlendMode(static_cast<SkBlendMode>(mode));
nit: cast no longer needed.

[reed1, 2016-11-16 21:31:17]

https://codereview.chromium.org/2502373003/diff/1/cc/ipc/shared_quad_state_st...
File cc/ipc/shared_quad_state_struct_traits.h (right):

https://codereview.chromium.org/2502373003/diff/1/cc/ipc/shared_quad_state_st...
cc/ipc/shared_quad_state_struct_traits.h:103: if (data.blend_mode() >
(int)SkBlendMode::kLastMode)
On 2016/11/16 21:10:58, f(malita) wrote:
> nit: static_cast<uint32_t>?

Done.

https://codereview.chromium.org/2502373003/diff/1/cc/playback/compositing_dis...
File cc/playback/compositing_display_item.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/playback/compositing_dis...
cc/playback/compositing_display_item.cc:102:
paint.setBlendMode(static_cast<SkBlendMode>(xfermode_));
On 2016/11/16 21:10:58, f(malita) wrote:
> nit: cast no longer needed.

Good catch. done.

https://codereview.chromium.org/2502373003/diff/1/cc/proto/skia_conversions_u...
File cc/proto/skia_conversions_unittest.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/proto/skia_conversions_u...
cc/proto/skia_conversions_unittest.cc:28: for (size_t i = 0; i <
(size_t)SkBlendMode::kLastMode; i++) {
On 2016/11/16 21:10:58, f(malita) wrote:
> nit: static_cast

Done.

https://codereview.chromium.org/2502373003/diff/1/cc/quads/shared_quad_state.cc
File cc/quads/shared_quad_state.cc (right):

https://codereview.chromium.org/2502373003/diff/1/cc/quads/shared_quad_state....
cc/quads/shared_quad_state.cc:13: extern const char*
SkBlendMode_Name(SkBlendMode);
On 2016/11/16 21:10:58, f(malita) wrote:
> Is this not declared in a public Skia header?

Just a placeholder until skia roll updates. Will be removed.

https://codereview.chromium.org/2502373003/diff/1/skia/ext/benchmarking_canva...
File skia/ext/benchmarking_canvas.cc (right):

https://codereview.chromium.org/2502373003/diff/1/skia/ext/benchmarking_canva...
skia/ext/benchmarking_canvas.cc:24: extern const char*
SkBlendMode_Name(SkBlendMode);
On 2016/11/16 21:10:58, f(malita) wrote:
> Ditto.

Done.

https://codereview.chromium.org/2502373003/diff/1/ui/gfx/canvas.cc
File ui/gfx/canvas.cc (right):

https://codereview.chromium.org/2502373003/diff/1/ui/gfx/canvas.cc#newcode239
ui/gfx/canvas.cc:239: paint.setBlendMode(static_cast<SkBlendMode>(mode));
On 2016/11/16 21:10:58, f(malita) wrote:
> nit: cast no longer needed.

Done.

[reed1, 2016-11-16 21:32:04]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly blind) refactoring from one enum name to another.

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

[reed1, 2016-11-18 21:43:27]

reed@google.com changed reviewers:
+ danakj@chromium.org, enne@chromium.org, vmpstr@chromium.org

[reed1, 2016-11-18 21:44:16]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

BUG=
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

[reed1, 2016-11-18 21:45:30]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

[reed1, 2016-11-18 21:47:04]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-11-18 21:47:40]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-18 22:21:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-18 22:21:24]

Dry run: Try jobs failed on following builders:
  android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)

[reed1, 2016-11-18 22:25:57]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-11-18 22:26:25]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-18 22:58:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-18 22:58:16]

Dry run: Try jobs failed on following builders:
  chromeos_daisy_chromium_compile_only_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)

[enne (OOO), 2016-11-21 00:49:04]

cc lgtm

[reed1, 2016-11-21 15:18:33]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-11-21 15:18:54]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[reed1, 2016-11-21 17:39:24]

The CQ bit was unchecked by reed@google.com

[reed1, 2016-11-21 17:39:31]

The CQ bit was checked by reed@google.com

[reed1, 2016-11-21 17:39:32]

The patchset sent to the CQ was uploaded after l-g-t-m from
fmalita@chromium.org, enne@chromium.org
Link to the patchset: https://codereview.chromium.org/2502373003/#ps80001
(title: "cast for TRACE_EVENT")

[commit-bot: I haz the power, 2016-11-21 17:39:50]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-21 17:49:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-21 17:49:20]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[reed1, 2016-11-21 18:08:43]

reed@google.com changed reviewers:
+ dcheng@chromium.org, rsesek@chromium.org

[reed1, 2016-11-21 18:09:03]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-11-21 18:09:30]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dcheng, 2016-11-21 18:12:12]

ipc lgtm

(please let reviewers know what files they need to look at when adding them
though, thanks)

[commit-bot: I haz the power, 2016-11-21 20:11:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-21 20:11:32]

Dry run: This issue passed the CQ dry run.

[reed1, 2016-11-21 21:09:56]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=
==========

[reed1, 2016-11-21 21:10:07]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2016-11-21 21:10:59]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-21 21:17:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-21 21:17:56]

Failed to apply patch for services/ui/ws/frame_generator.cc:
While running git apply --index -p1;
  error: patch failed: services/ui/ws/frame_generator.cc:179
  error: services/ui/ws/frame_generator.cc: patch does not apply

Patch:       services/ui/ws/frame_generator.cc
Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc
b/services/ui/ws/frame_generator.cc
index
1a59d74c362eee07e8bc339275f3624ce3c70be7..82edf1921fad750f85c9a0160a845ad7b016b89c
100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -122,7 +122,7 @@ cc::CompositorFrame FrameGenerator::GenerateCompositorFrame(
     cc::SharedQuadState* shared_state =
         invert_pass->CreateAndAppendSharedQuadState();
     shared_state->SetAll(gfx::Transform(), output_rect.size(), output_rect,
-                         output_rect, false, 1.f, SkXfermode::kSrcOver_Mode,
0);
+                         output_rect, false, 1.f, SkBlendMode::kSrcOver, 0);
     auto* quad =
invert_pass->CreateAndAppendDrawQuad<cc::RenderPassDrawQuad>();
     cc::FilterOperations filters;
     filters.Append(cc::FilterOperation::CreateInvertFilter(1.f));
@@ -179,12 +179,11 @@ void FrameGenerator::DrawWindowTree(
     const gfx::Rect bounds_at_origin(window->bounds().size());
     // TODO(fsamuel): These clipping and visible rects are incorrect. They need
     // to be populated from CompositorFrame structs.
-    sqs->SetAll(quad_to_target_transform,
-                bounds_at_origin.size() /* layer_bounds */,
-                bounds_at_origin /* visible_layer_bounds */,
-                bounds_at_origin /* clip_rect */, false /* is_clipped */,
-                combined_opacity, SkXfermode::kSrcOver_Mode,
-                0 /* sorting-context_id */);
+    sqs->SetAll(
+        quad_to_target_transform, bounds_at_origin.size() /* layer_bounds */,
+        bounds_at_origin /* visible_layer_bounds */,
+        bounds_at_origin /* clip_rect */, false /* is_clipped */,
+        combined_opacity, SkBlendMode::kSrcOver, 0 /* sorting-context_id */);
     auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
     AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::DEFAULT,
                                 window);
@@ -203,12 +202,11 @@ void FrameGenerator::DrawWindowTree(
     const gfx::Rect bounds_at_origin(
         window->compositor_frame_sink_manager()->GetLatestFrameSize(
             mojom::CompositorFrameSinkType::UNDERLAY));
-    sqs->SetAll(quad_to_target_transform,
-                bounds_at_origin.size() /* layer_bounds */,
-                bounds_at_origin /* visible_layer_bounds */,
-                bounds_at_origin /* clip_rect */, false /* is_clipped */,
-                combined_opacity, SkXfermode::kSrcOver_Mode,
-                0 /* sorting-context_id */);
+    sqs->SetAll(
+        quad_to_target_transform, bounds_at_origin.size() /* layer_bounds */,
+        bounds_at_origin /* visible_layer_bounds */,
+        bounds_at_origin /* clip_rect */, false /* is_clipped */,
+        combined_opacity, SkBlendMode::kSrcOver, 0 /* sorting-context_id */);
 
     auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
     AddOrUpdateSurfaceReference(mojom::CompositorFrameSinkType::UNDERLAY,

[reed1, 2016-11-21 21:25:58]

The CQ bit was checked by reed@google.com

[reed1, 2016-11-21 21:25:59]

The patchset sent to the CQ was uploaded after l-g-t-m from dcheng@chromium.org,
enne@chromium.org, fmalita@chromium.org
Link to the patchset: https://codereview.chromium.org/2502373003/#ps100001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-21 21:26:39]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-21 23:28:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-21 23:28:54]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[reed1, 2016-11-22 00:35:32]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2016-11-22 00:35:58]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-22 04:26:05]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1479774932900150,
"parent_rev": "489e3cc9af858c80806554804c9b9d5f04433221", "commit_rev":
"f74d1d95828a1e0a7a2d7c8d46c22c7581c33c82"}

[commit-bot: I haz the power, 2016-11-22 04:27:10]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=
==========

[commit-bot: I haz the power, 2016-11-22 04:27:12]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-11-22 04:29:48]

Description was changed from

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=
==========

to

==========
stop using SkXfermode -- use SkBlendMode instead

Massive (mostly mechanical) refactoring from one enum name to another.

This allows us to undefine SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC, so we can
(next) eliminate SkXfermode.h entirely

BUG=652484
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=

Committed: https://crrev.com/cc9c70f3fd05091ebb4966ee2f70efed0532fd3e
Cr-Commit-Position: refs/heads/master@{#433788}
==========

[commit-bot: I haz the power, 2016-11-22 04:29:51]

Patchset 6 (id:??) landed as
https://crrev.com/cc9c70f3fd05091ebb4966ee2f70efed0532fd3e
Cr-Commit-Position: refs/heads/master@{#433788}