| 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 bool StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) | 358 bool StyleEngine::updateActiveStyleSheets(StyleResolverUpdateMode updateMode) |
| 359 { | 359 { |
| 360 if (m_document.inStyleRecalc()) { | 360 if (m_document.inStyleRecalc()) { |
| 361 // SVG <use> element may manage to invalidate style selector in the midd
le of a style recalc. | 361 // SVG <use> element may manage to invalidate style selector in the midd
le of a style recalc. |
| 362 // https://bugs.webkit.org/show_bug.cgi?id=54344 | 362 // https://bugs.webkit.org/show_bug.cgi?id=54344 |
| 363 // FIXME: This should be fixed in SVG and the call site replaced by ASSE
RT(!m_inStyleRecalc). | 363 // FIXME: This should be fixed in SVG and the call site replaced by ASSE
RT(!m_inStyleRecalc). |
| 364 m_needsUpdateActiveStylesheetsOnStyleRecalc = true; | 364 m_needsUpdateActiveStylesheetsOnStyleRecalc = true; |
| 365 return false; | 365 return false; |
| 366 | 366 |
| 367 } | 367 } |
| 368 if (!m_document.renderer() || !m_document.attached()) | 368 if (!m_document.renderer() || !m_document.confusingAndOftenMisusedAttached()
) |
| 369 return false; | 369 return false; |
| 370 | 370 |
| 371 bool requiresFullStyleRecalc = false; | 371 bool requiresFullStyleRecalc = false; |
| 372 if (m_needsDocumentStyleSheetsUpdate || updateMode == FullStyleUpdate) | 372 if (m_needsDocumentStyleSheetsUpdate || updateMode == FullStyleUpdate) |
| 373 requiresFullStyleRecalc = m_documentStyleSheetCollection.updateActiveSty
leSheets(this, updateMode); | 373 requiresFullStyleRecalc = m_documentStyleSheetCollection.updateActiveSty
leSheets(this, updateMode); |
| 374 | 374 |
| 375 if (shouldUpdateShadowTreeStyleSheetCollection(updateMode)) { | 375 if (shouldUpdateShadowTreeStyleSheetCollection(updateMode)) { |
| 376 TreeScopeSet treeScopes = updateMode == FullStyleUpdate ? m_activeTreeSc
opes : m_dirtyTreeScopes; | 376 TreeScopeSet treeScopes = updateMode == FullStyleUpdate ? m_activeTreeSc
opes : m_dirtyTreeScopes; |
| 377 HashSet<TreeScope*> treeScopesRemoved; | 377 HashSet<TreeScope*> treeScopesRemoved; |
| 378 | 378 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 if (StyleSheetCollection* collection = m_styleSheetCollectionMap.get(*it
)) { | 449 if (StyleSheetCollection* collection = m_styleSheetCollectionMap.get(*it
)) { |
| 450 styleResolver->setBuildScopedStyleTreeInDocumentOrder(!collection->s
copingNodesForStyleScoped()); | 450 styleResolver->setBuildScopedStyleTreeInDocumentOrder(!collection->s
copingNodesForStyleScoped()); |
| 451 styleResolver->appendAuthorStyleSheets(0, collection->activeAuthorSt
yleSheets()); | 451 styleResolver->appendAuthorStyleSheets(0, collection->activeAuthorSt
yleSheets()); |
| 452 } | 452 } |
| 453 } | 453 } |
| 454 styleResolver->finishAppendAuthorStyleSheets(); | 454 styleResolver->finishAppendAuthorStyleSheets(); |
| 455 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); | 455 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); |
| 456 } | 456 } |
| 457 | 457 |
| 458 } | 458 } |
| OLD | NEW |