diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-30 14:24:37 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-30 14:24:37 +0000 |
| commit | 4ad4ae907fa83773f671137b0e4e8c9525ab81cd (patch) | |
| tree | a3b424ce1bfe5f345ca68ff2f22c285866b6e36f /include/utils | |
| parent | a306d93cd73c3fc1d81479cbba98638f1e055385 (diff) | |
Reason for revert: need to update callsites in linux codecs
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=
Author: reed@google.com
Review URL: https://codereview.chromium.org/122283002
git-svn-id: http://skia.googlecode.com/svn/trunk@12841 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/SkRandom.h | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/include/utils/SkRandom.h b/include/utils/SkRandom.h index 9191ec35c1..eeaa701c6e 100644 --- a/include/utils/SkRandom.h +++ b/include/utils/SkRandom.h @@ -10,12 +10,9 @@ #ifndef SkRandom_DEFINED #define SkRandom_DEFINED +#include "Sk64.h" #include "SkScalar.h" -#ifdef SK_SUPPORT_LEGACY_SK64 - #include "Sk64.h" -#endif - /** \class SkLCGRandom Utility class that implements pseudo random 32bit numbers using a fast @@ -126,21 +123,13 @@ public: return this->nextUScalar1() <= fractionTrue; } - /** - * Return the next pseudo random number as a signed 64bit value. - */ - int64_t next64() { - int64_t hi = this->nextS(); - return (hi << 32) | this->nextU(); - } - -#ifdef SK_SUPPORT_LEGACY_SK64 - SK_ATTR_DEPRECATED("use next64()") + /** Return the next pseudo random number as a signed 64bit value. + */ void next64(Sk64* a) { SkASSERT(a); a->set(this->nextS(), this->nextU()); } -#endif + /** * Return the current seed. This allows the caller to later reset to the * same seed (using setSeed) so it can generate the same sequence. @@ -287,21 +276,12 @@ public: return this->nextUScalar1() <= fractionTrue; } - /** - * Return the next pseudo random number as a signed 64bit value. + /** Return the next pseudo random number as a signed 64bit value. */ - int64_t next64() { - int64_t hi = this->nextS(); - return (hi << 32) | this->nextU(); - } - -#ifdef SK_SUPPORT_LEGACY_SK64 - SK_ATTR_DEPRECATED("use next64()") void next64(Sk64* a) { SkASSERT(a); a->set(this->nextS(), this->nextU()); } -#endif /** Reset the random object. */ |