| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return true; | 46 return true; |
| 47 } | 47 } |
| 48 | 48 |
| 49 bool RenderIFrame::isInlineBlockOrInlineTable() const | 49 bool RenderIFrame::isInlineBlockOrInlineTable() const |
| 50 { | 50 { |
| 51 return isInline(); | 51 return isInline(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 LayerType RenderIFrame::layerTypeRequired() const | 54 LayerType RenderIFrame::layerTypeRequired() const |
| 55 { | 55 { |
| 56 LayerType type = RenderPart::layerTypeRequired(); | |
| 57 if (type != NoLayer) | |
| 58 return type; | |
| 59 | |
| 60 if (style()->resize() != RESIZE_NONE) | 56 if (style()->resize() != RESIZE_NONE) |
| 61 return NormalLayer; | 57 return NormalLayer; |
| 62 | 58 return RenderPart::layerTypeRequired(); |
| 63 return ForcedLayer; | |
| 64 } | 59 } |
| 65 | 60 |
| 66 void RenderIFrame::layout() | 61 void RenderIFrame::layout() |
| 67 { | 62 { |
| 68 ASSERT(needsLayout()); | 63 ASSERT(needsLayout()); |
| 69 | 64 |
| 70 updateLogicalWidth(); | 65 updateLogicalWidth(); |
| 71 // No kids to layout as a replaced element. | 66 // No kids to layout as a replaced element. |
| 72 updateLogicalHeight(); | 67 updateLogicalHeight(); |
| 73 | 68 |
| 74 m_overflow.clear(); | 69 m_overflow.clear(); |
| 75 addVisualEffectOverflow(); | 70 addVisualEffectOverflow(); |
| 76 updateLayerTransform(); | 71 updateLayerTransform(); |
| 77 | 72 |
| 78 clearNeedsLayout(); | 73 clearNeedsLayout(); |
| 79 } | 74 } |
| 80 | 75 |
| 81 } | 76 } |
| OLD | NEW |