Tweak PaintInvalidationReasons

third_party/WebKit/Source/core/layout/LayoutObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1643 matching lines @@
 
   // Called when the previous visual rect(s) is no longer valid.
   virtual void ClearPreviousVisualRects();
 
   const LayoutPoint& PaintOffset() const { return paint_offset_; }
 
   PaintInvalidationReason FullPaintInvalidationReason() const {
     return bitfields_.FullPaintInvalidationReason();
   }
   bool ShouldDoFullPaintInvalidation() const {
-    return bitfields_.FullPaintInvalidationReason() != kPaintInvalidationNone;
+    return bitfields_.FullPaintInvalidationReason() !=
+           PaintInvalidationReason::kNone;
   }
   void SetShouldDoFullPaintInvalidation(
-      PaintInvalidationReason = kPaintInvalidationFull);
+      PaintInvalidationReason = PaintInvalidationReason::kFull);
   void SetShouldDoFullPaintInvalidationWithoutGeometryChange(
-      PaintInvalidationReason = kPaintInvalidationFull);
+      PaintInvalidationReason = PaintInvalidationReason::kFull);
   void ClearShouldDoFullPaintInvalidation() {
-    bitfields_.SetFullPaintInvalidationReason(kPaintInvalidationNone);
+    bitfields_.SetFullPaintInvalidationReason(PaintInvalidationReason::kNone);
   }
 
   void ClearPaintInvalidationFlags();
 
   bool MayNeedPaintInvalidation() const {
     return bitfields_.MayNeedPaintInvalidation();
   }
   void SetMayNeedPaintInvalidation();
   void SetMayNeedPaintInvalidationWithoutGeometryChange();
 
@@ skipping 613 matching lines @@
           has_previous_selection_visual_rect_(false),
           needs_paint_property_update_(true),
           subtree_needs_paint_property_update_(true),
           descendant_needs_paint_property_update_(true),
           background_changed_since_last_paint_invalidation_(false),
           outline_may_be_affected_by_descendants_(false),
           previous_outline_may_be_affected_by_descendants_(false),
           positioned_state_(kIsStaticallyPositioned),
           selection_state_(SelectionNone),
           background_obscuration_state_(kBackgroundObscurationStatusInvalid),
-          full_paint_invalidation_reason_(kPaintInvalidationNone) {}
+          full_paint_invalidation_reason_(
+              static_cast<unsigned>(PaintInvalidationReason::kNone)) {}
 
     // Self needs layout means that this layout object is marked for a full
     // layout. This is the default layout but it is expensive as it recomputes
     // everything. For CSS boxes, this includes the width (laying out the line
     // boxes again), the margins (due to block collapsing margins), the
     // positions, the height and the potential overflow.
     ADD_BOOLEAN_BITFIELD(self_needs_layout_, SelfNeedsLayout);
 
     // A positioned movement layout is a specialized type of layout used on
     // positioned objects that only visually moved. This layout is used when
@@ skipping 186 matching lines @@
     unsigned unused_bits_ : 4;
 
    private:
     // This is the cached 'position' value of this object
     // (see ComputedStyle::position).
     unsigned positioned_state_ : 2;  // PositionedState
     unsigned selection_state_ : 3;   // SelectionState
     // Mutable for getter which lazily update this field.
     mutable unsigned
         background_obscuration_state_ : 2;         // BackgroundObscurationState
+
     unsigned full_paint_invalidation_reason_ : 5;  // PaintInvalidationReason
+    static_assert(static_cast<unsigned>(PaintInvalidationReason::kMax) <
+                      (1u << 5),
+                  "PaintInvalidationReason should fit in the bit field");
 
    public:
     bool IsOutOfFlowPositioned() const {
       return positioned_state_ == kIsOutOfFlowPositioned;
     }
     bool IsRelPositioned() const {
       return positioned_state_ == kIsRelativelyPositioned;
     }
     bool IsStickyPositioned() const {
       return positioned_state_ == kIsStickyPositioned;
@@ skipping 47 matching lines @@
     ALWAYS_INLINE void SetBackgroundObscurationState(
         BackgroundObscurationState s) const {
       background_obscuration_state_ = s;
     }
 
     PaintInvalidationReason FullPaintInvalidationReason() const {
       return static_cast<PaintInvalidationReason>(
           full_paint_invalidation_reason_);
     }
     void SetFullPaintInvalidationReason(PaintInvalidationReason reason) {
-      full_paint_invalidation_reason_ = reason;
+      full_paint_invalidation_reason_ = static_cast<unsigned>(reason);
     }
   };
 
 #undef ADD_BOOLEAN_BITFIELD
 
   LayoutObjectBitfields bitfields_;
 
   void SetSelfNeedsLayout(bool b) { bitfields_.SetSelfNeedsLayout(b); }
   void SetNeedsPositionedMovementLayout(bool b) {
     bitfields_.SetNeedsPositionedMovementLayout(b);
@@ skipping 238 matching lines @@
 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
                                 const blink::LayoutObject* object2);
 
 #endif
 
 #endif  // LayoutObject_h