| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Apple Inc.  All rights reserved. | 2  * Copyright (C) 2012 Apple Inc.  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  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58 | 58 | 
| 59     RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(par
     ent()); } | 59     RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(par
     ent()); } | 
| 60     RenderMultiColumnFlowThread* multiColumnFlowThread() const | 60     RenderMultiColumnFlowThread* multiColumnFlowThread() const | 
| 61     { | 61     { | 
| 62         ASSERT_WITH_SECURITY_IMPLICATION(!flowThread() || flowThread()->isRender
     MultiColumnFlowThread()); | 62         ASSERT_WITH_SECURITY_IMPLICATION(!flowThread() || flowThread()->isRender
     MultiColumnFlowThread()); | 
| 63         return static_cast<RenderMultiColumnFlowThread*>(flowThread()); | 63         return static_cast<RenderMultiColumnFlowThread*>(flowThread()); | 
| 64     } | 64     } | 
| 65 | 65 | 
| 66     RenderMultiColumnSet* nextSiblingMultiColumnSet() const; | 66     RenderMultiColumnSet* nextSiblingMultiColumnSet() const; | 
| 67 | 67 | 
|  | 68     LayoutUnit logicalBottomInFlowThread() const { return isHorizontalWritingMod
     e() ? flowThreadPortionRect().maxY() : flowThreadPortionRect().maxX(); } | 
|  | 69 | 
| 68     unsigned computedColumnCount() const { return m_computedColumnCount; } | 70     unsigned computedColumnCount() const { return m_computedColumnCount; } | 
| 69     LayoutUnit computedColumnWidth() const { return m_computedColumnWidth; } | 71     LayoutUnit computedColumnWidth() const { return m_computedColumnWidth; } | 
| 70     LayoutUnit computedColumnHeight() const { return m_computedColumnHeight; } | 72     LayoutUnit computedColumnHeight() const { return m_computedColumnHeight; } | 
| 71 | 73 | 
| 72     void setComputedColumnWidthAndCount(LayoutUnit width, unsigned count) | 74     void setComputedColumnWidthAndCount(LayoutUnit width, unsigned count) | 
| 73     { | 75     { | 
| 74         m_computedColumnWidth = width; | 76         m_computedColumnWidth = width; | 
| 75         m_computedColumnCount = count; | 77         m_computedColumnCount = count; | 
| 76     } | 78     } | 
| 77 | 79 | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 192     }; | 194     }; | 
| 193     Vector<ContentRun, 1> m_contentRuns; | 195     Vector<ContentRun, 1> m_contentRuns; | 
| 194 }; | 196 }; | 
| 195 | 197 | 
| 196 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet()); | 198 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet()); | 
| 197 | 199 | 
| 198 } // namespace WebCore | 200 } // namespace WebCore | 
| 199 | 201 | 
| 200 #endif // RenderMultiColumnSet_h | 202 #endif // RenderMultiColumnSet_h | 
| 201 | 203 | 
| OLD | NEW | 
|---|