| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 | 146 |
| 147 bool RenderFlowThread::nodeAtPoint(const HitTestRequest& request, HitTestResult&
result, const HitTestLocation& locationInContainer, const LayoutPoint& accumula
tedOffset, HitTestAction hitTestAction) | 147 bool RenderFlowThread::nodeAtPoint(const HitTestRequest& request, HitTestResult&
result, const HitTestLocation& locationInContainer, const LayoutPoint& accumula
tedOffset, HitTestAction hitTestAction) |
| 148 { | 148 { |
| 149 if (hitTestAction == HitTestBlockBackground) | 149 if (hitTestAction == HitTestBlockBackground) |
| 150 return false; | 150 return false; |
| 151 return RenderBlockFlow::nodeAtPoint(request, result, locationInContainer, ac
cumulatedOffset, hitTestAction); | 151 return RenderBlockFlow::nodeAtPoint(request, result, locationInContainer, ac
cumulatedOffset, hitTestAction); |
| 152 } | 152 } |
| 153 | 153 |
| 154 bool RenderFlowThread::shouldRepaint(const LayoutRect& r) const | 154 bool RenderFlowThread::shouldIssuePaintInvalidations(const LayoutRect& r) const |
| 155 { | 155 { |
| 156 if (view()->document().printing() || r.isEmpty()) | 156 if (view()->document().printing() || r.isEmpty()) |
| 157 return false; | 157 return false; |
| 158 | 158 |
| 159 return true; | 159 return true; |
| 160 } | 160 } |
| 161 | 161 |
| 162 void RenderFlowThread::repaintRectangleInRegions(const LayoutRect& repaintRect)
const | 162 void RenderFlowThread::paintInvalidationRectangleInRegions(const LayoutRect& pai
ntInvalidationRect) const |
| 163 { | 163 { |
| 164 if (!shouldRepaint(repaintRect) || !hasValidRegionInfo()) | 164 if (!shouldIssuePaintInvalidations(paintInvalidationRect) || !hasValidRegion
Info()) |
| 165 return; | 165 return; |
| 166 | 166 |
| 167 // We can't use currentFlowThread as it is possible to have interleaved flow
threads and the wrong one could be used. | 167 // We can't use currentFlowThread as it is possible to have interleaved flow
threads and the wrong one could be used. |
| 168 // Let each columnSet figure out the proper enclosing flow thread. | 168 // Let each columnSet figure out the proper enclosing flow thread. |
| 169 CurrentRenderFlowThreadDisabler disabler(view()); | 169 CurrentRenderFlowThreadDisabler disabler(view()); |
| 170 | 170 |
| 171 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be
gin(); iter != m_multiColumnSetList.end(); ++iter) { | 171 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be
gin(); iter != m_multiColumnSetList.end(); ++iter) { |
| 172 RenderMultiColumnSet* columnSet = *iter; | 172 RenderMultiColumnSet* columnSet = *iter; |
| 173 | 173 |
| 174 columnSet->repaintFlowThreadContent(repaintRect); | 174 columnSet->paintInvalidationForFlowThreadContent(paintInvalidationRect); |
| 175 } | 175 } |
| 176 } | 176 } |
| 177 | 177 |
| 178 LayoutUnit RenderFlowThread::pageLogicalHeightForOffset(LayoutUnit offset) | 178 LayoutUnit RenderFlowThread::pageLogicalHeightForOffset(LayoutUnit offset) |
| 179 { | 179 { |
| 180 RenderMultiColumnSet* columnSet = columnSetAtBlockOffset(offset); | 180 RenderMultiColumnSet* columnSet = columnSetAtBlockOffset(offset); |
| 181 if (!columnSet) | 181 if (!columnSet) |
| 182 return 0; | 182 return 0; |
| 183 | 183 |
| 184 return columnSet->pageLogicalHeight(); | 184 return columnSet->pageLogicalHeight(); |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 { | 428 { |
| 429 if (!m_renderFlowThread) | 429 if (!m_renderFlowThread) |
| 430 return; | 430 return; |
| 431 RenderView* view = m_renderFlowThread->view(); | 431 RenderView* view = m_renderFlowThread->view(); |
| 432 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 432 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 433 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 433 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 434 } | 434 } |
| 435 | 435 |
| 436 | 436 |
| 437 } // namespace blink | 437 } // namespace blink |
| OLD | NEW |