Code cleanup: remove unnecessary conditional guard in PaintLayerCompositor

third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 396 matching lines @@
     }
 
     if (layersChanged) {
       updateType = std::max(updateType, CompositingUpdateRebuildTree);
       if (ScrollingCoordinator* scrollingCoordinator =
               this->scrollingCoordinator())
         scrollingCoordinator->notifyGeometryChanged();
     }
   }
 
-  if (updateType != CompositingUpdateNone) {
-    if (RuntimeEnabledFeatures::compositorWorkerEnabled() && m_scrollLayer) {
-      // If rootLayerScrolls is enabled, these properties are applied in
-      // CompositedLayerMapping::updateElementIdAndCompositorMutableProperties.
-      if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-        if (Element* scrollingElement =
-                m_layoutView.document().scrollingElement()) {
-          uint32_t mutableProperties = CompositorMutableProperty::kNone;
-          if (scrollingElement->hasCompositorProxy())
-            mutableProperties = (CompositorMutableProperty::kScrollLeft |
-                                 CompositorMutableProperty::kScrollTop) &
-                                scrollingElement->compositorMutableProperties();
-          m_scrollLayer->setCompositorMutableProperties(mutableProperties);
+  if (RuntimeEnabledFeatures::compositorWorkerEnabled() && m_scrollLayer) {
+    // If rootLayerScrolls is enabled, these properties are applied in
+    // CompositedLayerMapping::updateElementIdAndCompositorMutableProperties.
+    if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+      if (Element* scrollingElement =
+              m_layoutView.document().scrollingElement()) {
+        uint32_t mutableProperties = CompositorMutableProperty::kNone;
+        if (scrollingElement->hasCompositorProxy()) {
+          mutableProperties = (CompositorMutableProperty::kScrollLeft |
+                               CompositorMutableProperty::kScrollTop) &
+                              scrollingElement->compositorMutableProperties();
         }
+        m_scrollLayer->setCompositorMutableProperties(mutableProperties);

[Stephen Chennney, 2017/03/17 18:31:36]

This doesn't require a scrollingElement like it did before?

[smcgruer, 2017/03/17 18:38:56]

This is still inside that conditional. You are perhaps being misled because
presubmit required me to add braces to the 'if
(scrollElement->hasCompositorProxy())' conditional block, because its body is
too long.

[Stephen Chennney, 2017/03/17 18:47:57]

Sorry I missed that. Plus one for the style guide, as then I would not have had
to reason about it.

       }
     }
+  }
 
-    GraphicsLayerUpdater updater;
-    updater.update(*updateRoot, layersNeedingPaintInvalidation);
+  GraphicsLayerUpdater updater;
+  updater.update(*updateRoot, layersNeedingPaintInvalidation);
 
-    if (updater.needsRebuildTree())
-      updateType = std::max(updateType, CompositingUpdateRebuildTree);
+  if (updater.needsRebuildTree())
+    updateType = std::max(updateType, CompositingUpdateRebuildTree);
 
 #if DCHECK_IS_ON()
-    // FIXME: Move this check to the end of the compositing update.
-    GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(
-        *updateRoot);
+  // FIXME: Move this check to the end of the compositing update.
+  GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(
+      *updateRoot);
 #endif
-  }
 
   if (updateType >= CompositingUpdateRebuildTree) {
     GraphicsLayerVector childList;
     {
       TRACE_EVENT0("blink", "GraphicsLayerTreeBuilder::rebuild");
       GraphicsLayerTreeBuilder().rebuild(*updateRoot, childList);
     }
 
     if (!childList.isEmpty()) {
       CHECK(m_compositing);
@@ skipping 860 matching lines @@
   } else if (graphicsLayer == m_scrollLayer.get()) {
     name = "Frame Scrolling Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink