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

Side by Side Diff: src/core/SkPictureRecorder.cpp

Issue 294393011: Include SkTypes to fix Android frameworks build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Include SkTypes instead. Created 6 years, 6 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 | « no previous file | 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 2014 Google Inc. 2 * Copyright 2014 Google Inc.
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 // Need to include SkTypes first, so that SK_BUILD_FOR_ANDROID is defined.
9 #include "SkTypes.h"
8 #ifdef SK_BUILD_FOR_ANDROID 10 #ifdef SK_BUILD_FOR_ANDROID
9 #include "SkPicturePlayback.h" 11 #include "SkPicturePlayback.h"
10 #endif 12 #endif
11 #include "SkPictureRecorder.h" 13 #include "SkPictureRecorder.h"
12 14
13 SkCanvas* SkPictureRecorder::beginRecording(int width, int height, 15 SkCanvas* SkPictureRecorder::beginRecording(int width, int height,
14 SkBBHFactory* bbhFactory /* = NULL * /, 16 SkBBHFactory* bbhFactory /* = NULL * /,
15 uint32_t recordFlags /* = 0 */) { 17 uint32_t recordFlags /* = 0 */) {
16 fPicture.reset(SkNEW(SkPicture)); 18 fPicture.reset(SkNEW(SkPicture));
17 return fPicture->beginRecording(width, height, bbhFactory, recordFlags); 19 return fPicture->beginRecording(width, height, bbhFactory, recordFlags);
18 } 20 }
19 21
20 #ifdef SK_BUILD_FOR_ANDROID 22 #ifdef SK_BUILD_FOR_ANDROID
21 void SkPictureRecorder::partialReplay(SkCanvas* canvas) { 23 void SkPictureRecorder::partialReplay(SkCanvas* canvas) {
22 if (NULL == fPicture.get() || NULL == canvas) { 24 if (NULL == fPicture.get() || NULL == canvas) {
23 // Not recording or nothing to replay into 25 // Not recording or nothing to replay into
24 return; 26 return;
25 } 27 }
26 28
27 SkASSERT(NULL != fPicture->fRecord); 29 SkASSERT(NULL != fPicture->fRecord);
28 30
29 SkAutoTDelete<SkPicturePlayback> playback(SkPicture::FakeEndRecording(fPictu re, 31 SkAutoTDelete<SkPicturePlayback> playback(SkPicture::FakeEndRecording(fPictu re,
30 *fPict ure->fRecord, 32 *fPict ure->fRecord,
31 false) ); 33 false) );
32 playback->draw(*canvas, NULL); 34 playback->draw(*canvas, NULL);
33 } 35 }
34 #endif 36 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698