Allow filters to specify their initial visual rect.

cc/blink/web_display_item_list_impl.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/blink/web_display_item_list_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc_blink {
 
 namespace {
 
 scoped_refptr<cc::DisplayItemList> CreateUncachedDisplayItemListForBlink() {
   cc::DisplayItemListSettings settings;
   settings.use_cached_picture = false;
@@ skipping 142 matching lines @@
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     display_item_list_
         ->CreateAndAppendPairedEndItem<cc::EndCompositingDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndCompositingDisplayItem());
   }
 }
 
 void WebDisplayItemListImpl::appendFilterItem(
     const cc::FilterOperations& filters,
-    const blink::WebFloatRect& bounds) {
+    const blink::WebFloatRect& filter_bounds) {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
-    display_item_list_->CreateAndAppendPairedBeginItem<cc::FilterDisplayItem>(
-        filters, bounds);
+    display_item_list_
+        ->CreateAndAppendPairedBeginItemWithVisualRect<cc::FilterDisplayItem>(
+            gfx::ToEnclosingRect(filter_bounds), filters, filter_bounds);
   } else {
-    cc::FilterDisplayItem item(filters, bounds);
+    cc::FilterDisplayItem item(filters, filter_bounds);
     display_item_list_->RasterIntoCanvas(item);
   }
 }
 
 void WebDisplayItemListImpl::appendEndFilterItem() {
   if (display_item_list_->RetainsIndividualDisplayItems()) {
     display_item_list_
         ->CreateAndAppendPairedEndItem<cc::EndFilterDisplayItem>();
   } else {
     display_item_list_->RasterIntoCanvas(cc::EndFilterDisplayItem());
@@ skipping 14 matching lines @@
 }
 
 void WebDisplayItemListImpl::setIsSuitableForGpuRasterization(bool isSuitable) {
   display_item_list_->SetIsSuitableForGpuRasterization(isSuitable);
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink