| Index: third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
|
| index 36243f7e8062b3b884e53c7854ac25b11bbe47cd..4e28553205d0f03fbf1c7ae60501e7ca8ab9fbfe 100644
|
| --- a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "core/paint/RoundedInnerRectClipper.h"
|
|
|
| -#include "core/layout/LayoutObject.h"
|
| #include "core/paint/PaintInfo.h"
|
| #include "platform/graphics/paint/ClipDisplayItem.h"
|
| #include "platform/graphics/paint/PaintController.h"
|
| @@ -12,12 +11,12 @@
|
| namespace blink {
|
|
|
| RoundedInnerRectClipper::RoundedInnerRectClipper(
|
| - const LayoutObject& layout_object,
|
| + const DisplayItemClient& display_item,
|
| const PaintInfo& paint_info,
|
| const LayoutRect& rect,
|
| const FloatRoundedRect& clip_rect,
|
| RoundedInnerRectClipperBehavior behavior)
|
| - : layout_object_(layout_object),
|
| + : display_item_(display_item),
|
| paint_info_(paint_info),
|
| use_paint_controller_(behavior == kApplyToDisplayList),
|
| clip_type_(use_paint_controller_
|
| @@ -70,10 +69,10 @@ RoundedInnerRectClipper::RoundedInnerRectClipper(
|
|
|
| if (use_paint_controller_) {
|
| paint_info_.context.GetPaintController().CreateAndAppend<ClipDisplayItem>(
|
| - layout_object, clip_type_, LayoutRect::InfiniteIntRect(),
|
| + display_item, clip_type_, LayoutRect::InfiniteIntRect(),
|
| rounded_rect_clips);
|
| } else {
|
| - ClipDisplayItem clip_display_item(layout_object, clip_type_,
|
| + ClipDisplayItem clip_display_item(display_item, clip_type_,
|
| LayoutRect::InfiniteIntRect(),
|
| rounded_rect_clips);
|
| clip_display_item.Replay(paint_info.context);
|
| @@ -84,9 +83,9 @@ RoundedInnerRectClipper::~RoundedInnerRectClipper() {
|
| DisplayItem::Type end_type = DisplayItem::ClipTypeToEndClipType(clip_type_);
|
| if (use_paint_controller_) {
|
| paint_info_.context.GetPaintController().EndItem<EndClipDisplayItem>(
|
| - layout_object_, end_type);
|
| + display_item_, end_type);
|
| } else {
|
| - EndClipDisplayItem end_clip_display_item(layout_object_, end_type);
|
| + EndClipDisplayItem end_clip_display_item(display_item_, end_type);
|
| end_clip_display_item.Replay(paint_info_.context);
|
| }
|
| }
|
|
|