add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

tests/XfermodeTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkColor.h"
 #include "SkXfermode.h"
 
 static SkPMColor bogusXfermodeProc(SkPMColor src, SkPMColor dst) {
     return 42;
 }
 
 #define ILLEGAL_MODE    ((SkXfermode::Mode)-1)
 
 static void test_asMode(skiatest::Reporter* reporter) {
     for (int mode = 0; mode <= SkXfermode::kLastMode; mode++) {
         SkXfermode* xfer = SkXfermode::Create((SkXfermode::Mode) mode);
 
         SkXfermode::Mode reportedMode = ILLEGAL_MODE;
         REPORTER_ASSERT(reporter, reportedMode != mode);
 
         // test IsMode
-        REPORTER_ASSERT(reporter, SkXfermode::IsMode(xfer, &reportedMode));
+        REPORTER_ASSERT(reporter, SkXfermode::AsMode(xfer, &reportedMode));
         REPORTER_ASSERT(reporter, reportedMode == mode);
 
         // repeat that test, but with asMode instead
         if (xfer) {
             reportedMode = (SkXfermode::Mode) -1;
             REPORTER_ASSERT(reporter, xfer->asMode(&reportedMode));
             REPORTER_ASSERT(reporter, reportedMode == mode);
             xfer->unref();
         } else {
             REPORTER_ASSERT(reporter, SkXfermode::kSrcOver_Mode == mode);
         }
     }
 
     SkXfermode* bogusXfer = new SkProcXfermode(bogusXfermodeProc);
     SkXfermode::Mode reportedMode = ILLEGAL_MODE;
     REPORTER_ASSERT(reporter, !bogusXfer->asMode(&reportedMode));
     REPORTER_ASSERT(reporter, reportedMode == ILLEGAL_MODE);
-    REPORTER_ASSERT(reporter, !SkXfermode::IsMode(bogusXfer, &reportedMode));
+    REPORTER_ASSERT(reporter, !SkXfermode::AsMode(bogusXfer, &reportedMode));
     REPORTER_ASSERT(reporter, reportedMode == ILLEGAL_MODE);
     bogusXfer->unref();
 }
 
 static void test_IsMode(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(NULL,
                                                  SkXfermode::kSrcOver_Mode));
 
     for (int i = 0; i <= SkXfermode::kLastMode; ++i) {
         SkXfermode::Mode mode = (SkXfermode::Mode)i;
 
         SkXfermode* xfer = SkXfermode::Create(mode);
         REPORTER_ASSERT(reporter, SkXfermode::IsMode(xfer, mode));
         SkSafeUnref(xfer);
 
         if (SkXfermode::kSrcOver_Mode != mode) {
             REPORTER_ASSERT(reporter, !SkXfermode::IsMode(NULL, mode));
         }
     }
 }
 
 static void test_xfermodes(skiatest::Reporter* reporter) {
     test_asMode(reporter);
     test_IsMode(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Xfermode", XfermodeTestClass, test_xfermodes)