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 |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/rendering/RenderIFrame.h" | 27 #include "core/layout/LayoutIFrame.h" |
28 | 28 |
29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
30 #include "core/frame/FrameView.h" | 30 #include "core/frame/FrameView.h" |
31 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
32 #include "core/html/HTMLIFrameElement.h" | 32 #include "core/html/HTMLIFrameElement.h" |
33 #include "core/rendering/RenderView.h" | 33 #include "core/rendering/RenderView.h" |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 using namespace HTMLNames; | 37 using namespace HTMLNames; |
38 | 38 |
39 RenderIFrame::RenderIFrame(Element* element) | 39 LayoutIFrame::LayoutIFrame(Element* element) |
40 : LayoutPart(element) | 40 : LayoutPart(element) |
41 { | 41 { |
42 } | 42 } |
43 | 43 |
44 bool RenderIFrame::shouldComputeSizeAsReplaced() const | 44 bool LayoutIFrame::shouldComputeSizeAsReplaced() const |
45 { | 45 { |
46 return true; | 46 return true; |
47 } | 47 } |
48 | 48 |
49 bool RenderIFrame::isInlineBlockOrInlineTable() const | 49 bool LayoutIFrame::isInlineBlockOrInlineTable() const |
50 { | 50 { |
51 return isInline(); | 51 return isInline(); |
52 } | 52 } |
53 | 53 |
54 LayerType RenderIFrame::layerTypeRequired() const | 54 LayerType LayoutIFrame::layerTypeRequired() const |
55 { | 55 { |
56 if (style()->resize() != RESIZE_NONE) | 56 if (style()->resize() != RESIZE_NONE) |
57 return NormalLayer; | 57 return NormalLayer; |
58 return LayoutPart::layerTypeRequired(); | 58 return LayoutPart::layerTypeRequired(); |
59 } | 59 } |
60 | 60 |
61 void RenderIFrame::layout() | 61 void LayoutIFrame::layout() |
62 { | 62 { |
63 ASSERT(needsLayout()); | 63 ASSERT(needsLayout()); |
64 | 64 |
65 updateLogicalWidth(); | 65 updateLogicalWidth(); |
66 // No kids to layout as a replaced element. | 66 // No kids to layout as a replaced element. |
67 updateLogicalHeight(); | 67 updateLogicalHeight(); |
68 | 68 |
69 m_overflow.clear(); | 69 m_overflow.clear(); |
70 addVisualEffectOverflow(); | 70 addVisualEffectOverflow(); |
71 updateLayerTransformAfterLayout(); | 71 updateLayerTransformAfterLayout(); |
72 | 72 |
73 clearNeedsLayout(); | 73 clearNeedsLayout(); |
74 } | 74 } |
75 | 75 |
76 } | 76 } |
OLD | NEW |