Don't cache reflection drawings

Source/platform/graphics/paint/DisplayItem.h

 // Copyright 2014 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 DisplayItem_h
 #define DisplayItem_h
 
 #include "platform/PlatformExport.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
 #include "wtf/Assertions.h"
@@ skipping 163 matching lines @@
         EndSubtreePaintPhaseLast = EndSubtreePaintPhaseFirst + PaintPhaseMax,
         EndSubtreeLast = EndSubtreePaintPhaseLast,
 
         TypeLast = EndSubtreeLast
     };
 
     virtual ~DisplayItem() { }
 
     virtual void replay(GraphicsContext&) { }
 
-    DisplayItemClient client() const { return m_id.client; }
-    Type type() const { return m_id.type; }
+    DisplayItemClient client() const { return m_client; }
+    Type type() const { return m_type; }
     bool idsEqual(const DisplayItem& other, Type overrideType) const
     {
-        return m_id.client == other.m_id.client
-            && m_id.type == overrideType
-            && m_id.scopeId == other.m_id.scopeId
-            && m_id.scopeContainer == other.m_id.scopeContainer;
+        return m_client == other.m_client
+            && m_type == overrideType
+            && m_scopeId == other.m_scopeId
+            && m_scopeContainer == other.m_scopeContainer;
     }
 
     void setScope(int scopeId, DisplayItemClient scopeContainer)
     {
-        m_id.scopeId = scopeId;
-        m_id.scopeContainer = scopeContainer;
+        m_scopeId = scopeId;
+        m_scopeContainer = scopeContainer;
     }
 
+    void setSkippedCache() { m_skippedCache = true; }
+    bool skippedCache() const { return m_skippedCache; }
+
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const { }
 
     // See comments of enum Type for usage of the following macros.
 #define DEFINE_CATEGORY_METHODS(Category) \
     static bool is##Category##Type(Type type) { return type >= Category##First && type <= Category##Last; } \
     bool is##Category() const { return is##Category##Type(type()); }
 
 #define DEFINE_CONVERSION_METHODS(Category1, category1, Category2, category2) \
     static Type category1##TypeTo##Category2##Type(Type type) \
     { \
@@ skipping 60 matching lines @@
 
 #ifndef NDEBUG
     static WTF::String typeAsDebugString(DisplayItem::Type);
     const WTF::String& clientDebugString() const { return m_clientDebugString; }
     WTF::String asDebugString() const;
     virtual void dumpPropertiesAsDebugString(WTF::StringBuilder&) const;
 #endif
 
 protected:
     DisplayItem(const DisplayItemClientWrapper& client, Type type)
-        : m_id(client.displayItemClient(), type)
+        : m_client(client.displayItemClient())
+        , m_scopeContainer(nullptr)
+        , m_scopeId(0)
+        , m_type(type)
+        , m_skippedCache(false)
 #ifndef NDEBUG
         , m_clientDebugString(client.debugName())
 #endif
     { }
 
 private:
-    struct Id {
-        Id(DisplayItemClient c, Type t) : client(c), type(t), scopeId(0), scopeContainer(nullptr)
-        {
-            ASSERT(c);
-        }
-
-        const DisplayItemClient client;
-        const Type type;
-        int scopeId;
-        DisplayItemClient scopeContainer;
-    } m_id;
+    const DisplayItemClient m_client;
+    DisplayItemClient m_scopeContainer;
+    int m_scopeId;
+    const Type m_type : 16;

[jbroman, 2015/06/02 18:02:23]

Why use a bitfield here when you could simply reduce the size of the underlying
type? (e.g. "enum Type : uint16_t { ... }")

[Xianzhu, 2015/06/02 18:41:59]

Great! Didn't know this grammar before. Done.

[Xianzhu, 2015/06/02 22:37:47]

MSVC failed to compile '+', '-' operators of the enum. Changed it back to
bitfield. Added a static_assert to ensure the type fits in the bitfield. 

+    bool m_skippedCache : 1;
 
 #ifndef NDEBUG
     WTF::String m_clientDebugString;
 #endif
 };
 
 class PLATFORM_EXPORT PairedBeginDisplayItem : public DisplayItem {
 protected:
     PairedBeginDisplayItem(const DisplayItemClientWrapper& client, Type type) : DisplayItem(client, type) { }
 
 private:
     virtual bool isBegin() const override final { return true; }
 };
 
 class PLATFORM_EXPORT PairedEndDisplayItem : public DisplayItem {
 protected:
     PairedEndDisplayItem(const DisplayItemClientWrapper& client, Type type) : DisplayItem(client, type) { }
 
 #if ENABLE(ASSERT)
     virtual bool isEndAndPairedWith(const DisplayItem& other) const override = 0;
 #endif
 
 private:
     virtual bool isEnd() const override final { return true; }
 };
 
 } // namespace blink
 
 #endif // DisplayItem_h