Reland Compile under-invalidation checking in all builds

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
index 9d8ceb88b10617e0ed40e22265763f4de827aa01..06587565929ae14f0a1197e5f2eefeb5f8becacd 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.cpp
@@ -6,14 +6,11 @@
 
 #include "platform/graphics/GraphicsContext.h"
 #include "public/platform/WebDisplayItemList.h"
-#include "third_party/skia/include/core/SkPictureAnalyzer.h"
-
-#if ENABLE(ASSERT)
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkPictureAnalyzer.h"
 #include "third_party/skia/include/core/SkStream.h"
-#endif
 
 namespace blink {
 
@@ -51,7 +48,6 @@ void DrawingDisplayItem::dumpPropertiesAsDebugString(StringBuilder& stringBuilde
 }
 #endif
 
-#if ENABLE(ASSERT)
 static bool picturesEqual(const SkPicture* picture1, const SkPicture* picture2)
 {
     if (picture1->approximateOpCount() != picture2->approximateOpCount())
@@ -127,6 +123,5 @@ bool DrawingDisplayItem::equals(const DisplayItem& other) const
     // which should be treated as equal.
     return bitmapsEqual(picture, otherPicture);
 }
-#endif // ENABLE(ASSERT)
 
 } // namespace blink