diff options
author | Colin Cross <ccross@android.com> | 2017-04-07 10:50:33 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-04-07 11:01:22 -0700 |
commit | d7c3ad1d95c38b33c49a462f2647dc10f1fff7b7 (patch) | |
tree | a77368b5efd882b6d7c224d8fd9f5b6948d48071 /cpp/src/sfntly/data/font_data.h | |
parent | d4aea7c865084a140a965d4c413c6c38f9a2743a (diff) | |
parent | 64f78562d2003eb7cacaaa86a398cbd41881ba6f (diff) | |
download | sfntly-d7c3ad1d95c38b33c49a462f2647dc10f1fff7b7.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into master
Bug: 32096780
Test: mmma -j external/skia
Change-Id: Ia60d7b9984c1007e82bfea10c1a6df32418100d5
(cherry picked from commit bd503d67f403ca1e1d33226626c494d5513701e4)
Diffstat (limited to 'cpp/src/sfntly/data/font_data.h')
-rw-r--r-- | cpp/src/sfntly/data/font_data.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cpp/src/sfntly/data/font_data.h b/cpp/src/sfntly/data/font_data.h index d02e8b7..e0e7e79 100644 --- a/cpp/src/sfntly/data/font_data.h +++ b/cpp/src/sfntly/data/font_data.h @@ -19,11 +19,9 @@ #include <limits.h> -#include <vector> - -#include "sfntly/port/type.h" #include "sfntly/data/byte_array.h" #include "sfntly/port/refcount.h" +#include "sfntly/port/type.h" namespace sfntly { @@ -60,16 +58,7 @@ class FontData : virtual public RefCount { // visible within the bounds set. // @param offset the start of the new bounds // @param length the number of bytes in the bounded array - // @return true if the bounding range was successful; false otherwise - virtual bool Bound(int32_t offset, int32_t length); - - // Sets limits on the size of the FontData. This is a offset bound only so if - // the FontData is writable and growable then there is no limit to that growth - // from the bounding operation. - // @param offset the start of the new bounds which must be within the current - // size of the FontData - // @return true if the bounding range was successful; false otherwise - virtual bool Bound(int32_t offset); + virtual void Bound(int32_t offset, int32_t length); // Makes a slice of this FontData. The returned slice will share the data with // the original <code>FontData</code>. |