| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 } | 52 } |
| 53 | 53 |
| 54 void LayoutSVGResourceContainer::layout() | 54 void LayoutSVGResourceContainer::layout() |
| 55 { | 55 { |
| 56 // FIXME: Investigate a way to detect and break resource layout dependency c
ycles early. | 56 // FIXME: Investigate a way to detect and break resource layout dependency c
ycles early. |
| 57 // Then we can remove this method altogether, and fall back onto LayoutSVGHi
ddenContainer::layout(). | 57 // Then we can remove this method altogether, and fall back onto LayoutSVGHi
ddenContainer::layout(). |
| 58 ASSERT(needsLayout()); | 58 ASSERT(needsLayout()); |
| 59 if (m_isInLayout) | 59 if (m_isInLayout) |
| 60 return; | 60 return; |
| 61 | 61 |
| 62 TemporaryChange<bool> inLayoutChange(m_isInLayout, true); | 62 TemporaryChange<bool> inLayoutChange(&m_isInLayout, true); |
| 63 | 63 |
| 64 LayoutSVGHiddenContainer::layout(); | 64 LayoutSVGHiddenContainer::layout(); |
| 65 | 65 |
| 66 clearInvalidationMask(); | 66 clearInvalidationMask(); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void LayoutSVGResourceContainer::willBeDestroyed() | 69 void LayoutSVGResourceContainer::willBeDestroyed() |
| 70 { | 70 { |
| 71 // Detach all clients referring to this resource. If the resource itself is | 71 // Detach all clients referring to this resource. If the resource itself is |
| 72 // a client, it will be detached from any such resources by the call to | 72 // a client, it will be detached from any such resources by the call to |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 // This will process the rest of the ancestors. | 320 // This will process the rest of the ancestors. |
| 321 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache(); | 321 toLayoutSVGResourceContainer(current)->removeAllClientsFromCache(); |
| 322 break; | 322 break; |
| 323 } | 323 } |
| 324 | 324 |
| 325 current = current->parent(); | 325 current = current->parent(); |
| 326 } | 326 } |
| 327 } | 327 } |
| 328 | 328 |
| 329 } // namespace blink | 329 } // namespace blink |
| OLD | NEW |