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 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 if (root->childNeedsDistributionRecalc()) | 1584 if (root->childNeedsDistributionRecalc()) |
1585 root->recalcDistribution(); | 1585 root->recalcDistribution(); |
1586 } | 1586 } |
1587 | 1587 |
1588 void Document::setStyleDependentState(RenderStyle* documentStyle) | 1588 void Document::setStyleDependentState(RenderStyle* documentStyle) |
1589 { | 1589 { |
1590 const Pagination& pagination = view()->pagination(); | 1590 const Pagination& pagination = view()->pagination(); |
1591 if (pagination.mode != Pagination::Unpaginated) { | 1591 if (pagination.mode != Pagination::Unpaginated) { |
1592 Pagination::setStylesForPaginationMode(pagination.mode, documentStyle); | 1592 Pagination::setStylesForPaginationMode(pagination.mode, documentStyle); |
1593 documentStyle->setColumnGap(pagination.gap); | 1593 documentStyle->setColumnGap(pagination.gap); |
1594 if (renderView()->hasColumns()) | |
1595 renderView()->updateColumnInfoFromStyle(documentStyle); | |
1596 } | 1594 } |
1597 | 1595 |
1598 FontBuilder fontBuilder; | 1596 FontBuilder fontBuilder; |
1599 fontBuilder.initForStyleResolve(*this, documentStyle, isSVGDocument()); | 1597 fontBuilder.initForStyleResolve(*this, documentStyle, isSVGDocument()); |
1600 RefPtr<CSSFontSelector> selector = m_styleEngine->fontSelector(); | 1598 RefPtr<CSSFontSelector> selector = m_styleEngine->fontSelector(); |
1601 fontBuilder.createFontForDocument(selector, documentStyle); | 1599 fontBuilder.createFontForDocument(selector, documentStyle); |
1602 } | 1600 } |
1603 | 1601 |
1604 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) | 1602 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) |
1605 { | 1603 { |
(...skipping 3713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5319 if (!page->focusController().isActive() || !page->focusController().isFocuse
d()) | 5317 if (!page->focusController().isActive() || !page->focusController().isFocuse
d()) |
5320 return false; | 5318 return false; |
5321 if (Frame* focusedFrame = page->focusController().focusedFrame()) { | 5319 if (Frame* focusedFrame = page->focusController().focusedFrame()) { |
5322 if (focusedFrame->tree().isDescendantOf(frame())) | 5320 if (focusedFrame->tree().isDescendantOf(frame())) |
5323 return true; | 5321 return true; |
5324 } | 5322 } |
5325 return false; | 5323 return false; |
5326 } | 5324 } |
5327 | 5325 |
5328 } // namespace WebCore | 5326 } // namespace WebCore |
OLD | NEW |