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

Unified Diff: tests/PathOpsSkpClipTest.cpp

Issue 2212473002: SkRTConf: eliminate (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: JUST CONSTANTS 2016-08-03 (Wednesday) 13:33:58 EDT Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: tests/PathOpsSkpClipTest.cpp
diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index c96e5bf66cd064d0e35d9bf1589858d9b7e79edb..38ac119c398f997b2b3f9a21d586613ab876ef4c 100644
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/tests/PathOpsSkpClipTest.cpp
@@ -19,7 +19,6 @@
#include "SkOSFile.h"
#include "SkPathOpsDebug.h"
#include "SkPicture.h"
-#include "SkRTConf.h"
#include "SkTSort.h"
#include "SkStream.h"
#include "SkString.h"
@@ -27,6 +26,7 @@
#include "SkTDArray.h"
#include "SkTaskGroup.h"
#include "SkTemplates.h"
+#include "SkTSearch.h"
#include "SkTime.h"
#include <stdlib.h>
@@ -741,9 +741,8 @@ checkEarlyExit:
}
static void initTest() {
-#if !defined SK_BUILD_FOR_WIN && !defined SK_BUILD_FOR_MAC
- SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true);
- SK_CONF_SET("images.png.suppressDecoderWarnings", true);
+#if defined(SK_DEBUG) && !defined SK_BUILD_FOR_WIN && !defined SK_BUILD_FOR_MAC
+ c_suppressPNGImageDecoderWarnings = true;
mtklein 2016/08/03 17:43:21 let's delete this for real
hal.canary 2016/08/03 21:23:43 Done.
#endif
}

Powered by Google App Engine
This is Rietveld 408576698