| 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 r
ights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 3994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4005 inline double adjustDoubleForAbsoluteZoom(double value, | 4005 inline double adjustDoubleForAbsoluteZoom(double value, |
| 4006 const ComputedStyle& style) { | 4006 const ComputedStyle& style) { |
| 4007 return value / style.effectiveZoom(); | 4007 return value / style.effectiveZoom(); |
| 4008 } | 4008 } |
| 4009 | 4009 |
| 4010 inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, | 4010 inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, |
| 4011 const ComputedStyle& style) { | 4011 const ComputedStyle& style) { |
| 4012 return LayoutUnit(value / style.effectiveZoom()); | 4012 return LayoutUnit(value / style.effectiveZoom()); |
| 4013 } | 4013 } |
| 4014 | 4014 |
| 4015 inline double adjustScrollForAbsoluteZoom(double scrollOffset, | 4015 inline float adjustScrollForAbsoluteZoom(float scrollOffset, float zoomFactor) { |
| 4016 float zoomFactor) { | |
| 4017 return scrollOffset / zoomFactor; | 4016 return scrollOffset / zoomFactor; |
| 4018 } | 4017 } |
| 4019 | 4018 |
| 4020 inline double adjustScrollForAbsoluteZoom(double scrollOffset, | 4019 inline float adjustScrollForAbsoluteZoom(float scrollOffset, |
| 4021 const ComputedStyle& style) { | 4020 const ComputedStyle& style) { |
| 4022 return adjustScrollForAbsoluteZoom(scrollOffset, style.effectiveZoom()); | 4021 return adjustScrollForAbsoluteZoom(scrollOffset, style.effectiveZoom()); |
| 4023 } | 4022 } |
| 4024 | 4023 |
| 4025 inline bool ComputedStyle::setZoom(float f) { | 4024 inline bool ComputedStyle::setZoom(float f) { |
| 4026 if (compareEqual(m_visual->m_zoom, f)) | 4025 if (compareEqual(m_visual->m_zoom, f)) |
| 4027 return false; | 4026 return false; |
| 4028 m_visual.access()->m_zoom = f; | 4027 m_visual.access()->m_zoom = f; |
| 4029 setEffectiveZoom(effectiveZoom() * zoom()); | 4028 setEffectiveZoom(effectiveZoom() * zoom()); |
| 4030 return true; | 4029 return true; |
| 4031 } | 4030 } |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4072 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); | 4071 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); |
| 4073 } | 4072 } |
| 4074 | 4073 |
| 4075 inline bool ComputedStyle::hasPseudoElementStyle() const { | 4074 inline bool ComputedStyle::hasPseudoElementStyle() const { |
| 4076 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; | 4075 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; |
| 4077 } | 4076 } |
| 4078 | 4077 |
| 4079 } // namespace blink | 4078 } // namespace blink |
| 4080 | 4079 |
| 4081 #endif // ComputedStyle_h | 4080 #endif // ComputedStyle_h |
| OLD | NEW |