Chromium Code Reviews| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 | 176 |
| 177 if (!firstRegionVisited) { | 177 if (!firstRegionVisited) { |
| 178 firstRegionVisited = true; | 178 firstRegionVisited = true; |
| 179 } else { | 179 } else { |
| 180 if (m_regionsHaveUniformLogicalWidth && previousRegionLogica lWidth != regionLogicalWidth) | 180 if (m_regionsHaveUniformLogicalWidth && previousRegionLogica lWidth != regionLogicalWidth) |
| 181 m_regionsHaveUniformLogicalWidth = false; | 181 m_regionsHaveUniformLogicalWidth = false; |
| 182 if (m_regionsHaveUniformLogicalHeight && previousRegionLogic alHeight != regionLogicalHeight) | 182 if (m_regionsHaveUniformLogicalHeight && previousRegionLogic alHeight != regionLogicalHeight) |
| 183 m_regionsHaveUniformLogicalHeight = false; | 183 m_regionsHaveUniformLogicalHeight = false; |
| 184 } | 184 } |
| 185 | 185 |
| 186 previousRegionLogicalWidth = regionLogicalWidth; | 186 previousRegionLogicalWidth = regionLogicalWidth; |
|
Julien - ping for review
2014/03/26 00:13:44
This variable is never used so we should remove it
| |
| 187 previousRegionLogicalHeight = regionLogicalHeight; | |
| 187 } | 188 } |
| 188 } | 189 } |
| 189 } | 190 } |
| 190 | 191 |
| 191 updateLogicalWidth(); // Called to get the maximum logical width for the reg ion. | 192 updateLogicalWidth(); // Called to get the maximum logical width for the reg ion. |
| 192 updateRegionsFlowThreadPortionRect(); | 193 updateRegionsFlowThreadPortionRect(); |
| 193 } | 194 } |
| 194 | 195 |
| 195 void RenderFlowThread::layout() | 196 void RenderFlowThread::layout() |
| 196 { | 197 { |
| (...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1175 { | 1176 { |
| 1176 if (!m_renderFlowThread) | 1177 if (!m_renderFlowThread) |
| 1177 return; | 1178 return; |
| 1178 RenderView* view = m_renderFlowThread->view(); | 1179 RenderView* view = m_renderFlowThread->view(); |
| 1179 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); | 1180 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); |
| 1180 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); | 1181 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); |
| 1181 } | 1182 } |
| 1182 | 1183 |
| 1183 | 1184 |
| 1184 } // namespace WebCore | 1185 } // namespace WebCore |
| OLD | NEW |