diff options
| author | brettw <brettw@chromium.org> | 2015-06-02 00:02:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-02 07:03:21 +0000 |
| commit | 05cfd8ddb3849b7e11bb53e199064291a52aeea9 (patch) | |
| tree | c197bfdf337bee3b804219251c43e4323ae9a6ae /skia | |
| parent | 7f9715680150b2f0c3ae46a227075859c73042b2 (diff) | |
| download | chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.zip chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.tar.gz chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.tar.bz2 | |
Move Pickle to base namespace.
Updates forward-declares and headers, but keeps a using statement in to avoid updating all users atomically.
TBR=jschuh for IPC stuff
Review URL: https://codereview.chromium.org/1149113006
Cr-Commit-Position: refs/heads/master@{#332352}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/skia_utils_base.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/skia/ext/skia_utils_base.h b/skia/ext/skia_utils_base.h index 01cf8ed..f37fbf2 100644 --- a/skia/ext/skia_utils_base.h +++ b/skia/ext/skia_utils_base.h @@ -12,19 +12,19 @@ namespace skia { // Return true if the pickle/iterator contains a string. If so, and if str // is not null, copy that string into str. -SK_API bool ReadSkString(PickleIterator* iter, SkString* str); +SK_API bool ReadSkString(base::PickleIterator* iter, SkString* str); // Return true if the pickle/iterator contains a FontIdentity. If so, and if // identity is not null, copy it into identity. -SK_API bool ReadSkFontIdentity(PickleIterator* iter, +SK_API bool ReadSkFontIdentity(base::PickleIterator* iter, SkFontConfigInterface::FontIdentity* identity); // Return true if str can be written into the request pickle. -SK_API bool WriteSkString(Pickle* pickle, const SkString& str); +SK_API bool WriteSkString(base::Pickle* pickle, const SkString& str); // Return true if identity can be written into the request pickle. SK_API bool WriteSkFontIdentity( - Pickle* pickle, + base::Pickle* pickle, const SkFontConfigInterface::FontIdentity& identity); } // namespace skia |