chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h - Issue 2717943002: Fix cc/paint skia type mismatches

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: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

Issue 2717943002: Fix cc/paint skia type mismatches (Closed)

Patch Set: Rebase Created 3 years, 10 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 | « chrome/browser/chromeos/display/overscan_calibrator.cc ('k') | chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

diff --git a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

index c2d3de80f3ffd478e50560a21702e1263f43dce0..f4d0255bdc60abc377a1b31b82f94e91c94df4a6 100644

--- a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

+++ b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

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

#define CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H_

#include "base/macros.h"

+#include "cc/paint/paint_flags.h"

#include "ui/compositor/layer_animation_observer.h"

#include "ui/display/display.h"

#include "ui/gfx/animation/animation_delegate.h"

@@ -112,7 +113,7 @@ class TouchCalibratorView : public views::View,

std::unique_ptr<views::Widget> widget_;

- SkPaint paint_;

+ cc::PaintFlags flags_;

// Defines the bounds for the background animation.

gfx::RectF background_rect_;