OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
963 style->setUnique(); | 963 style->setUnique(); |
964 | 964 |
965 switch (relayoutBehavior) { | 965 switch (relayoutBehavior) { |
966 case AlreadyInLayout: | 966 case AlreadyInLayout: |
967 // Don't free currentStyle until the end of the layout pass. This allows
other parts of the system | 967 // Don't free currentStyle until the end of the layout pass. This allows
other parts of the system |
968 // to safely hold raw RenderStyle* pointers during layout, e.g. Breaking
Context::m_currentStyle. | 968 // to safely hold raw RenderStyle* pointers during layout, e.g. Breaking
Context::m_currentStyle. |
969 m_stylesRetainedDuringLayout.append(currentStyle); | 969 m_stylesRetainedDuringLayout.append(currentStyle); |
970 | 970 |
971 renderer->setStyleInternal(style.release()); | 971 renderer->setStyleInternal(style.release()); |
972 renderer->setNeedsLayoutAndFullPaintInvalidation(); | 972 renderer->setNeedsLayoutAndFullPaintInvalidation(); |
973 if (renderer->isRenderBlock()) | |
974 toRenderBlock(renderer)->invalidateLineHeight(); | |
975 break; | 973 break; |
976 | 974 |
977 case LayoutNeeded: | 975 case LayoutNeeded: |
978 renderer->setStyle(style.release()); | 976 renderer->setStyle(style.release()); |
979 break; | 977 break; |
980 } | 978 } |
981 | 979 |
982 if (multiplier != 1) | 980 if (multiplier != 1) |
983 m_pageInfo.m_hasAutosized = true; | 981 m_pageInfo.m_hasAutosized = true; |
984 } | 982 } |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1127 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo() | 1125 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo() |
1128 { | 1126 { |
1129 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto
sizer()) { | 1127 if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAuto
sizer()) { |
1130 ASSERT(textAutosizer->m_updatePageInfoDeferred); | 1128 ASSERT(textAutosizer->m_updatePageInfoDeferred); |
1131 textAutosizer->m_updatePageInfoDeferred = false; | 1129 textAutosizer->m_updatePageInfoDeferred = false; |
1132 textAutosizer->updatePageInfoInAllFrames(); | 1130 textAutosizer->updatePageInfoInAllFrames(); |
1133 } | 1131 } |
1134 } | 1132 } |
1135 | 1133 |
1136 } // namespace WebCore | 1134 } // namespace WebCore |
OLD | NEW |