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

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

Issue 584033002: [New Multicolumn] Add support for column-span:all (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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
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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 } 398 }
399 currentBlock->flipForWritingMode(blockRect); 399 currentBlock->flipForWritingMode(blockRect);
400 } 400 }
401 blockRect.moveBy(currentBlockLocation); 401 blockRect.moveBy(currentBlockLocation);
402 currentBlock = containerBlock; 402 currentBlock = containerBlock;
403 } 403 }
404 404
405 return currentBlock->isHorizontalWritingMode() ? blockRect.y() : blockRect.x (); 405 return currentBlock->isHorizontalWritingMode() ? blockRect.y() : blockRect.x ();
406 } 406 }
407 407
408 void RenderFlowThread::RegionSearchAdapter::collectIfNeeded(const MultiColumnSet Interval& interval) 408 void RenderFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval)
409 { 409 {
410 if (m_result) 410 if (m_result)
411 return; 411 return;
412 if (interval.low() <= m_offset && interval.high() > m_offset) 412 if (interval.low() <= m_offset && interval.high() > m_offset)
413 m_result = interval.data(); 413 m_result = interval.data();
414 } 414 }
415 415
416 CurrentRenderFlowThreadMaintainer::CurrentRenderFlowThreadMaintainer(RenderFlowT hread* renderFlowThread) 416 CurrentRenderFlowThreadMaintainer::CurrentRenderFlowThreadMaintainer(RenderFlowT hread* renderFlowThread)
417 : m_renderFlowThread(renderFlowThread) 417 : m_renderFlowThread(renderFlowThread)
418 , m_previousRenderFlowThread(0) 418 , m_previousRenderFlowThread(0)
419 { 419 {
420 if (!m_renderFlowThread) 420 if (!m_renderFlowThread)
421 return; 421 return;
422 RenderView* view = m_renderFlowThread->view(); 422 RenderView* view = m_renderFlowThread->view();
423 m_previousRenderFlowThread = view->flowThreadController()->currentRenderFlow Thread(); 423 m_previousRenderFlowThread = view->flowThreadController()->currentRenderFlow Thread();
424 view->flowThreadController()->setCurrentRenderFlowThread(m_renderFlowThread) ; 424 view->flowThreadController()->setCurrentRenderFlowThread(m_renderFlowThread) ;
425 } 425 }
426 426
427 CurrentRenderFlowThreadMaintainer::~CurrentRenderFlowThreadMaintainer() 427 CurrentRenderFlowThreadMaintainer::~CurrentRenderFlowThreadMaintainer()
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698