Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: Source/core/rendering/RenderFlowThread.cpp

Issue 377123002: Revert of Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix conflict Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderInline.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
168 // We can't use currentFlowThread as it is possible to have interleaved flow threads and the wrong one could be used. 170 // We can't use currentFlowThread as it is possible to have interleaved flow threads and the wrong one could be used.
169 // Let each columnSet figure out the proper enclosing flow thread. 171 // Let each columnSet figure out the proper enclosing flow thread.
170 CurrentRenderFlowThreadDisabler disabler(view()); 172 CurrentRenderFlowThreadDisabler disabler(view());
171 173
172 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) { 174 for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) {
173 RenderMultiColumnSet* columnSet = *iter; 175 RenderMultiColumnSet* columnSet = *iter;
174 176
175 columnSet->repaintFlowThreadContent(repaintRect); 177 columnSet->repaintFlowThreadContent(repaintRect);
176 } 178 }
177 } 179 }
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 { 512 {
511 if (!m_renderFlowThread) 513 if (!m_renderFlowThread)
512 return; 514 return;
513 RenderView* view = m_renderFlowThread->view(); 515 RenderView* view = m_renderFlowThread->view();
514 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); 516 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread);
515 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); 517 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread);
516 } 518 }
517 519
518 520
519 } // namespace WebCore 521 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698