| 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 | 394 |
| 395 void StyleEngine::createResolver() | 395 void StyleEngine::createResolver() |
| 396 { | 396 { |
| 397 TRACE_EVENT1("blink", "StyleEngine::createResolver", "frame", document().fra
me()); | 397 TRACE_EVENT1("blink", "StyleEngine::createResolver", "frame", document().fra
me()); |
| 398 // It is a programming error to attempt to resolve style on a Document | 398 // It is a programming error to attempt to resolve style on a Document |
| 399 // which is not in a frame. Code which hits this should have checked | 399 // which is not in a frame. Code which hits this should have checked |
| 400 // Document::isActive() before calling into code which could get here. | 400 // Document::isActive() before calling into code which could get here. |
| 401 | 401 |
| 402 ASSERT(document().frame()); | 402 ASSERT(document().frame()); |
| 403 | 403 |
| 404 m_resolver = adoptPtrWillBeNoop(new StyleResolver(*m_document)); | 404 m_resolver = StyleResolver::create(*m_document); |
| 405 | 405 |
| 406 // A scoped style resolver for document will be created during | 406 // A scoped style resolver for document will be created during |
| 407 // appendActiveAuthorStyleSheets if needed. | 407 // appendActiveAuthorStyleSheets if needed. |
| 408 appendActiveAuthorStyleSheets(); | 408 appendActiveAuthorStyleSheets(); |
| 409 combineCSSFeatureFlags(m_resolver->ensureUpdatedRuleFeatureSet()); | 409 combineCSSFeatureFlags(m_resolver->ensureUpdatedRuleFeatureSet()); |
| 410 } | 410 } |
| 411 | 411 |
| 412 void StyleEngine::clearResolver() | 412 void StyleEngine::clearResolver() |
| 413 { | 413 { |
| 414 ASSERT(!document().inStyleRecalc()); | 414 ASSERT(!document().inStyleRecalc()); |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 visitor->trace(m_dirtyTreeScopes); | 726 visitor->trace(m_dirtyTreeScopes); |
| 727 visitor->trace(m_activeTreeScopes); | 727 visitor->trace(m_activeTreeScopes); |
| 728 visitor->trace(m_fontSelector); | 728 visitor->trace(m_fontSelector); |
| 729 visitor->trace(m_textToSheetCache); | 729 visitor->trace(m_textToSheetCache); |
| 730 visitor->trace(m_sheetToTextCache); | 730 visitor->trace(m_sheetToTextCache); |
| 731 #endif | 731 #endif |
| 732 CSSFontSelectorClient::trace(visitor); | 732 CSSFontSelectorClient::trace(visitor); |
| 733 } | 733 } |
| 734 | 734 |
| 735 } | 735 } |
| OLD | NEW |