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 Apple Inc. All rights
reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights
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 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 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 * | 10 * |
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1557 } | 1557 } |
1558 | 1558 |
1559 for (Node* n = firstChild(); n; n = n->nextSibling()) { | 1559 for (Node* n = firstChild(); n; n = n->nextSibling()) { |
1560 if (!n->isElementNode()) | 1560 if (!n->isElementNode()) |
1561 continue; | 1561 continue; |
1562 Element* element = static_cast<Element*>(n); | 1562 Element* element = static_cast<Element*>(n); |
1563 if (change >= Inherit || element->childNeedsStyleRecalc() || element->ne
edsStyleRecalc()) | 1563 if (change >= Inherit || element->childNeedsStyleRecalc() || element->ne
edsStyleRecalc()) |
1564 element->recalcStyle(change); | 1564 element->recalcStyle(change); |
1565 } | 1565 } |
1566 | 1566 |
| 1567 // FIXME: Disabling the deletion of retired custom font data until |
| 1568 // we fix all the stale style bugs (68804, 68624, etc). These bugs |
| 1569 // indicate problems where some styles were not updated in recalcStyle, |
| 1570 // thereby retaining stale copy of font data. To prevent that, we |
| 1571 // disable this code for now and only delete retired custom font data |
| 1572 // in Document destructor. |
1567 // Now that all RenderStyles that pointed to retired fonts have been updated
, the fonts can safely be deleted. | 1573 // Now that all RenderStyles that pointed to retired fonts have been updated
, the fonts can safely be deleted. |
1568 deleteRetiredCustomFonts(); | 1574 // deleteRetiredCustomFonts(); |
1569 | 1575 |
1570 #if USE(ACCELERATED_COMPOSITING) | 1576 #if USE(ACCELERATED_COMPOSITING) |
1571 if (view()) { | 1577 if (view()) { |
1572 bool layoutPending = view()->layoutPending() || renderer()->needsLayout(
); | 1578 bool layoutPending = view()->layoutPending() || renderer()->needsLayout(
); |
1573 // If we didn't update compositing layers because of layout(), we need t
o do so here. | 1579 // If we didn't update compositing layers because of layout(), we need t
o do so here. |
1574 if (!layoutPending) | 1580 if (!layoutPending) |
1575 view()->updateCompositingLayers(); | 1581 view()->updateCompositingLayers(); |
1576 } | 1582 } |
1577 #endif | 1583 #endif |
1578 | 1584 |
(...skipping 3583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5162 if (!loader) | 5168 if (!loader) |
5163 return 0; | 5169 return 0; |
5164 | 5170 |
5165 if (m_frame->document() != this) | 5171 if (m_frame->document() != this) |
5166 return 0; | 5172 return 0; |
5167 | 5173 |
5168 return loader; | 5174 return loader; |
5169 } | 5175 } |
5170 | 5176 |
5171 } // namespace WebCore | 5177 } // namespace WebCore |
OLD | NEW |