Revert of Reland Compile under-invalidation checking in all builds

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

 // 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.
 
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 
 #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 {
 
 void DrawingDisplayItem::replay(GraphicsContext& context) const
 {
     if (m_picture)
         context.drawPicture(m_picture.get());
 }
 
 void DrawingDisplayItem::appendToWebDisplayItemList(const IntRect& visualRect, WebDisplayItemList* list) const
@@ skipping 17 matching lines @@
 {
     DisplayItem::dumpPropertiesAsDebugString(stringBuilder);
     if (m_picture) {
         stringBuilder.append(String::format(", rect: [%f,%f %fx%f]",
             m_picture->cullRect().x(), m_picture->cullRect().y(),
             m_picture->cullRect().width(), m_picture->cullRect().height()));
     }
 }
 #endif
 
+#if ENABLE(ASSERT)
 static bool picturesEqual(const SkPicture* picture1, const SkPicture* picture2)
 {
     if (picture1->approximateOpCount() != picture2->approximateOpCount())
         return false;
 
     SkDynamicMemoryWStream picture1Serialized;
     picture1->serialize(&picture1Serialized);
     SkDynamicMemoryWStream picture2Serialized;
     picture2->serialize(&picture2Serialized);
     if (picture1Serialized.bytesWritten() != picture2Serialized.bytesWritten())
@@ skipping 55 matching lines @@
     if (!picture || !otherPicture)
         return false;
 
     if (picturesEqual(picture, otherPicture))
         return true;
 
     // Sometimes the client may produce different pictures for the same visual result
     // which should be treated as equal.
     return bitmapsEqual(picture, otherPicture);
 }
+#endif // ENABLE(ASSERT)
 
 } // namespace blink