| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 // Ensure that if the request count reaches zero, the frame loader will know
about it. | 621 // Ensure that if the request count reaches zero, the frame loader will know
about it. |
| 622 m_cachedResourceLoader->loadDone(0); | 622 m_cachedResourceLoader->loadDone(0); |
| 623 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched | 623 // New font loads may be triggered by layout after the document load is comp
lete but before we have dispatched |
| 624 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. | 624 // didFinishLoading for the frame. Make sure the delegate is always dispatch
ed by checking explicitly. |
| 625 if (m_document->frame()) | 625 if (m_document->frame()) |
| 626 m_document->frame()->loader()->checkLoadComplete(); | 626 m_document->frame()->loader()->checkLoadComplete(); |
| 627 } | 627 } |
| 628 | 628 |
| 629 void CSSFontSelector::trace(Visitor* visitor) | 629 void CSSFontSelector::trace(Visitor* visitor) |
| 630 { | 630 { |
| 631 // FIXME(oilpan): visiting m_document creates a cycle through a persistent h
andle because document owns StyleResolver | 631 visitor->trace(m_document); |
| 632 // which hold CSSFontSelector via persistent handle. Once StyleResolver is m
oved to the heap we should start visiting | |
| 633 // m_document again. | |
| 634 // visitor->trace(m_document); | |
| 635 visitor->trace(m_fontFaces); | 632 visitor->trace(m_fontFaces); |
| 636 visitor->trace(m_locallyInstalledFontFaces); | 633 visitor->trace(m_locallyInstalledFontFaces); |
| 637 visitor->trace(m_fonts); | 634 visitor->trace(m_fonts); |
| 638 } | 635 } |
| 639 | 636 |
| 640 } | 637 } |
| OLD | NEW |