| 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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 | 432 |
| 433 bool StyleEngine::shouldClearResolver() const | 433 bool StyleEngine::shouldClearResolver() const |
| 434 { | 434 { |
| 435 return !m_didCalculateResolver && !haveStylesheetsLoaded(); | 435 return !m_didCalculateResolver && !haveStylesheetsLoaded(); |
| 436 } | 436 } |
| 437 | 437 |
| 438 void StyleEngine::resolverChanged(StyleResolverUpdateMode mode) | 438 void StyleEngine::resolverChanged(StyleResolverUpdateMode mode) |
| 439 { | 439 { |
| 440 if (!isMaster()) { | 440 if (!isMaster()) { |
| 441 if (Document* master = this->master()) | 441 if (Document* master = this->master()) |
| 442 master->styleResolverChanged(mode); | 442 master->styleEngine().resolverChanged(mode); |
| 443 return; | 443 return; |
| 444 } | 444 } |
| 445 | 445 |
| 446 // Don't bother updating, since we haven't loaded all our style info yet | 446 // Don't bother updating, since we haven't loaded all our style info yet |
| 447 // and haven't calculated the style selector for the first time. | 447 // and haven't calculated the style selector for the first time. |
| 448 if (!document().isActive() || shouldClearResolver()) { | 448 if (!document().isActive() || shouldClearResolver()) { |
| 449 clearResolver(); | 449 clearResolver(); |
| 450 return; | 450 return; |
| 451 } | 451 } |
| 452 | 452 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 visitor->trace(m_dirtyTreeScopes); | 736 visitor->trace(m_dirtyTreeScopes); |
| 737 visitor->trace(m_activeTreeScopes); | 737 visitor->trace(m_activeTreeScopes); |
| 738 visitor->trace(m_fontSelector); | 738 visitor->trace(m_fontSelector); |
| 739 visitor->trace(m_textToSheetCache); | 739 visitor->trace(m_textToSheetCache); |
| 740 visitor->trace(m_sheetToTextCache); | 740 visitor->trace(m_sheetToTextCache); |
| 741 #endif | 741 #endif |
| 742 CSSFontSelectorClient::trace(visitor); | 742 CSSFontSelectorClient::trace(visitor); |
| 743 } | 743 } |
| 744 | 744 |
| 745 } // namespace blink | 745 } // namespace blink |
| OLD | NEW |