summaryrefslogtreecommitdiff
path: root/third_party/skia_shared/SkFloatToDecimal.h
diff options
context:
space:
mode:
authorJonathan Feinberg <feinberg@google.com>2018-02-22 19:16:55 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-22 19:16:55 +0000
commit3185187d256ca26f2c1bf8d29196f4ac4462907e (patch)
treebc1f76d23b1fafdac2ec0899efd9a33c201ce6a1 /third_party/skia_shared/SkFloatToDecimal.h
parentaa2aff78e082f14e4bc418f68b27817f90e3f07a (diff)
downloadpdfium-3185187d256ca26f2c1bf8d29196f4ac4462907e.tar.xz
Add namespaces to duplicated Skia code.
When pdfium is imported into Google's internal repository, the recently copied Skia decimal formatting code causes only-defined-once violations because many Google internal projects depends on Skia through Google's own copy. This patch puts pdfium's private copy of the needed function into a namespace. Change-Id: Id102b17f6f4652e4a50c4ff75825468fc3d90727 Reviewed-on: https://pdfium-review.googlesource.com/27530 Reviewed-by: Hal Canary <halcanary@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/skia_shared/SkFloatToDecimal.h')
-rw-r--r--third_party/skia_shared/SkFloatToDecimal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/skia_shared/SkFloatToDecimal.h b/third_party/skia_shared/SkFloatToDecimal.h
index ac1042dbfb..376b093b25 100644
--- a/third_party/skia_shared/SkFloatToDecimal.h
+++ b/third_party/skia_shared/SkFloatToDecimal.h
@@ -8,6 +8,9 @@
#ifndef SkFloatToDecimal_DEFINED
#define SkFloatToDecimal_DEFINED
+namespace pdfium {
+namespace skia {
+
constexpr unsigned kMaximumSkFloatToDecimalLength = 49;
/** \fn SkFloatToDecimal
@@ -31,4 +34,7 @@ constexpr unsigned kMaximumSkFloatToDecimalLength = 49;
*/
unsigned SkFloatToDecimal(float value, char output[kMaximumSkFloatToDecimalLength]);
+} // namespace skia
+} // namespace pdfium
+
#endif // SkFloatToDecimal_DEFINED