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

Unified Diff: include/core/SkBitmapDevice.h

Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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
« no previous file with comments | « include/core/SkBitmap.h ('k') | include/core/SkCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkBitmapDevice.h
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
index a288f8a3e2c028ef78e8cad81a39051addc9d39a..530b85c9f8199753db290498cdc90ff3e909eea9 100644
--- a/include/core/SkBitmapDevice.h
+++ b/include/core/SkBitmapDevice.h
@@ -87,7 +87,7 @@ public:
/** 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.
« no previous file with comments | « include/core/SkBitmap.h ('k') | include/core/SkCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698