diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/Length.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/Length.h')
-rw-r--r-- | Source/WebCore/platform/Length.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/platform/Length.h b/Source/WebCore/platform/Length.h index 1571944..886dfec 100644 --- a/Source/WebCore/platform/Length.h +++ b/Source/WebCore/platform/Length.h @@ -34,7 +34,7 @@ const int percentScaleFactor = 128; const int intMaxForLength = 0x7ffffff; // max value for a 28-bit int const int intMinForLength = (-0x7ffffff - 1); // min value for a 28-bit int -enum LengthType { Auto, Relative, Percent, Fixed, Static, Intrinsic, MinIntrinsic }; +enum LengthType { Auto, Relative, Percent, Fixed, Intrinsic, MinIntrinsic }; struct Length { WTF_MAKE_FAST_ALLOCATED; @@ -163,7 +163,6 @@ public: bool isRelative() const { return type() == Relative; } bool isPercent() const { return type() == Percent; } bool isFixed() const { return type() == Fixed; } - bool isStatic() const { return type() == Static; } bool isIntrinsicOrAuto() const { return type() == Auto || type() == MinIntrinsic || type() == Intrinsic; } Length blend(const Length& from, double progress) const |