Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. |
| 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) |
| 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 420 // removes treescopes which are being destroyed from activeTreeScopes. | 420 // removes treescopes which are being destroyed from activeTreeScopes. |
| 421 // So we need to clearScopedStyleResolver for treescopes which have been | 421 // So we need to clearScopedStyleResolver for treescopes which have been |
| 422 // just removed from document. If document is destroyed before invoking | 422 // just removed from document. If document is destroyed before invoking |
| 423 // updateActiveStyleSheets, the treescope has a scopedStyleResolver which | 423 // updateActiveStyleSheets, the treescope has a scopedStyleResolver which |
| 424 // has destroyed StyleSheetContents. | 424 // has destroyed StyleSheetContents. |
| 425 for (TreeScope* treeScope : m_activeTreeScopes) | 425 for (TreeScope* treeScope : m_activeTreeScopes) |
| 426 treeScope->clearScopedStyleResolver(); | 426 treeScope->clearScopedStyleResolver(); |
| 427 | 427 |
| 428 if (m_resolver) { | 428 if (m_resolver) { |
| 429 TRACE_EVENT1("blink", "StyleEngine::clearResolver", "frame", document(). frame()); | 429 TRACE_EVENT1("blink", "StyleEngine::clearResolver", "frame", document(). frame()); |
| 430 #if ENABLE(OILPAN) | |
|
haraken
2015/10/08 06:15:46
Add a comment about why we need to call dispose ex
| |
| 431 m_resolver->dispose(); | |
| 432 #endif | |
| 430 m_resolver.clear(); | 433 m_resolver.clear(); |
| 431 } | 434 } |
| 432 } | 435 } |
| 433 | 436 |
| 434 void StyleEngine::clearMasterResolver() | 437 void StyleEngine::clearMasterResolver() |
| 435 { | 438 { |
| 436 if (Document* master = this->master()) | 439 if (Document* master = this->master()) |
| 437 master->styleEngine().clearResolver(); | 440 master->styleEngine().clearResolver(); |
| 438 } | 441 } |
| 439 | 442 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 726 visitor->trace(m_dirtyTreeScopes); | 729 visitor->trace(m_dirtyTreeScopes); |
| 727 visitor->trace(m_activeTreeScopes); | 730 visitor->trace(m_activeTreeScopes); |
| 728 visitor->trace(m_fontSelector); | 731 visitor->trace(m_fontSelector); |
| 729 visitor->trace(m_textToSheetCache); | 732 visitor->trace(m_textToSheetCache); |
| 730 visitor->trace(m_sheetToTextCache); | 733 visitor->trace(m_sheetToTextCache); |
| 731 #endif | 734 #endif |
| 732 CSSFontSelectorClient::trace(visitor); | 735 CSSFontSelectorClient::trace(visitor); |
| 733 } | 736 } |
| 734 | 737 |
| 735 } | 738 } |
| OLD | NEW |