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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 524 { | 524 { |
| 525 // We should not recreate FontSelector. Instead, clear fontFaceCache. | 525 // We should not recreate FontSelector. Instead, clear fontFaceCache. |
| 526 if (m_fontSelector) | 526 if (m_fontSelector) |
| 527 m_fontSelector->fontFaceCache()->clear(); | 527 m_fontSelector->fontFaceCache()->clear(); |
| 528 if (m_resolver) | 528 if (m_resolver) |
| 529 m_resolver->invalidateMatchedPropertiesCache(); | 529 m_resolver->invalidateMatchedPropertiesCache(); |
| 530 } | 530 } |
| 531 | 531 |
| 532 void StyleEngine::updateGenericFontFamilySettings() | 532 void StyleEngine::updateGenericFontFamilySettings() |
| 533 { | 533 { |
| 534 if (!document().isActive() || !document().settings()) | |
|
dglazkov
2014/05/29 22:24:28
Just checking: is this a symptom of a larger probl
tasak
2014/05/30 02:12:05
As far as I investigated,
WebSettingsImpl::setSta
| |
| 535 return; | |
| 534 if (!m_fontSelector) | 536 if (!m_fontSelector) |
| 535 return; | 537 return; |
| 536 | 538 |
| 537 m_fontSelector->updateGenericFontFamilySettings(*m_document); | 539 m_fontSelector->updateGenericFontFamilySettings(*m_document); |
| 538 if (m_resolver) | 540 if (m_resolver) |
| 539 m_resolver->invalidateMatchedPropertiesCache(); | 541 m_resolver->invalidateMatchedPropertiesCache(); |
| 540 } | 542 } |
| 541 | 543 |
| 542 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember< const StyleRuleFontFace> >& fontFaceRules) | 544 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember< const StyleRuleFontFace> >& fontFaceRules) |
| 543 { | 545 { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 641 visitor->trace(m_authorStyleSheets); | 643 visitor->trace(m_authorStyleSheets); |
| 642 visitor->trace(m_documentStyleSheetCollection); | 644 visitor->trace(m_documentStyleSheetCollection); |
| 643 visitor->trace(m_styleSheetCollectionMap); | 645 visitor->trace(m_styleSheetCollectionMap); |
| 644 visitor->trace(m_resolver); | 646 visitor->trace(m_resolver); |
| 645 visitor->trace(m_fontSelector); | 647 visitor->trace(m_fontSelector); |
| 646 visitor->trace(m_textToSheetCache); | 648 visitor->trace(m_textToSheetCache); |
| 647 visitor->trace(m_sheetToTextCache); | 649 visitor->trace(m_sheetToTextCache); |
| 648 } | 650 } |
| 649 | 651 |
| 650 } | 652 } |
| OLD | NEW |