Commit 7fb31f0b authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

[CompositeAfterPaint] Don't paint main frame color overlay twice

This fixes crashes (due to duplicated DrawingDisplayItem ids) of overlay
layout tests in CompositeAfterPaint mode.

Sample errors: https://test-results.appspot.com/data/layout_results/linux_layout_tests_composite_after_paint/761/webkit_layout_tests%20%28with%20patch%29/layout-test-results/results.html

Test: compositing/visibility/overlays*.html in CompositeAfterPaint mode.

Bug: 524134
Change-Id: I206e191bd01768388f1192846d7370abe5f652ed
Reviewed-on: https://chromium-review.googlesource.com/c/1440524Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626909}
parent 60c1e1fe
...@@ -2578,7 +2578,6 @@ void LocalFrameView::PaintTree() { ...@@ -2578,7 +2578,6 @@ void LocalFrameView::PaintTree() {
frame_->GetPage()->GetValidationMessageClient().PaintOverlay( frame_->GetPage()->GetValidationMessageClient().PaintOverlay(
graphics_context); graphics_context);
frame_->PaintFrameColorOverlay(graphics_context);
ForAllNonThrottledLocalFrameViews( ForAllNonThrottledLocalFrameViews(
[&graphics_context](LocalFrameView& view) { [&graphics_context](LocalFrameView& view) {
view.frame_->PaintFrameColorOverlay(graphics_context); view.frame_->PaintFrameColorOverlay(graphics_context);
...@@ -2627,7 +2626,6 @@ void LocalFrameView::PaintTree() { ...@@ -2627,7 +2626,6 @@ void LocalFrameView::PaintTree() {
frame_->GetPage()->GetLinkHighlights().UpdateGeometry(); frame_->GetPage()->GetLinkHighlights().UpdateGeometry();
frame_->GetPage()->GetValidationMessageClient().PaintOverlay(); frame_->GetPage()->GetValidationMessageClient().PaintOverlay();
frame_->PaintFrameColorOverlay();
ForAllNonThrottledLocalFrameViews( ForAllNonThrottledLocalFrameViews(
[](LocalFrameView& view) { view.frame_->PaintFrameColorOverlay(); }); [](LocalFrameView& view) { view.frame_->PaintFrameColorOverlay(); });
......
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