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

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

Issue 1669663003: Revert of Work around exasperating Google3 Android build error. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | src/core/SkXfermode.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 #ifndef SkXfermode_DEFINED 10 #ifndef SkXfermode_DEFINED
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 This method will not be called directly by the client, so it need not 239 This method will not be called directly by the client, so it need not
240 be implemented if your subclass has overridden xfer32/xfer16/xferA8 240 be implemented if your subclass has overridden xfer32/xfer16/xferA8
241 */ 241 */
242 virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const; 242 virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
243 243
244 private: 244 private:
245 enum { 245 enum {
246 kModeCount = kLastMode + 1 246 kModeCount = kLastMode + 1
247 }; 247 };
248 248
249 // TODO(benjaminwagner): This is crazy, but it fixes the Google3 Android bui ld. :-(
250 virtual void doNothing() const;
251
252 typedef SkFlattenable INHERITED; 249 typedef SkFlattenable INHERITED;
253 }; 250 };
254 251
255 #endif 252 #endif
OLDNEW
« no previous file with comments | « no previous file | src/core/SkXfermode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698