Revert of PaintChunk::id

third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DisplayItemClient_h
 #define DisplayItemClient_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/PaintInvalidationReason.h"
@@ skipping 45 matching lines @@
         m_cacheGenerationOrInvalidationReason.invalidate(reason);
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
         // Clear should-keep-alive of DisplayItemClients in a subsequence if this
         // object is a subsequence.
         endShouldKeepAliveAllClients(this);
 #endif
     }
 
     PaintInvalidationReason getPaintInvalidationReason() const { return m_cacheGenerationOrInvalidationReason.getPaintInvalidationReason(); }
 
-    // A client is considered "just created" if its display items have never been committed.
-    bool isJustCreated() const { return m_cacheGenerationOrInvalidationReason.isJustCreated(); }
-
 private:
-    friend class FakeDisplayItemClient;
     friend class PaintController;
 
     // Holds a unique cache generation id of DisplayItemClients and PaintControllers,
     // or PaintInvalidationReason if the DisplayItemClient or PaintController is
     // invalidated.
     //
     // A paint controller sets its cache generation to DisplayItemCacheGeneration::next()
     // at the end of each commitNewDisplayItems, and updates the cache generation of each
     // client with cached drawings by calling DisplayItemClient::setDisplayItemsCached().
     // A display item is treated as validly cached in a paint controller if its cache generation
     // matches the paint controller's cache generation.
     //
     // SPv1 only: If a display item is painted on multiple paint controllers, because cache
     // generations are unique, the client's cache generation matches the last paint controller
     // only. The client will be treated as invalid on other paint controllers regardless if
     // it's validly cached by these paint controllers. The situation is very rare (about 0.07%
     // clients were painted on multiple paint controllers) so the performance penalty is trivial.
-    class PLATFORM_EXPORT CacheGenerationOrInvalidationReason {
+    class CacheGenerationOrInvalidationReason {
         DISALLOW_NEW();
     public:
-        CacheGenerationOrInvalidationReason() : m_value(kJustCreated) { }
+        CacheGenerationOrInvalidationReason() { invalidate(); }
 
-        void invalidate(PaintInvalidationReason reason = PaintInvalidationFull)
-        {
-            if (m_value != kJustCreated)
-                m_value = static_cast<ValueType>(reason);
-        }
+        void invalidate(PaintInvalidationReason reason = PaintInvalidationFull) { m_value = static_cast<ValueType>(reason); }
 
         static CacheGenerationOrInvalidationReason next()
         {
             // In case the value overflowed in the previous call.
             if (s_nextGeneration < kFirstValidGeneration)
                 s_nextGeneration = kFirstValidGeneration;
             return CacheGenerationOrInvalidationReason(s_nextGeneration++);
         }
 
         bool matches(const CacheGenerationOrInvalidationReason& other) const
         {
             return m_value >= kFirstValidGeneration && other.m_value >= kFirstValidGeneration && m_value == other.m_value;
         }
 
         PaintInvalidationReason getPaintInvalidationReason() const
         {
-            return m_value < kJustCreated ? static_cast<PaintInvalidationReason>(m_value) : PaintInvalidationNone;
+            return m_value < kFirstValidGeneration ? static_cast<PaintInvalidationReason>(m_value) : PaintInvalidationNone;
         }
 
-        bool isJustCreated() const { return m_value == kJustCreated; }
-
     private:
         typedef uint32_t ValueType;
         explicit CacheGenerationOrInvalidationReason(ValueType value) : m_value(value) { }
 
-        static const ValueType kJustCreated = static_cast<ValueType>(PaintInvalidationReasonMax) + 1;
-        static const ValueType kFirstValidGeneration = static_cast<ValueType>(PaintInvalidationReasonMax) + 2;
+        static const ValueType kFirstValidGeneration = static_cast<ValueType>(PaintInvalidationReasonMax) + 1;
         static ValueType s_nextGeneration;
         ValueType m_value;
     };
 
     bool displayItemsAreCached(CacheGenerationOrInvalidationReason other) const { return m_cacheGenerationOrInvalidationReason.matches(other); }
     void setDisplayItemsCached(CacheGenerationOrInvalidationReason cacheGeneration) const { m_cacheGenerationOrInvalidationReason = cacheGeneration; }
 
     mutable CacheGenerationOrInvalidationReason m_cacheGenerationOrInvalidationReason;
 };
 
 inline bool operator==(const DisplayItemClient& client1, const DisplayItemClient& client2) { return &client1 == &client2; }
 inline bool operator!=(const DisplayItemClient& client1, const DisplayItemClient& client2) { return &client1 != &client2; }
 
 } // namespace blink
 
 #endif // DisplayItemClient_h