| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |     2  * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 
|     3  *           (C) 2000 Antti Koivisto (koivisto@kde.org) |     3  *           (C) 2000 Antti Koivisto (koivisto@kde.org) | 
|     4  *           (C) 2000 Dirk Mueller (mueller@kde.org) |     4  *           (C) 2000 Dirk Mueller (mueller@kde.org) | 
|     5  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |     5  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 
|     6  * rights reserved. |     6  * rights reserved. | 
|     7  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |     7  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 
|     8  * |     8  * | 
|     9  * This library is free software; you can redistribute it and/or |     9  * This library is free software; you can redistribute it and/or | 
|    10  * modify it under the terms of the GNU Library General Public |    10  * modify it under the terms of the GNU Library General Public | 
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   224       // affectedByActive |   224       // affectedByActive | 
|   225       // affectedByDrag |   225       // affectedByDrag | 
|   226       // isLink |   226       // isLink | 
|   227       // isInherited flags |   227       // isInherited flags | 
|   228     } |   228     } | 
|   229  |   229  | 
|   230     bool operator!=(const NonInheritedData& other) const { |   230     bool operator!=(const NonInheritedData& other) const { | 
|   231       return !(*this == other); |   231       return !(*this == other); | 
|   232     } |   232     } | 
|   233  |   233  | 
|   234     // This is set if we used viewport units when resolving a length. |   234     // These are set if we used viewport or rem units when resolving a length. | 
|   235     // It is mutable so we can pass around const ComputedStyles to resolve |   235     unsigned m_hasViewportUnits : 1; | 
|   236     // lengths. |   236     unsigned m_hasRemUnits : 1; | 
|   237     mutable unsigned m_hasViewportUnits : 1; |  | 
|   238  |  | 
|   239     mutable unsigned m_hasRemUnits : 1; |  | 
|   240  |   237  | 
|   241     // If you add more style bits here, you will also need to update |   238     // If you add more style bits here, you will also need to update | 
|   242     // ComputedStyle::copyNonInheritedFromCached() 68 bits |   239     // ComputedStyle::copyNonInheritedFromCached() 68 bits | 
|   243   } m_nonInheritedData; |   240   } m_nonInheritedData; | 
|   244  |   241  | 
|   245   // !END SYNC! |   242   // !END SYNC! | 
|   246  |   243  | 
|   247  private: |   244  private: | 
|   248   // TODO(sashab): Move these private members to the bottom of ComputedStyle. |   245   // TODO(sashab): Move these private members to the bottom of ComputedStyle. | 
|   249   ALWAYS_INLINE ComputedStyle(); |   246   ALWAYS_INLINE ComputedStyle(); | 
| (...skipping 2092 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2342   // Callback selectors. |  2339   // Callback selectors. | 
|  2343   const Vector<String>& callbackSelectors() const { |  2340   const Vector<String>& callbackSelectors() const { | 
|  2344     return m_rareNonInheritedData->m_callbackSelectors; |  2341     return m_rareNonInheritedData->m_callbackSelectors; | 
|  2345   } |  2342   } | 
|  2346   void addCallbackSelector(const String& selector); |  2343   void addCallbackSelector(const String& selector); | 
|  2347  |  2344  | 
|  2348   // Non-property flags. |  2345   // Non-property flags. | 
|  2349   bool hasViewportUnits() const { |  2346   bool hasViewportUnits() const { | 
|  2350     return m_nonInheritedData.m_hasViewportUnits; |  2347     return m_nonInheritedData.m_hasViewportUnits; | 
|  2351   } |  2348   } | 
|  2352   void setHasViewportUnits(bool hasViewportUnits = true) const { |  2349   void setHasViewportUnits(bool hasViewportUnits = true) { | 
|  2353     m_nonInheritedData.m_hasViewportUnits = hasViewportUnits; |  2350     m_nonInheritedData.m_hasViewportUnits = hasViewportUnits; | 
|  2354   } |  2351   } | 
|  2355  |  2352  | 
|  2356   bool hasRemUnits() const { return m_nonInheritedData.m_hasRemUnits; } |  2353   bool hasRemUnits() const { return m_nonInheritedData.m_hasRemUnits; } | 
|  2357   void setHasRemUnits() const { m_nonInheritedData.m_hasRemUnits = true; } |  2354   void setHasRemUnits() { m_nonInheritedData.m_hasRemUnits = true; } | 
|  2358  |  2355  | 
|  2359   bool emptyState() const { return m_emptyState; } |  2356   bool emptyState() const { return m_emptyState; } | 
|  2360   void setEmptyState(bool b) { |  2357   void setEmptyState(bool b) { | 
|  2361     setUnique(); |  2358     setUnique(); | 
|  2362     m_emptyState = b; |  2359     m_emptyState = b; | 
|  2363   } |  2360   } | 
|  2364  |  2361  | 
|  2365   bool hasInlineTransform() const { |  2362   bool hasInlineTransform() const { | 
|  2366     return m_rareNonInheritedData->m_hasInlineTransform; |  2363     return m_rareNonInheritedData->m_hasInlineTransform; | 
|  2367   } |  2364   } | 
| (...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3743   m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId); |  3740   m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId); | 
|  3744 } |  3741 } | 
|  3745  |  3742  | 
|  3746 inline bool ComputedStyle::hasPseudoElementStyle() const { |  3743 inline bool ComputedStyle::hasPseudoElementStyle() const { | 
|  3747   return m_pseudoBits & ElementPseudoIdMask; |  3744   return m_pseudoBits & ElementPseudoIdMask; | 
|  3748 } |  3745 } | 
|  3749  |  3746  | 
|  3750 }  // namespace blink |  3747 }  // namespace blink | 
|  3751  |  3748  | 
|  3752 #endif  // ComputedStyle_h |  3749 #endif  // ComputedStyle_h | 
| OLD | NEW |