| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 { | 60 { |
| 61 RefPtr<RenderStyle> newStyle(RenderStyle::create()); | 61 RefPtr<RenderStyle> newStyle(RenderStyle::create()); |
| 62 newStyle->inheritFrom(parentStyle); | 62 newStyle->inheritFrom(parentStyle); |
| 63 newStyle->setDisplay(BLOCK); | 63 newStyle->setDisplay(BLOCK); |
| 64 newStyle->setPosition(AbsolutePosition); | 64 newStyle->setPosition(AbsolutePosition); |
| 65 newStyle->setZIndex(0); | 65 newStyle->setZIndex(0); |
| 66 newStyle->setLeft(Length(0, Fixed)); | 66 newStyle->setLeft(Length(0, Fixed)); |
| 67 newStyle->setTop(Length(0, Fixed)); | 67 newStyle->setTop(Length(0, Fixed)); |
| 68 newStyle->setWidth(Length(100, Percent)); | 68 newStyle->setWidth(Length(100, Percent)); |
| 69 newStyle->setHeight(Length(100, Percent)); | 69 newStyle->setHeight(Length(100, Percent)); |
| 70 newStyle->font().update(0); | 70 newStyle->font().update(nullptr); |
| 71 | 71 |
| 72 return newStyle.release(); | 72 return newStyle.release(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion) | 75 void RenderFlowThread::addRegionToThread(RenderRegion* renderRegion) |
| 76 { | 76 { |
| 77 ASSERT(renderRegion); | 77 ASSERT(renderRegion); |
| 78 m_regionList.add(renderRegion); | 78 m_regionList.add(renderRegion); |
| 79 renderRegion->setIsValid(true); | 79 renderRegion->setIsValid(true); |
| 80 } | 80 } |
| (...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 { | 670 { |
| 671 if (!m_renderFlowThread) | 671 if (!m_renderFlowThread) |
| 672 return; | 672 return; |
| 673 RenderView* view = m_renderFlowThread->view(); | 673 RenderView* view = m_renderFlowThread->view(); |
| 674 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); | 674 ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFl
owThread); |
| 675 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); | 675 view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlo
wThread); |
| 676 } | 676 } |
| 677 | 677 |
| 678 | 678 |
| 679 } // namespace WebCore | 679 } // namespace WebCore |
| OLD | NEW |