OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
8 * | 8 * |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 21 matching lines...) Expand all Loading... |
32 #include "core/svg/SVGDocument.h" | 32 #include "core/svg/SVGDocument.h" |
33 #include "platform/weborigin/SecurityOrigin.h" | 33 #include "platform/weborigin/SecurityOrigin.h" |
34 #include "platform/weborigin/SecurityPolicy.h" | 34 #include "platform/weborigin/SecurityPolicy.h" |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
37 | 37 |
38 HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Docum
ent& document) | 38 HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Docum
ent& document) |
39 : HTMLElement(tagName, document) | 39 : HTMLElement(tagName, document) |
40 , m_contentFrame(0) | 40 , m_contentFrame(0) |
41 , m_sandboxFlags(SandboxNone) | 41 , m_sandboxFlags(SandboxNone) |
| 42 , m_platformLayer(0) |
42 { | 43 { |
43 } | 44 } |
44 | 45 |
45 RenderPart* HTMLFrameOwnerElement::renderPart() const | 46 RenderPart* HTMLFrameOwnerElement::renderPart() const |
46 { | 47 { |
47 // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers | 48 // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers |
48 // when using fallback content. | 49 // when using fallback content. |
49 if (!renderer() || !renderer()->isRenderPart()) | 50 if (!renderer() || !renderer()->isRenderPart()) |
50 return 0; | 51 return 0; |
51 return toRenderPart(renderer()); | 52 return toRenderPart(renderer()); |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 // FIXME: In this case the Frame will have finished loading before | 168 // FIXME: In this case the Frame will have finished loading before |
168 // it's being added to the child list. It would be a good idea to | 169 // it's being added to the child list. It would be a good idea to |
169 // create the child first, then invoke the loader separately. | 170 // create the child first, then invoke the loader separately. |
170 if (childFrame->loader().state() == FrameStateComplete && !childFrame->loade
r().policyDocumentLoader()) | 171 if (childFrame->loader().state() == FrameStateComplete && !childFrame->loade
r().policyDocumentLoader()) |
171 childFrame->loader().checkCompleted(); | 172 childFrame->loader().checkCompleted(); |
172 return true; | 173 return true; |
173 } | 174 } |
174 | 175 |
175 | 176 |
176 } // namespace WebCore | 177 } // namespace WebCore |
OLD | NEW |