| 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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 | 479 |
| 480 m_resolver = adoptPtrWillBeNoop(new StyleResolver(*m_document)); | 480 m_resolver = adoptPtrWillBeNoop(new StyleResolver(*m_document)); |
| 481 appendActiveAuthorStyleSheets(); | 481 appendActiveAuthorStyleSheets(); |
| 482 combineCSSFeatureFlags(m_resolver->ensureUpdatedRuleFeatureSet()); | 482 combineCSSFeatureFlags(m_resolver->ensureUpdatedRuleFeatureSet()); |
| 483 } | 483 } |
| 484 | 484 |
| 485 void StyleEngine::clearResolver() | 485 void StyleEngine::clearResolver() |
| 486 { | 486 { |
| 487 ASSERT(!document().inStyleRecalc()); | 487 ASSERT(!document().inStyleRecalc()); |
| 488 ASSERT(isMaster() || !m_resolver); | 488 ASSERT(isMaster() || !m_resolver); |
| 489 |
| 490 m_document->clearScopedStyleResolver(); |
| 491 for (StyleSheetCollectionMap::iterator it = m_styleSheetCollectionMap.begin(
); it != m_styleSheetCollectionMap.end(); ++it) |
| 492 it->key->clearScopedStyleResolver(); |
| 493 |
| 489 if (m_resolver) | 494 if (m_resolver) |
| 490 document().updateStyleInvalidationIfNeeded(); | 495 document().updateStyleInvalidationIfNeeded(); |
| 491 m_resolver.clear(); | 496 m_resolver.clear(); |
| 492 } | 497 } |
| 493 | 498 |
| 494 void StyleEngine::clearMasterResolver() | 499 void StyleEngine::clearMasterResolver() |
| 495 { | 500 { |
| 496 if (Document* master = this->master()) | 501 if (Document* master = this->master()) |
| 497 master->styleEngine()->clearResolver(); | 502 master->styleEngine()->clearResolver(); |
| 498 } | 503 } |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 visitor->trace(m_resolver); | 690 visitor->trace(m_resolver); |
| 686 visitor->trace(m_fontSelector); | 691 visitor->trace(m_fontSelector); |
| 687 visitor->trace(m_textToSheetCache); | 692 visitor->trace(m_textToSheetCache); |
| 688 visitor->trace(m_sheetToTextCache); | 693 visitor->trace(m_sheetToTextCache); |
| 689 visitor->trace(m_xslStyleSheet); | 694 visitor->trace(m_xslStyleSheet); |
| 690 #endif | 695 #endif |
| 691 CSSFontSelectorClient::trace(visitor); | 696 CSSFontSelectorClient::trace(visitor); |
| 692 } | 697 } |
| 693 | 698 |
| 694 } | 699 } |
| OLD | NEW |