Revert of Reland Compile under-invalidation checking in all builds

third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 189 matching lines @@
 
     // Return a string with a human readable form of the layer tree, If debug is true
     // pointers for the layers and timing data will be included in the returned string.
     String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const;
 
     std::unique_ptr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;
 
     void setTracksPaintInvalidations(bool);
     bool isTrackingOrCheckingPaintInvalidations() const
     {
-        return RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled() || m_isTrackingPaintInvalidations;
+#if DCHECK_IS_ON()
+        if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnabled())
+            return true;
+#endif
+        return m_isTrackingPaintInvalidations;
     }
 
     void resetTrackedPaintInvalidations();
     bool hasTrackedPaintInvalidations() const;
     void trackPaintInvalidation(const DisplayItemClient&, const IntRect&, PaintInvalidationReason);
 
     void addLinkHighlight(LinkHighlight*);
     void removeLinkHighlight(LinkHighlight*);
     // Exposed for tests
     unsigned numLinkHighlights() { return m_linkHighlights.size(); }
@@ skipping 66 matching lines @@
     void updateContentsRect();
 
     void setContentsTo(WebLayer*);
     void setupContentsLayer(WebLayer*);
     void clearContentsLayerIfUnregistered();
     WebLayer* contentsLayerIfRegistered();
 
     typedef HashMap<int, int> RenderingContextMap;
     std::unique_ptr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingContextMap&) const;
 
+#if DCHECK_IS_ON()
     PassRefPtr<SkPicture> capturePicture();
     void checkPaintUnderInvalidations(const SkPicture&);
+#endif
 
     GraphicsLayerClient* m_client;
 
     // Offset from the owning layoutObject
     DoubleSize m_offsetFromLayoutObject;
 
     // Position is relative to the parent GraphicsLayer
     FloatPoint m_position;
     FloatSize m_size;
 
@@ skipping 62 matching lines @@
 };
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the blink namespace for ease of invocation from gdb.
 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
 #endif
 
 #endif // GraphicsLayer_h