| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 return false; | 158 return false; |
| 159 | 159 |
| 160 return true; | 160 return true; |
| 161 } | 161 } |
| 162 | 162 |
| 163 void RenderFlowThread::repaintRectangleInRegions(const LayoutRect& repaintRect)
const | 163 void RenderFlowThread::repaintRectangleInRegions(const LayoutRect& repaintRect)
const |
| 164 { | 164 { |
| 165 if (!shouldRepaint(repaintRect) || !hasValidRegionInfo()) | 165 if (!shouldRepaint(repaintRect) || !hasValidRegionInfo()) |
| 166 return; | 166 return; |
| 167 | 167 |
| 168 ForceHorriblySlowRectMapping slowRectMapping(*this); // We can't use layout
state to repaint, since the regions are somewhere else. | |
| 169 | |
| 170 // We can't use currentFlowThread as it is possible to have interleaved flow
threads and the wrong one could be used. | 168 // We can't use currentFlowThread as it is possible to have interleaved flow
threads and the wrong one could be used. |
| 171 // Let each columnSet figure out the proper enclosing flow thread. | 169 // Let each columnSet figure out the proper enclosing flow thread. |
| 172 CurrentRenderFlowThreadDisabler disabler(view()); | 170 CurrentRenderFlowThreadDisabler disabler(view()); |
| 173 | 171 |
| 174 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be
gin(); iter != m_multiColumnSetList.end(); ++iter) { | 172 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be
gin(); iter != m_multiColumnSetList.end(); ++iter) { |
| 175 RenderMultiColumnSet* columnSet = *iter; | 173 RenderMultiColumnSet* columnSet = *iter; |
| 176 | 174 |
| 177 columnSet->repaintFlowThreadContent(repaintRect); | 175 columnSet->repaintFlowThreadContent(repaintRect); |
| 178 } | 176 } |
| 179 } | 177 } |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 { | 510 { |
| 513 if (!m_renderFlowThread) | 511 if (!m_renderFlowThread) |
| 514 return; | 512 return; |
| 515 RenderView* view = m_renderFlowThread->view(); | 513 RenderView* view = m_renderFlowThread->view(); |
| 516 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 514 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 517 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 515 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 518 } | 516 } |
| 519 | 517 |
| 520 | 518 |
| 521 } // namespace WebCore | 519 } // namespace WebCore |
| OLD | NEW |