| 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: we should not update generic font family settings when |
| 529 // document is inactive. |
| 530 ASSERT(document().isActive()); |
| 531 |
| 528 if (!m_fontSelector) | 532 if (!m_fontSelector) |
| 529 return; | 533 return; |
| 530 | 534 |
| 531 m_fontSelector->updateGenericFontFamilySettings(*m_document); | 535 m_fontSelector->updateGenericFontFamilySettings(*m_document); |
| 532 if (m_resolver) | 536 if (m_resolver) |
| 533 m_resolver->invalidateMatchedPropertiesCache(); | 537 m_resolver->invalidateMatchedPropertiesCache(); |
| 534 } | 538 } |
| 535 | 539 |
| 536 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<
const StyleRuleFontFace> >& fontFaceRules) | 540 void StyleEngine::removeFontFaceRules(const WillBeHeapVector<RawPtrWillBeMember<
const StyleRuleFontFace> >& fontFaceRules) |
| 537 { | 541 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 visitor->trace(m_documentStyleSheetCollection); | 650 visitor->trace(m_documentStyleSheetCollection); |
| 647 visitor->trace(m_styleSheetCollectionMap); | 651 visitor->trace(m_styleSheetCollectionMap); |
| 648 visitor->trace(m_resolver); | 652 visitor->trace(m_resolver); |
| 649 visitor->trace(m_fontSelector); | 653 visitor->trace(m_fontSelector); |
| 650 visitor->trace(m_textToSheetCache); | 654 visitor->trace(m_textToSheetCache); |
| 651 visitor->trace(m_sheetToTextCache); | 655 visitor->trace(m_sheetToTextCache); |
| 652 CSSFontSelectorClient::trace(visitor); | 656 CSSFontSelectorClient::trace(visitor); |
| 653 } | 657 } |
| 654 | 658 |
| 655 } | 659 } |
| OLD | NEW |