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

Side by Side Diff: dm/DM.cpp

Issue 974913002: ViaAndroidSDK for DM (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Derek's comment changes Created 5 years, 9 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 | dm/DMSrcSinkAndroid.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 #include "CrashHandler.h" 1 #include "CrashHandler.h"
2 #include "DMJsonWriter.h" 2 #include "DMJsonWriter.h"
3 #include "DMSrcSink.h" 3 #include "DMSrcSink.h"
4 #include "DMSrcSinkAndroid.h" 4 #include "DMSrcSinkAndroid.h"
5 #include "OverwriteLine.h" 5 #include "OverwriteLine.h"
6 #include "ProcStats.h" 6 #include "ProcStats.h"
7 #include "SkBBHFactory.h" 7 #include "SkBBHFactory.h"
8 #include "SkChecksum.h" 8 #include "SkChecksum.h"
9 #include "SkCommonFlags.h" 9 #include "SkCommonFlags.h"
10 #include "SkForceLinking.h" 10 #include "SkForceLinking.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 if (FLAGS_matrix.count() == 4) { 252 if (FLAGS_matrix.count() == 4) {
253 SkMatrix m; 253 SkMatrix m;
254 m.reset(); 254 m.reset();
255 m.setScaleX((SkScalar)atof(FLAGS_matrix[0])); 255 m.setScaleX((SkScalar)atof(FLAGS_matrix[0]));
256 m.setSkewX ((SkScalar)atof(FLAGS_matrix[1])); 256 m.setSkewX ((SkScalar)atof(FLAGS_matrix[1]));
257 m.setSkewY ((SkScalar)atof(FLAGS_matrix[2])); 257 m.setSkewY ((SkScalar)atof(FLAGS_matrix[2]));
258 m.setScaleY((SkScalar)atof(FLAGS_matrix[3])); 258 m.setScaleY((SkScalar)atof(FLAGS_matrix[3]));
259 VIA("matrix", ViaMatrix, m, wrapped); 259 VIA("matrix", ViaMatrix, m, wrapped);
260 VIA("upright", ViaUpright, m, wrapped); 260 VIA("upright", ViaUpright, m, wrapped);
261 } 261 }
262
263 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
264 VIA("androidsdk", ViaAndroidSDK, wrapped);
265 #endif
266
262 #undef VIA 267 #undef VIA
263 return NULL; 268 return NULL;
264 } 269 }
265 270
266 static void gather_sinks() { 271 static void gather_sinks() {
267 for (int i = 0; i < FLAGS_config.count(); i++) { 272 for (int i = 0; i < FLAGS_config.count(); i++) {
268 const char* config = FLAGS_config[i]; 273 const char* config = FLAGS_config[i];
269 SkTArray<SkString> parts; 274 SkTArray<SkString> parts;
270 SkStrSplit(config, "-", &parts); 275 SkStrSplit(config, "-", &parts);
271 276
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 } 571 }
567 return 0; 572 return 0;
568 } 573 }
569 574
570 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 575 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
571 int main(int argc, char** argv) { 576 int main(int argc, char** argv) {
572 SkCommandLineFlags::Parse(argc, argv); 577 SkCommandLineFlags::Parse(argc, argv);
573 return dm_main(); 578 return dm_main();
574 } 579 }
575 #endif 580 #endif
OLDNEW
« no previous file with comments | « no previous file | dm/DMSrcSinkAndroid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698