Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1352)

Side by Side Diff: include/core/SkShader.h

Issue 423943005: Revert of Remove relative path to GrColor.h in SkShader.h (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « gyp/core.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #ifndef SkShader_DEFINED 9 #ifndef SkShader_DEFINED
10 #define SkShader_DEFINED 10 #define SkShader_DEFINED
11 11
12 #include "SkBitmap.h" 12 #include "SkBitmap.h"
13 #include "SkFlattenable.h" 13 #include "SkFlattenable.h"
14 #include "SkMask.h" 14 #include "SkMask.h"
15 #include "SkMatrix.h" 15 #include "SkMatrix.h"
16 #include "SkPaint.h" 16 #include "SkPaint.h"
17 #include "GrColor.h" 17 #include "../gpu/GrColor.h"
18 18
19 class SkPath; 19 class SkPath;
20 class SkPicture; 20 class SkPicture;
21 class SkXfermode; 21 class SkXfermode;
22 class GrContext; 22 class GrContext;
23 class GrEffect; 23 class GrEffect;
24 24
25 /** \class SkShader 25 /** \class SkShader
26 * 26 *
27 * Shaders specify the source color(s) for what is being drawn. If a paint 27 * Shaders specify the source color(s) for what is being drawn. If a paint
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 // constructors. 470 // constructors.
471 SkMatrix fLocalMatrix; 471 SkMatrix fLocalMatrix;
472 472
473 // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer con structor. 473 // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer con structor.
474 friend class SkLocalMatrixShader; 474 friend class SkLocalMatrixShader;
475 475
476 typedef SkFlattenable INHERITED; 476 typedef SkFlattenable INHERITED;
477 }; 477 };
478 478
479 #endif 479 #endif
OLDNEW
« no previous file with comments | « gyp/core.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698