| 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 28 matching lines...) Expand all Loading... |
| 39 return isInline(); | 39 return isInline(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 PaintLayerType LayoutIFrame::layerTypeRequired() const { | 42 PaintLayerType LayoutIFrame::layerTypeRequired() const { |
| 43 if (style()->resize() != RESIZE_NONE) | 43 if (style()->resize() != RESIZE_NONE) |
| 44 return NormalPaintLayer; | 44 return NormalPaintLayer; |
| 45 return LayoutPart::layerTypeRequired(); | 45 return LayoutPart::layerTypeRequired(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void LayoutIFrame::layout() { | 48 void LayoutIFrame::layout() { |
| 49 ASSERT(needsLayout()); | 49 DCHECK(needsLayout()); |
| 50 LayoutAnalyzer::Scope analyzer(*this); | 50 LayoutAnalyzer::Scope analyzer(*this); |
| 51 | 51 |
| 52 updateLogicalWidth(); | 52 updateLogicalWidth(); |
| 53 // No kids to layout as a replaced element. | 53 // No kids to layout as a replaced element. |
| 54 updateLogicalHeight(); | 54 updateLogicalHeight(); |
| 55 | 55 |
| 56 m_overflow.reset(); | 56 m_overflow.reset(); |
| 57 addVisualEffectOverflow(); | 57 addVisualEffectOverflow(); |
| 58 updateLayerTransformAfterLayout(); | 58 updateLayerTransformAfterLayout(); |
| 59 | 59 |
| 60 clearNeedsLayout(); | 60 clearNeedsLayout(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace blink | 63 } // namespace blink |
| OLD | NEW |