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

Side by Side Diff: src/animator/SkDraw3D.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/animator/SkDisplayable.cpp ('k') | src/animator/SkDrawBitmap.cpp » ('j') | 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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkDraw3D.h" 10 #include "SkDraw3D.h"
(...skipping 26 matching lines...) Expand all
37 SK_MEMBER_ALIAS(location, fCamera.fLocation, 3D_Point), 37 SK_MEMBER_ALIAS(location, fCamera.fLocation, 3D_Point),
38 SK_MEMBER_ALIAS(observer, fCamera.fObserver, 3D_Point), 38 SK_MEMBER_ALIAS(observer, fCamera.fObserver, 3D_Point),
39 SK_MEMBER(patch, 3D_Patch), 39 SK_MEMBER(patch, 3D_Patch),
40 SK_MEMBER_ALIAS(zenith, fCamera.fZenith, 3D_Point), 40 SK_MEMBER_ALIAS(zenith, fCamera.fZenith, 3D_Point),
41 }; 41 };
42 42
43 #endif 43 #endif
44 44
45 DEFINE_GET_MEMBER(Sk3D_Camera); 45 DEFINE_GET_MEMBER(Sk3D_Camera);
46 46
47 Sk3D_Camera::Sk3D_Camera() : hackWidth(0), hackHeight(0), patch(NULL) { 47 Sk3D_Camera::Sk3D_Camera() : hackWidth(0), hackHeight(0), patch(nullptr) {
48 } 48 }
49 49
50 Sk3D_Camera::~Sk3D_Camera() { 50 Sk3D_Camera::~Sk3D_Camera() {
51 } 51 }
52 52
53 bool Sk3D_Camera::draw(SkAnimateMaker& maker) { 53 bool Sk3D_Camera::draw(SkAnimateMaker& maker) {
54 fCamera.update(); 54 fCamera.update();
55 SkMatrix matrix; 55 SkMatrix matrix;
56 fCamera.patchToMatrix(patch->fPatch, &matrix); 56 fCamera.patchToMatrix(patch->fPatch, &matrix);
57 matrix.preTranslate(hackWidth / 2, -hackHeight / 2); 57 matrix.preTranslate(hackWidth / 2, -hackHeight / 2);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 parameters[1].fOperand.fScalar, parameters[2].fOperand.fScalar); 97 parameters[1].fOperand.fScalar, parameters[2].fOperand.fScalar);
98 break; 98 break;
99 default: 99 default:
100 SkASSERT(0); 100 SkASSERT(0);
101 } 101 }
102 } 102 }
103 103
104 const SkFunctionParamType* Sk3D_Patch::getFunctionsParameters() { 104 const SkFunctionParamType* Sk3D_Patch::getFunctionsParameters() {
105 return fFunctionParameters; 105 return fFunctionParameters;
106 } 106 }
OLDNEW
« no previous file with comments | « src/animator/SkDisplayable.cpp ('k') | src/animator/SkDrawBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698