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

include/core/SkBitmapDevice.h

diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
index a288f8a..530b85c 100644
--- a/include/core/SkBitmapDevice.h
+++ b/include/core/SkBitmapDevice.h
@@ -87,7 +87,7 @@
 
     /** Return the bitmap config of the device's pixels
     */
-    virtual SkBitmap::Config config() const SK_OVERRIDE { return fBitmap.getConfig(); }
+    virtual SkBitmap::Config config() const SK_OVERRIDE { return fBitmap.config(); }
 
     /**
      *  DEPRECATED: This will be made protected once WebKit stops using it.