OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
10 * disclaimer. | 10 * disclaimer. |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 newStyle->font().update(0); | 77 newStyle->font().update(0); |
78 | 78 |
79 return newStyle.release(); | 79 return newStyle.release(); |
80 } | 80 } |
81 | 81 |
82 void RenderFlowThread::styleDidChange(StyleDifference diff, const RenderStyle* o
ldStyle) | 82 void RenderFlowThread::styleDidChange(StyleDifference diff, const RenderStyle* o
ldStyle) |
83 { | 83 { |
84 RenderBlock::styleDidChange(diff, oldStyle); | 84 RenderBlock::styleDidChange(diff, oldStyle); |
85 | 85 |
86 if (oldStyle && oldStyle->writingMode() != style()->writingMode()) | 86 if (oldStyle && oldStyle->writingMode() != style()->writingMode()) |
87 m_regionsInvalidated = true; | 87 invalidateRegions(); |
88 } | 88 } |
89 | 89 |
90 void RenderFlowThread::removeFlowChildInfo(RenderObject* child) | 90 void RenderFlowThread::removeFlowChildInfo(RenderObject* child) |
91 { | 91 { |
92 if (child->isBox()) | 92 if (child->isBox()) |
93 removeRenderBoxRegionInfo(toRenderBox(child)); | 93 removeRenderBoxRegionInfo(toRenderBox(child)); |
94 clearRenderObjectCustomStyle(child); | 94 clearRenderObjectCustomStyle(child); |
95 } | 95 } |
96 | 96 |
97 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion) | 97 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion) |
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1043 { | 1043 { |
1044 if (!m_renderFlowThread) | 1044 if (!m_renderFlowThread) |
1045 return; | 1045 return; |
1046 RenderView* view = m_renderFlowThread->view(); | 1046 RenderView* view = m_renderFlowThread->view(); |
1047 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 1047 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
1048 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 1048 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
1049 } | 1049 } |
1050 | 1050 |
1051 | 1051 |
1052 } // namespace WebCore | 1052 } // namespace WebCore |
OLD | NEW |