Update from https://crrev.com/311076

cc/layers/picture_layer_impl.cc

 // Copyright 2012 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 "cc/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <set>
@@ skipping 1097 matching lines @@
   if (!raster_source_->HasRecordings())
     return false;
   // If the |raster_source_| has a recording it should have non-empty bounds.
   DCHECK(!raster_source_->GetSize().IsEmpty());
   if (MaximumContentsScale() < MinimumContentsScale())
     return false;
   return true;
 }
 
 void PictureLayerImpl::SanityCheckTilingState() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   // Recycle tree doesn't have any restrictions.
   if (layer_tree_impl()->IsRecycleTree())
     return;
 
   if (!CanHaveTilings()) {
     DCHECK_EQ(0u, tilings_->num_tilings());
     return;
   }
   if (tilings_->num_tilings() == 0)
     return;
@@ skipping 180 matching lines @@
 
 bool PictureLayerImpl::AllTilesRequiredForDrawAreReadyToDraw() const {
   if (!layer_tree_impl()->IsActiveTree())
     return true;
 
   return AllTilesRequiredAreReadyToDraw(
       &PictureLayerTiling::IsTileRequiredForDrawIfVisible);
 }
 
 }  // namespace cc