Commit 0b8fa8f4 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

Compile core/paint/ with -Wshadow.

Bug: 294205
Change-Id: Ia27612e37a3d5c944a0d8ef3bf3af5250cf508ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462263Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815636}
parent 694dd6bb
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
import("//third_party/blink/renderer/core/core.gni") import("//third_party/blink/renderer/core/core.gni")
blink_core_sources("paint") { blink_core_sources("paint") {
configs += [ "//build/config/compiler:noshadowing" ]
sources = [ sources = [
"applied_decoration_painter.cc", "applied_decoration_painter.cc",
"applied_decoration_painter.h", "applied_decoration_painter.h",
......
...@@ -165,9 +165,9 @@ void GraphicsLayerUpdater::UpdateRecursive( ...@@ -165,9 +165,9 @@ void GraphicsLayerUpdater::UpdateRecursive(
// If we have a forced update, we notify the display lock to ensure that the // If we have a forced update, we notify the display lock to ensure that the
// forced update resumes after the lock has been removed. // forced update resumes after the lock has been removed.
if (update_type == kForceUpdate) { if (update_type == kForceUpdate) {
auto* context = layer.GetLayoutObject().GetDisplayLockContext(); auto* child_context = layer.GetLayoutObject().GetDisplayLockContext();
DCHECK(context); DCHECK(child_context);
context->NotifyForcedGraphicsLayerUpdateBlocked(); child_context->NotifyForcedGraphicsLayerUpdateBlocked();
} }
} }
......
...@@ -420,7 +420,7 @@ void InlineTextBoxPainter::Paint(const PaintInfo& paint_info, ...@@ -420,7 +420,7 @@ void InlineTextBoxPainter::Paint(const PaintInfo& paint_info,
// the first time, we draw the glyphs outside the selection area, with // the first time, we draw the glyphs outside the selection area, with
// the original style. // the original style.
{ {
GraphicsContextStateSaver state_saver(context); GraphicsContextStateSaver inner_state_saver(context);
context.ClipOut(FloatRect(selection_rect)); context.ClipOut(FloatRect(selection_rect));
text_painter.Paint(selection_start, selection_end, length, text_style, text_painter.Paint(selection_start, selection_end, length, text_style,
node_id); node_id);
...@@ -428,7 +428,7 @@ void InlineTextBoxPainter::Paint(const PaintInfo& paint_info, ...@@ -428,7 +428,7 @@ void InlineTextBoxPainter::Paint(const PaintInfo& paint_info,
// the second time, we draw the glyphs inside the selection area, with // the second time, we draw the glyphs inside the selection area, with
// the selection style. // the selection style.
{ {
GraphicsContextStateSaver state_saver(context); GraphicsContextStateSaver inner_state_saver(context);
context.Clip(FloatRect(selection_rect)); context.Clip(FloatRect(selection_rect));
text_painter.Paint(selection_start, selection_end, length, text_painter.Paint(selection_start, selection_end, length,
selection_style, node_id); selection_style, node_id);
......
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