From b6888b482e1375dbfeb932992151b791b7fc0654 Mon Sep 17 00:00:00 2001
From: liyuqian <liyuqian@google.com>
Date: Mon, 4 Feb 2019 13:31:21 -0800
Subject: [PATCH] DCHECK that clip layer's behavior isn't none
 (flutter/engine#7659)

This will further guard that the framework won't forget to set the
clip behavior.

This has been tested with the flutter/flutter framework
`flutter test --local-engine=host_debug_unopt`
to ensure a successful engine roll.
---
 engine/src/flutter/flow/layers/clip_path_layer.cc  | 4 +++-
 engine/src/flutter/flow/layers/clip_rect_layer.cc  | 4 +++-
 engine/src/flutter/flow/layers/clip_rrect_layer.cc | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/engine/src/flutter/flow/layers/clip_path_layer.cc b/engine/src/flutter/flow/layers/clip_path_layer.cc
index c6259de22a..a8b23ee490 100644
--- a/engine/src/flutter/flow/layers/clip_path_layer.cc
+++ b/engine/src/flutter/flow/layers/clip_path_layer.cc
@@ -13,7 +13,9 @@
 namespace flow {
 
 ClipPathLayer::ClipPathLayer(Clip clip_behavior)
-    : clip_behavior_(clip_behavior) {}
+    : clip_behavior_(clip_behavior) {
+  FML_DCHECK(clip_behavior != Clip::none);
+}
 
 ClipPathLayer::~ClipPathLayer() = default;
 
diff --git a/engine/src/flutter/flow/layers/clip_rect_layer.cc b/engine/src/flutter/flow/layers/clip_rect_layer.cc
index 3f39daca24..9e4d06df8b 100644
--- a/engine/src/flutter/flow/layers/clip_rect_layer.cc
+++ b/engine/src/flutter/flow/layers/clip_rect_layer.cc
@@ -7,7 +7,9 @@
 namespace flow {
 
 ClipRectLayer::ClipRectLayer(Clip clip_behavior)
-    : clip_behavior_(clip_behavior) {}
+    : clip_behavior_(clip_behavior) {
+  FML_DCHECK(clip_behavior != Clip::none);
+}
 
 ClipRectLayer::~ClipRectLayer() = default;
 
diff --git a/engine/src/flutter/flow/layers/clip_rrect_layer.cc b/engine/src/flutter/flow/layers/clip_rrect_layer.cc
index 896ec1ae27..b4b968bb39 100644
--- a/engine/src/flutter/flow/layers/clip_rrect_layer.cc
+++ b/engine/src/flutter/flow/layers/clip_rrect_layer.cc
@@ -7,7 +7,9 @@
 namespace flow {
 
 ClipRRectLayer::ClipRRectLayer(Clip clip_behavior)
-    : clip_behavior_(clip_behavior) {}
+    : clip_behavior_(clip_behavior) {
+  FML_DCHECK(clip_behavior != Clip::none);
+}
 
 ClipRRectLayer::~ClipRRectLayer() = default;