summaryrefslogtreecommitdiffstats
path: root/cc/blink/web_display_item_list_impl.cc
diff options
context:
space:
mode:
authorpdr <pdr@chromium.org>2015-02-25 14:29:17 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-25 22:29:48 +0000
commit18fc53626c407d76c22c91132cabaa7a0923ed62 (patch)
tree8daecd9eb4e4e859d9659792275e831327c92cd3 /cc/blink/web_display_item_list_impl.cc
parentd00f10451d36d173b4d900c9cf3b1d0ff639350e (diff)
downloadchromium_src-18fc53626c407d76c22c91132cabaa7a0923ed62.zip
chromium_src-18fc53626c407d76c22c91132cabaa7a0923ed62.tar.gz
chromium_src-18fc53626c407d76c22c91132cabaa7a0923ed62.tar.bz2
Add layer bounds to compositing_dislay_item
This patch adds an SkRect for bounds to compositing_display_item and uses it for setting the canvas layer bounds. With this patch and the associated blink-side patch [1] we pass the following additional layout tests: LayoutTests/svg/zoom/page/zoom-mask-with-percentages.svg LayoutTests/svg/transforms/text-with-mask-with-svg-transform.svg LayoutTests/svg/custom/absolute-sized-content-with-resources.xhtml LayoutTests/svg/custom/mask-excessive-malloc.svg LayoutTests/svg/batik/masking/maskRegions.svg [1] https://codereview.chromium.org/960483002 Review URL: https://codereview.chromium.org/952123002 Cr-Commit-Position: refs/heads/master@{#318127}
Diffstat (limited to 'cc/blink/web_display_item_list_impl.cc')
-rw-r--r--cc/blink/web_display_item_list_impl.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc
index 5cbac73..b1f1211 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -98,12 +98,21 @@ void WebDisplayItemListImpl::appendEndTransparencyItem() {
display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
}
+// TODO(pdr): Remove this once the blink-side callers have been removed.
void WebDisplayItemListImpl::appendCompositingItem(
float opacity,
SkXfermode::Mode xfermode,
SkColorFilter* color_filter) {
+ appendCompositingItem(opacity, xfermode, nullptr, color_filter);
+}
+
+void WebDisplayItemListImpl::appendCompositingItem(
+ float opacity,
+ SkXfermode::Mode xfermode,
+ SkRect* bounds,
+ SkColorFilter* color_filter) {
display_item_list_->AppendItem(cc::CompositingDisplayItem::Create(
- opacity, xfermode, skia::SharePtr(color_filter)));
+ opacity, xfermode, bounds, skia::SharePtr(color_filter)));
}
void WebDisplayItemListImpl::appendEndCompositingItem() {