Commit d2c0e1b3 authored by danakj's avatar danakj Committed by Commit bot

Don't call PaintChildren() from inside OnPaint().

OnPaint() is not part of the recursion, it won't have access to the
necessary pieces to do recursion.

If you need to do painting while inside the recursion, this should
happen in PaintChildren(). So move the contents of OnPaint() to
PaintChildren().

R=estade@chromium.org
BUG=466426

Review URL: https://codereview.chromium.org/1029263011

Cr-Commit-Position: refs/heads/master@{#322487}
parent 571587c3
...@@ -685,8 +685,6 @@ void AutofillDialogViews::OverlayView::OnPaint(gfx::Canvas* canvas) { ...@@ -685,8 +685,6 @@ void AutofillDialogViews::OverlayView::OnPaint(gfx::Canvas* canvas) {
paint.setStyle(SkPaint::kStroke_Style); paint.setStyle(SkPaint::kStroke_Style);
canvas->DrawPath(arrow, paint); canvas->DrawPath(arrow, paint);
} }
PaintChildren(canvas, views::CullSet());
} }
void AutofillDialogViews::OverlayView::OnNativeThemeChanged( void AutofillDialogViews::OverlayView::OnNativeThemeChanged(
...@@ -763,12 +761,7 @@ const char* AutofillDialogViews::NotificationArea::GetClassName() const { ...@@ -763,12 +761,7 @@ const char* AutofillDialogViews::NotificationArea::GetClassName() const {
void AutofillDialogViews::NotificationArea::PaintChildren( void AutofillDialogViews::NotificationArea::PaintChildren(
gfx::Canvas* canvas, gfx::Canvas* canvas,
const views::CullSet& cull_set) { const views::CullSet& cull_set) {
}
void AutofillDialogViews::NotificationArea::OnPaint(gfx::Canvas* canvas) {
views::View::OnPaint(canvas);
views::View::PaintChildren(canvas, views::CullSet()); views::View::PaintChildren(canvas, views::CullSet());
if (HasArrow()) { if (HasArrow()) {
DrawArrow( DrawArrow(
canvas, canvas,
...@@ -1002,11 +995,6 @@ const char* AutofillDialogViews::SuggestedButton::GetClassName() const { ...@@ -1002,11 +995,6 @@ const char* AutofillDialogViews::SuggestedButton::GetClassName() const {
return kSuggestedButtonClassName; return kSuggestedButtonClassName;
} }
void AutofillDialogViews::SuggestedButton::PaintChildren(
gfx::Canvas* canvas,
const views::CullSet& cull_set) {
}
void AutofillDialogViews::SuggestedButton::OnPaint(gfx::Canvas* canvas) { void AutofillDialogViews::SuggestedButton::OnPaint(gfx::Canvas* canvas) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
const gfx::Insets insets = GetInsets(); const gfx::Insets insets = GetInsets();
......
...@@ -263,7 +263,6 @@ class AutofillDialogViews : public AutofillDialogView, ...@@ -263,7 +263,6 @@ class AutofillDialogViews : public AutofillDialogView,
const char* GetClassName() const override; const char* GetClassName() const override;
void PaintChildren(gfx::Canvas* canvas, void PaintChildren(gfx::Canvas* canvas,
const views::CullSet& cull_set) override; const views::CullSet& cull_set) override;
void OnPaint(gfx::Canvas* canvas) override;
void set_arrow_centering_anchor( void set_arrow_centering_anchor(
const base::WeakPtr<views::View>& arrow_centering_anchor) { const base::WeakPtr<views::View>& arrow_centering_anchor) {
...@@ -345,8 +344,6 @@ class AutofillDialogViews : public AutofillDialogView, ...@@ -345,8 +344,6 @@ class AutofillDialogViews : public AutofillDialogView,
// views::MenuButton implementation. // views::MenuButton implementation.
gfx::Size GetPreferredSize() const override; gfx::Size GetPreferredSize() const override;
const char* GetClassName() const override; const char* GetClassName() const override;
void PaintChildren(gfx::Canvas* canvas,
const views::CullSet& cull_set) override;
void OnPaint(gfx::Canvas* canvas) override; void OnPaint(gfx::Canvas* canvas) override;
private: private:
......
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