commit 4469938e92d779dff05e745559e67907bbf21e78
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 31 17:28:30 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 31 17:28:30 2013 +0000
tree c87072ff8cef5709436279a1f771160511debd2a
parent 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091

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

This reverts commit 1e787c38fa71f2a21fd728f1b1d620b9b09b0d3d.

BUG=

Review URL: https://codereview.chromium.org/54603004

git-svn-id: http://skia.googlecode.com/svn/trunk@12057 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/XfermodeTest.cpp

diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 620fbf4..7d23b85 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -23,7 +23,7 @@
         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
@@ -41,7 +41,7 @@
     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();
 }