Chromium Code Reviews| 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 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 622 // Ensure that if the request count reaches zero, the frame loader will know about it. | 622 // Ensure that if the request count reaches zero, the frame loader will know about it. |
| 623 m_cachedResourceLoader->loadDone(0); | 623 m_cachedResourceLoader->loadDone(0); |
| 624 // New font loads may be triggered by layout after the document load is comp lete but before we have dispatched | 624 // New font loads may be triggered by layout after the document load is comp lete but before we have dispatched |
| 625 // didFinishLoading for the frame. Make sure the delegate is always dispatch ed by checking explicitly. | 625 // didFinishLoading for the frame. Make sure the delegate is always dispatch ed by checking explicitly. |
| 626 if (m_document->frame()) | 626 if (m_document->frame()) |
| 627 m_document->frame()->loader()->checkLoadComplete(); | 627 m_document->frame()->loader()->checkLoadComplete(); |
| 628 } | 628 } |
| 629 | 629 |
| 630 void CSSFontSelector::trace(Visitor* visitor) | 630 void CSSFontSelector::trace(Visitor* visitor) |
| 631 { | 631 { |
| 632 // FIXME(oilpan): visiting m_document creates a cycle through a persistent h andle because document owns StyleResolver | 632 visitor->trace(m_document); |
|
Mads Ager (chromium)
2013/12/05 12:10:01
The cycle described here no longer exists. We did
| |
| 633 // which hold CSSFontSelector via persistent handle. Once StyleResolver is m oved to the heap we should start visiting | |
| 634 // m_document again. | |
| 635 // visitor->trace(m_document); | |
| 636 visitor->trace(m_fontFaces); | 633 visitor->trace(m_fontFaces); |
| 637 visitor->trace(m_locallyInstalledFontFaces); | 634 visitor->trace(m_locallyInstalledFontFaces); |
| 638 visitor->trace(m_fonts); | 635 visitor->trace(m_fonts); |
| 639 } | 636 } |
| 640 | 637 |
| 641 } | 638 } |
| OLD | NEW |