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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 518 { | 518 { |
| 519 // We should not recreate FontSelector. Instead, clear fontFaceCache. | 519 // We should not recreate FontSelector. Instead, clear fontFaceCache. |
| 520 if (m_fontSelector) | 520 if (m_fontSelector) |
| 521 m_fontSelector->fontFaceCache()->clear(); | 521 m_fontSelector->fontFaceCache()->clear(); |
| 522 if (m_resolver) | 522 if (m_resolver) |
| 523 m_resolver->invalidateMatchedPropertiesCache(); | 523 m_resolver->invalidateMatchedPropertiesCache(); |
| 524 } | 524 } |
| 525 | 525 |
| 526 void StyleEngine::updateGenericFontFamilySettings() | 526 void StyleEngine::updateGenericFontFamilySettings() |
| 527 { | 527 { |
| 528 // FIXME: in-active documents should not be in any frame tree. | |
|
abarth-chromium
2014/06/06 17:02:02
That's not accurate. Documents become inactive an
tasak
2014/06/09 04:41:26
Thank you. I updated the comment.
| |
| 529 // After confirming that this condition is always true, | |
| 530 // remove the fllowing ASSERT. | |
|
abarth-chromium
2014/06/06 17:02:02
fllowing -> following
tasak
2014/06/09 04:41:26
Done.
| |
| 531 ASSERT(document().isActive()); | |
| 532 | |
| 533 // Since document::settings() can return null, need to check whether | |
| 534 // document has settings or not. crbug.com/376525 | |
|
abarth-chromium
2014/06/06 17:02:02
Please remove this comment. If settings() couldn't
tasak
2014/06/09 04:41:26
I agree that we should have automated test.
Howev
| |
| 535 if (!document().settings()) | |
| 536 return; | |
|
abarth-chromium
2014/06/06 17:05:29
Why are you checking the Settings object here? I d
tasak
2014/06/09 04:41:25
I see. I moved the check to CSSFontSelector::updat
| |
| 528 if (!m_fontSelector) | 537 if (!m_fontSelector) |
| 529 return; | 538 return; |
| 530 | 539 |
| 531 m_fontSelector->updateGenericFontFamilySettings(*m_document); | 540 m_fontSelector->updateGenericFontFamilySettings(*m_document); |
| 532 if (m_resolver) | 541 if (m_resolver) |
| 533 m_resolver->invalidateMatchedPropertiesCache(); | 542 m_resolver->invalidateMatchedPropertiesCache(); |
| 534 } | 543 } |
| 535 | 544 |
| 536 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember< const StyleRuleFontFace> >& fontFaceRules) | 545 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember< const StyleRuleFontFace> >& fontFaceRules) |
| 537 { | 546 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 646 visitor->trace(m_documentStyleSheetCollection); | 655 visitor->trace(m_documentStyleSheetCollection); |
| 647 visitor->trace(m_styleSheetCollectionMap); | 656 visitor->trace(m_styleSheetCollectionMap); |
| 648 visitor->trace(m_resolver); | 657 visitor->trace(m_resolver); |
| 649 visitor->trace(m_fontSelector); | 658 visitor->trace(m_fontSelector); |
| 650 visitor->trace(m_textToSheetCache); | 659 visitor->trace(m_textToSheetCache); |
| 651 visitor->trace(m_sheetToTextCache); | 660 visitor->trace(m_sheetToTextCache); |
| 652 CSSFontSelectorClient::trace(visitor); | 661 CSSFontSelectorClient::trace(visitor); |
| 653 } | 662 } |
| 654 | 663 |
| 655 } | 664 } |
| OLD | NEW |