Commit fb51b188 authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

Include linux_trusty_blink_rel in CQ for paint changes

Some paint code has special DCHECK paths. Some CL may pass with DCHECK
but fail without DCHECK. We need a CQ bot to ensure the non-DCHECK path
is not broken.

Bug: 794424
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I184efbd8e07a14bd6f4d4767d42c2d14007b957a
Reviewed-on: https://chromium-review.googlesource.com/823762Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523827}
parent e78fb732
...@@ -235,9 +235,11 @@ def PostUploadHook(cl, change, output_api): # pylint: disable=C0103 ...@@ -235,9 +235,11 @@ def PostUploadHook(cl, change, output_api): # pylint: disable=C0103
results.extend(output_api.EnsureCQIncludeTrybotsAreAdded( results.extend(output_api.EnsureCQIncludeTrybotsAreAdded(
cl, cl,
['master.tryserver.chromium.linux:' ['master.tryserver.chromium.linux:'
'linux_layout_tests_slimming_paint_v2'], 'linux_layout_tests_slimming_paint_v2',
'Automatically added slimming-paint-v2 tests to run on CQ due to ' 'master.tryserver.blink:linux_trusty_blink_rel'],
'changes in paint or compositing directories.')) 'Automatically added linux_layout_tests_slimming_paint_v2 and '
'linux_trusty_blink_rel to run on CQ due to changes in paint or '
'compositing directories.'))
if _AreLayoutNGDirectoriesModified(change): if _AreLayoutNGDirectoriesModified(change):
results.extend(output_api.EnsureCQIncludeTrybotsAreAdded( results.extend(output_api.EnsureCQIncludeTrybotsAreAdded(
cl, cl,
......
...@@ -868,9 +868,10 @@ PaintResult PaintLayerPainter::PaintChildren( ...@@ -868,9 +868,10 @@ PaintResult PaintLayerPainter::PaintChildren(
IntSize scroll_offset_accumulation_for_children = IntSize scroll_offset_accumulation_for_children =
painting_info.scroll_offset_accumulation; painting_info.scroll_offset_accumulation;
if (paint_layer_.GetLayoutObject().HasOverflowClip()) if (paint_layer_.GetLayoutObject().HasOverflowClip()) {
scroll_offset_accumulation_for_children += scroll_offset_accumulation_for_children +=
paint_layer_.GetLayoutBox()->ScrolledContentOffset(); paint_layer_.GetLayoutBox()->ScrolledContentOffset();
}
for (; child; child = iterator.Next()) { for (; child; child = iterator.Next()) {
// If this Layer should paint into its own backing or a grouped backing, // If this Layer should paint into its own backing or a grouped backing,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment