| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 m_mapPoint = other.m_mapPoint; | 35 m_mapPoint = other.m_mapPoint; |
| 36 m_mapQuad = other.m_mapQuad; | 36 m_mapQuad = other.m_mapQuad; |
| 37 if (m_mapPoint) | 37 if (m_mapPoint) |
| 38 m_lastPlanarPoint = other.m_lastPlanarPoint; | 38 m_lastPlanarPoint = other.m_lastPlanarPoint; |
| 39 if (m_mapQuad) | 39 if (m_mapQuad) |
| 40 m_lastPlanarQuad = other.m_lastPlanarQuad; | 40 m_lastPlanarQuad = other.m_lastPlanarQuad; |
| 41 m_accumulatingTransform = other.m_accumulatingTransform; | 41 m_accumulatingTransform = other.m_accumulatingTransform; |
| 42 m_forceAccumulatingTransform = other.m_forceAccumulatingTransform; | 42 m_forceAccumulatingTransform = other.m_forceAccumulatingTransform; |
| 43 m_direction = other.m_direction; | 43 m_direction = other.m_direction; |
| 44 | 44 |
| 45 m_accumulatedTransform.clear(); | 45 m_accumulatedTransform.reset(); |
| 46 | 46 |
| 47 if (other.m_accumulatedTransform) | 47 if (other.m_accumulatedTransform) |
| 48 m_accumulatedTransform = TransformationMatrix::create(*other.m_accumulat
edTransform); | 48 m_accumulatedTransform = TransformationMatrix::create(*other.m_accumulat
edTransform); |
| 49 | 49 |
| 50 return *this; | 50 return *this; |
| 51 } | 51 } |
| 52 | 52 |
| 53 void TransformState::translateTransform(const LayoutSize& offset) | 53 void TransformState::translateTransform(const LayoutSize& offset) |
| 54 { | 54 { |
| 55 if (m_direction == ApplyTransformDirection) | 55 if (m_direction == ApplyTransformDirection) |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 | 212 |
| 213 // We could throw away m_accumulatedTransform if we wanted to here, but that | 213 // We could throw away m_accumulatedTransform if we wanted to here, but that |
| 214 // would cause thrash when traversing hierarchies with alternating | 214 // would cause thrash when traversing hierarchies with alternating |
| 215 // preserve-3d and flat elements. | 215 // preserve-3d and flat elements. |
| 216 if (m_accumulatedTransform) | 216 if (m_accumulatedTransform) |
| 217 m_accumulatedTransform->makeIdentity(); | 217 m_accumulatedTransform->makeIdentity(); |
| 218 m_accumulatingTransform = false; | 218 m_accumulatingTransform = false; |
| 219 } | 219 } |
| 220 | 220 |
| 221 } // namespace blink | 221 } // namespace blink |
| OLD | NEW |