content/browser/web_contents/aura/overscroll_navigation_overlay.cc - Issue 1057873004: Pass a ui::PaintContext from ui::Layer to layer delegates.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/aura/overscroll_navigation_overlay.cc

Issue 1057873004: Pass a ui::PaintContext from ui::Layer to layer delegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: layer-paintcontext: mac Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/web_contents/aura/gesture_nav_simple.cc ('k') | content/browser/web_contents/aura/shadow_layer_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/overscroll_navigation_overlay.cc

diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

index c0c4a41a09bd5d71e102296e40d713ed2eae7a08..344007e6e6b982177d3ed6919fa2ed2430614cbb 100644

--- a/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay.cc

@@ -15,6 +15,7 @@

#include "ui/base/layout.h"

#include "ui/compositor/layer.h"

#include "ui/compositor/layer_animation_observer.h"

+#include "ui/compositor/paint_context.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/image_png_rep.h"

@@ -57,7 +58,8 @@ class ImageLayerDelegate : public ui::LayerDelegate {

private:

// Overridden from ui::LayerDelegate:

- void OnPaintLayer(gfx::Canvas* canvas) override {

+ void OnPaintLayer(const ui::PaintContext& context) override {

+ gfx::Canvas* canvas = context.canvas();

if (image_.IsEmpty()) {

canvas->DrawColor(SK_ColorWHITE);

} else {