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

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

Issue 19569012: Turn on -Wall -Wextra on Mac, and fix all the warnings that crop up for /usr/bin/g++ and Clang 3.3. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: nit Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkBitmapScaler.cpp ('k') | src/gpu/GrDrawState.h » ('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 2007 The Android Open Source Project 3 * Copyright 2007 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 "SkPictureFlat.h" 10 #include "SkPictureFlat.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 115
116 /////////////////////////////////////////////////////////////////////////////// 116 ///////////////////////////////////////////////////////////////////////////////
117 117
118 SkPicture::SkPicture() { 118 SkPicture::SkPicture() {
119 fRecord = NULL; 119 fRecord = NULL;
120 fPlayback = NULL; 120 fPlayback = NULL;
121 fWidth = fHeight = 0; 121 fWidth = fHeight = 0;
122 } 122 }
123 123
124 SkPicture::SkPicture(const SkPicture& src) { 124 SkPicture::SkPicture(const SkPicture& src) : INHERITED() {
125 fWidth = src.fWidth; 125 fWidth = src.fWidth;
126 fHeight = src.fHeight; 126 fHeight = src.fHeight;
127 fRecord = NULL; 127 fRecord = NULL;
128 128
129 /* We want to copy the src's playback. However, if that hasn't been built 129 /* We want to copy the src's playback. However, if that hasn't been built
130 yet, we need to fake a call to endRecording() without actually calling 130 yet, we need to fake a call to endRecording() without actually calling
131 it (since it is destructive, and we don't want to change src). 131 it (since it is destructive, and we don't want to change src).
132 */ 132 */
133 if (src.fPlayback) { 133 if (src.fPlayback) {
134 fPlayback = SkNEW_ARGS(SkPicturePlayback, (*src.fPlayback)); 134 fPlayback = SkNEW_ARGS(SkPicturePlayback, (*src.fPlayback));
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 341 }
342 342
343 #ifdef SK_BUILD_FOR_ANDROID 343 #ifdef SK_BUILD_FOR_ANDROID
344 void SkPicture::abortPlayback() { 344 void SkPicture::abortPlayback() {
345 if (NULL == fPlayback) { 345 if (NULL == fPlayback) {
346 return; 346 return;
347 } 347 }
348 fPlayback->abort(); 348 fPlayback->abort();
349 } 349 }
350 #endif 350 #endif
OLDNEW
« no previous file with comments | « src/core/SkBitmapScaler.cpp ('k') | src/gpu/GrDrawState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698