| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 updateWidgetPosition(); // Notify the Widget of our final height. | 114 updateWidgetPosition(); // Notify the Widget of our final height. |
| 115 | 115 |
| 116 // Assert that the child document did a complete layout. | 116 // Assert that the child document did a complete layout. |
| 117 RenderView* childRoot = childFrameView ? childFrameView->frame()->contentRen
derer() : 0; | 117 RenderView* childRoot = childFrameView ? childFrameView->frame()->contentRen
derer() : 0; |
| 118 ASSERT(!childFrameView || !childFrameView->layoutPending()); | 118 ASSERT(!childFrameView || !childFrameView->layoutPending()); |
| 119 ASSERT_UNUSED(childRoot, !childRoot || !childRoot->needsLayout()); | 119 ASSERT_UNUSED(childRoot, !childRoot || !childRoot->needsLayout()); |
| 120 } | 120 } |
| 121 | 121 |
| 122 void RenderIFrame::layout() | 122 void RenderIFrame::layout() |
| 123 { | 123 { |
| 124 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 125 ASSERT(needsLayout()); | 124 ASSERT(needsLayout()); |
| 126 | 125 |
| 127 if (isSeamless()) { | 126 if (isSeamless()) { |
| 128 layoutSeamlessly(); | 127 layoutSeamlessly(); |
| 129 // Do not return so as to share the layer and overflow updates below. | 128 // Do not return so as to share the layer and overflow updates below. |
| 130 } else { | 129 } else { |
| 131 updateLogicalWidth(); | 130 updateLogicalWidth(); |
| 132 // No kids to layout as a replaced element. | 131 // No kids to layout as a replaced element. |
| 133 updateLogicalHeight(); | 132 updateLogicalHeight(); |
| 134 } | 133 } |
| 135 | 134 |
| 136 m_overflow.clear(); | 135 m_overflow.clear(); |
| 137 addVisualEffectOverflow(); | 136 addVisualEffectOverflow(); |
| 138 updateLayerTransform(); | 137 updateLayerTransform(); |
| 139 | 138 |
| 140 clearNeedsLayout(); | 139 clearNeedsLayout(); |
| 141 } | 140 } |
| 142 | 141 |
| 143 } | 142 } |
| OLD | NEW |