Define SK_SAVE_LAYER_BOUNDS_ARE_FILTERED for an upcoming Skia change.

cc/playback/filter_display_item.cc

 // 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 "cc/playback/filter_display_item.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/render_surface_filters.h"
 #include "skia/ext/refptr.h"
@@ skipping 25 matching lines @@
 
 void FilterDisplayItem::Raster(SkCanvas* canvas,
                                const gfx::Rect& canvas_target_playback_rect,
                                SkPicture::AbortCallback* callback) const {
   canvas->save();
   canvas->translate(bounds_.x(), bounds_.y());
 
   skia::RefPtr<SkImageFilter> image_filter =
       RenderSurfaceFilters::BuildImageFilter(
           filters_, gfx::SizeF(bounds_.width(), bounds_.height()));
+#ifdef SK_SAVE_LAYER_BOUNDS_ARE_FILTERED
+  // TODO(senorblanco): remove this once callsites updated (crbug.com/525748)
   SkRect boundaries;
   image_filter->computeFastBounds(
       SkRect::MakeWH(bounds_.width(), bounds_.height()), &boundaries);
+#else
+  SkRect boundaries = SkRect::MakeWH(bounds_.width(), bounds_.height());
+#endif
 
   SkPaint paint;
   paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
   paint.setImageFilter(image_filter.get());
   canvas->saveLayer(&boundaries, &paint);
 
   canvas->translate(-bounds_.x(), -bounds_.y());
 }
 
 void FilterDisplayItem::AsValueInto(
@@ skipping 16 matching lines @@
   canvas->restore();
   canvas->restore();
 }
 
 void EndFilterDisplayItem::AsValueInto(
     base::trace_event::TracedValue* array) const {
   array->AppendString("EndFilterDisplayItem");
 }
 
 }  // namespace cc