Revert of Fix bugs in clip parent calculations

Source/core/rendering/compositing/CompositingReasonFinder.cpp

Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index 4ecc89684ac1b529f7a32b93231d30a129faddde..6c2eaee85e8829f0ef180f7d8403fe924d938d42 100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -154,12 +154,14 @@
     RenderObject* renderer = layer->renderer();
 
     if (hasOverflowScrollTrigger()) {
-        if (layer->clipParent())
-            directReasons |= CompositingReasonOutOfFlowClipping;
-
         if (const RenderLayer* scrollingAncestor = layer->ancestorScrollingLayer()) {
-            if (scrollingAncestor->needsCompositedScrolling() && layer->scrollParent())
-                directReasons |= CompositingReasonOverflowScrollingParent;
+            if (scrollingAncestor->needsCompositedScrolling()) {
+                if (layer->clipParent())
+                    directReasons |= CompositingReasonOutOfFlowClipping;
+
+                if (layer->scrollParent())
+                    directReasons |= CompositingReasonOverflowScrollingParent;
+            }
         }
 
         if (layer->needsCompositedScrolling())