| 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, 2009, 2010 Apple Inc. All rights | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 4 * reserved. | 4 * reserved. |
| 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 | 443 |
| 444 return result; | 444 return result; |
| 445 } | 445 } |
| 446 | 446 |
| 447 void ComputedStyle::removeCachedPseudoStyle(PseudoId pid) { | 447 void ComputedStyle::removeCachedPseudoStyle(PseudoId pid) { |
| 448 if (!m_cachedPseudoStyles) | 448 if (!m_cachedPseudoStyles) |
| 449 return; | 449 return; |
| 450 for (size_t i = 0; i < m_cachedPseudoStyles->size(); ++i) { | 450 for (size_t i = 0; i < m_cachedPseudoStyles->size(); ++i) { |
| 451 ComputedStyle* pseudoStyle = m_cachedPseudoStyles->at(i).get(); | 451 ComputedStyle* pseudoStyle = m_cachedPseudoStyles->at(i).get(); |
| 452 if (pseudoStyle->styleType() == pid) { | 452 if (pseudoStyle->styleType() == pid) { |
| 453 m_cachedPseudoStyles->remove(i); | 453 m_cachedPseudoStyles->erase(i); |
| 454 return; | 454 return; |
| 455 } | 455 } |
| 456 } | 456 } |
| 457 } | 457 } |
| 458 | 458 |
| 459 bool ComputedStyle::inheritedEqual(const ComputedStyle& other) const { | 459 bool ComputedStyle::inheritedEqual(const ComputedStyle& other) const { |
| 460 return independentInheritedEqual(other) && | 460 return independentInheritedEqual(other) && |
| 461 nonIndependentInheritedEqual(other); | 461 nonIndependentInheritedEqual(other); |
| 462 } | 462 } |
| 463 | 463 |
| (...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2472 if (value < 0) | 2472 if (value < 0) |
| 2473 fvalue -= 0.5f; | 2473 fvalue -= 0.5f; |
| 2474 else | 2474 else |
| 2475 fvalue += 0.5f; | 2475 fvalue += 0.5f; |
| 2476 } | 2476 } |
| 2477 | 2477 |
| 2478 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2478 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 2479 } | 2479 } |
| 2480 | 2480 |
| 2481 } // namespace blink | 2481 } // namespace blink |
| OLD | NEW |