| Index: third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h b/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h
|
| index 500cbf82877f36cde9378d715d90c9ce07329933..632fa11d2677a35c0755d2c8991722d5ed772cf4 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/paint/DisplayItem.h
|
| @@ -8,7 +8,9 @@
|
| #include "platform/PlatformExport.h"
|
| #include "platform/graphics/ContiguousContainer.h"
|
| #include "platform/graphics/paint/DisplayItemClient.h"
|
| +#include "wtf/Allocator.h"
|
| #include "wtf/Assertions.h"
|
| +#include "wtf/Noncopyable.h"
|
| #include "wtf/PassOwnPtr.h"
|
|
|
| #ifndef NDEBUG
|
| @@ -24,6 +26,7 @@ class IntRect;
|
| class WebDisplayItemList;
|
|
|
| class PLATFORM_EXPORT DisplayItem {
|
| + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| public:
|
| enum {
|
| // Must be kept in sync with core/paint/PaintPhase.h.
|
| @@ -209,6 +212,7 @@ public:
|
|
|
| // Ids are for matching new DisplayItems with existing DisplayItems.
|
| struct Id {
|
| + STACK_ALLOCATED();
|
| Id(const DisplayItemClient client, const Type type, const unsigned scope)
|
| : client(client)
|
| , type(type)
|
|
|