Move computation of 3D descendants to the descendant-dependent flags walk.

third_party/WebKit/Source/core/paint/PaintLayer.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 949 matching lines @@
   PaintTiming* paintTiming();
 
   ClipRectsCache* clipRectsCache() const { return m_clipRectsCache.get(); }
   ClipRectsCache& ensureClipRectsCache() const {
     if (!m_clipRectsCache)
       m_clipRectsCache = WTF::wrapUnique(new ClipRectsCache);
     return *m_clipRectsCache;
   }
   void clearClipRectsCache() const { m_clipRectsCache.reset(); }
 
-  void dirty3DTransformedDescendantStatus();
-  // Both updates the status, and returns true if descendants of this have 3d.
-  bool update3DTransformedDescendantStatus();
   bool has3DTransformedDescendant() const {
-    DCHECK(!m_is3DTransformedDescendantDirty);
+    DCHECK(!m_needsDescendantDependentFlagsUpdate);
     return m_has3DTransformedDescendant;
   }
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
   void endShouldKeepAliveAllClientsRecursive();
 #endif
 
  private:
   void setNeedsCompositingInputsUpdateInternal();
 
+  void update3DTransformedDescendantStatus();
+
   // Bounding box in the coordinates of this layer.
   LayoutRect logicalBoundingBox() const;
 
   bool hasOverflowControls() const;
 
   void dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
 
   void updateLayerPositionRecursive();
 
   void setNextSibling(PaintLayer* next) { m_next = next; }
@@ skipping 137 matching lines @@
   const unsigned m_isRootLayer : 1;
 
   unsigned m_hasVisibleContent : 1;
   unsigned m_needsDescendantDependentFlagsUpdate : 1;
   unsigned m_hasVisibleDescendant : 1;
 
 #if DCHECK_IS_ON()
   unsigned m_needsPositionUpdate : 1;
 #endif
 
-  unsigned m_is3DTransformedDescendantDirty : 1;
   // Set on a stacking context layer that has 3D descendants anywhere
   // in a preserves3D hierarchy. Hint to do 3D-aware hit testing.
   unsigned m_has3DTransformedDescendant : 1;
 
   unsigned m_containsDirtyOverlayScrollbars : 1;
 
   unsigned m_needsAncestorDependentCompositingInputsUpdate : 1;
   unsigned m_childNeedsCompositingInputsUpdate : 1;
 
   // Used only while determining what layers should be composited. Applies to
@@ skipping 78 matching lines @@
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 CORE_EXPORT void showLayerTree(const blink::PaintLayer*);
 CORE_EXPORT void showLayerTree(const blink::LayoutObject*);
 #endif
 
 #endif  // Layer_h