| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 return DataEquivalent(box_reflect_, o.box_reflect_); | 309 return DataEquivalent(box_reflect_, o.box_reflect_); |
| 310 } | 310 } |
| 311 | 311 |
| 312 bool StyleRareNonInheritedData::AnimationDataEquivalent( | 312 bool StyleRareNonInheritedData::AnimationDataEquivalent( |
| 313 const StyleRareNonInheritedData& o) const { | 313 const StyleRareNonInheritedData& o) const { |
| 314 return DataEquivalent(animations_, o.animations_); | 314 return DataEquivalent(animations_, o.animations_); |
| 315 } | 315 } |
| 316 | 316 |
| 317 bool StyleRareNonInheritedData::TransitionDataEquivalent( | 317 bool StyleRareNonInheritedData::TransitionDataEquivalent( |
| 318 const StyleRareNonInheritedData& o) const { | 318 const StyleRareNonInheritedData& o) const { |
| 319 if (!transitions_ && !o.transitions_) | 319 return DataEquivalent(transitions_, o.transitions_); |
| 320 return true; | |
| 321 if (!transitions_ || !o.transitions_) | |
| 322 return false; | |
| 323 return transitions_->TransitionsMatchForStyleRecalc(*o.transitions_); | |
| 324 } | 320 } |
| 325 | 321 |
| 326 bool StyleRareNonInheritedData::ShapeOutsideDataEquivalent( | 322 bool StyleRareNonInheritedData::ShapeOutsideDataEquivalent( |
| 327 const StyleRareNonInheritedData& o) const { | 323 const StyleRareNonInheritedData& o) const { |
| 328 return DataEquivalent(shape_outside_, o.shape_outside_); | 324 return DataEquivalent(shape_outside_, o.shape_outside_); |
| 329 } | 325 } |
| 330 | 326 |
| 331 bool StyleRareNonInheritedData::ClipPathDataEquivalent( | 327 bool StyleRareNonInheritedData::ClipPathDataEquivalent( |
| 332 const StyleRareNonInheritedData& o) const { | 328 const StyleRareNonInheritedData& o) const { |
| 333 return DataEquivalent(clip_path_, o.clip_path_); | 329 return DataEquivalent(clip_path_, o.clip_path_); |
| 334 } | 330 } |
| 335 | 331 |
| 336 } // namespace blink | 332 } // namespace blink |
| OLD | NEW |