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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
361 } | 361 } |
362 currentBlock->flipForWritingMode(blockRect); | 362 currentBlock->flipForWritingMode(blockRect); |
363 } | 363 } |
364 blockRect.moveBy(currentBlockLocation); | 364 blockRect.moveBy(currentBlockLocation); |
365 currentBlock = containerBlock; | 365 currentBlock = containerBlock; |
366 } | 366 } |
367 | 367 |
368 return currentBlock->isHorizontalWritingMode() ? blockRect.y() : blockRect.x (); | 368 return currentBlock->isHorizontalWritingMode() ? blockRect.y() : blockRect.x (); |
369 } | 369 } |
370 | 370 |
371 void RenderFlowThread::RegionSearchAdapter::collectIfNeeded(const MultiColumnSet Interval& interval) | |
mstensho (USE GERRIT)
2014/10/01 22:21:37
See issue that I raised in the .h file. We're goin
| |
372 { | |
373 if (m_result) | |
374 return; | |
375 if (interval.low() <= m_offset && interval.high() > m_offset) | |
376 m_result = interval.data(); | |
377 } | |
378 | |
379 CurrentRenderFlowThreadMaintainer::CurrentRenderFlowThreadMaintainer(RenderFlowT hread* renderFlowThread) | 371 CurrentRenderFlowThreadMaintainer::CurrentRenderFlowThreadMaintainer(RenderFlowT hread* renderFlowThread) |
380 : m_renderFlowThread(renderFlowThread) | 372 : m_renderFlowThread(renderFlowThread) |
381 , m_previousRenderFlowThread(0) | 373 , m_previousRenderFlowThread(0) |
382 { | 374 { |
383 if (!m_renderFlowThread) | 375 if (!m_renderFlowThread) |
384 return; | 376 return; |
385 RenderView* view = m_renderFlowThread->view(); | 377 RenderView* view = m_renderFlowThread->view(); |
386 m_previousRenderFlowThread = view->flowThreadController()->currentRenderFlow Thread(); | 378 m_previousRenderFlowThread = view->flowThreadController()->currentRenderFlow Thread(); |
387 view->flowThreadController()->setCurrentRenderFlowThread(m_renderFlowThread) ; | 379 view->flowThreadController()->setCurrentRenderFlowThread(m_renderFlowThread) ; |
388 } | 380 } |
389 | 381 |
390 CurrentRenderFlowThreadMaintainer::~CurrentRenderFlowThreadMaintainer() | 382 CurrentRenderFlowThreadMaintainer::~CurrentRenderFlowThreadMaintainer() |
391 { | 383 { |
392 if (!m_renderFlowThread) | 384 if (!m_renderFlowThread) |
393 return; | 385 return; |
394 RenderView* view = m_renderFlowThread->view(); | 386 RenderView* view = m_renderFlowThread->view(); |
395 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); | 387 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl owThread); |
396 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); | 388 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo wThread); |
397 } | 389 } |
398 | 390 |
399 | 391 |
400 } // namespace blink | 392 } // namespace blink |
OLD | NEW |