cc: Enable composited border-radius scrolling.

third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp

Index: third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
index 3a703cacddc9b186a5166d8afdb54d39e6ba7d3f..2e6a616e0edc0e36011ee34a41dc397f32cb5104 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
@@ -500,8 +500,15 @@ void PaintLayerClipper::InitializeCommonClipRectState(
   } else {
     const auto* ancestor_overflow_clip = ancestor_properties->OverflowClip();
     if (ancestor_overflow_clip) {
-      DCHECK_EQ(destination_property_tree_state.Clip(),
-                ancestor_overflow_clip->Parent());
+      if (const auto* ancestor_rounded_clip =

[chrishtr, 2017/06/21 15:26:56]

Put #ifdef DCHECK_IS_ON around these conditionals.

+              ancestor_properties->InnerBorderRadiusClip()) {
+        DCHECK_EQ(destination_property_tree_state.Clip(),
+                  ancestor_rounded_clip->Parent());
+        DCHECK_EQ(ancestor_rounded_clip, ancestor_overflow_clip->Parent());
+      } else {
+        DCHECK_EQ(destination_property_tree_state.Clip(),
+                  ancestor_overflow_clip->Parent());
+      }
       destination_property_tree_state.SetClip(ancestor_overflow_clip);
     }
   }