| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
| 5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * Copyright (C) 2009 Ericsson AB. All rights reserved. | 7 * Copyright (C) 2009 Ericsson AB. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 frameOwnerPropertiesChanged(); | 139 frameOwnerPropertiesChanged(); |
| 140 } else { | 140 } else { |
| 141 if (name == srcAttr) | 141 if (name == srcAttr) |
| 142 logUpdateAttributeIfIsolatedWorldAndInDocument("iframe", srcAttr, | 142 logUpdateAttributeIfIsolatedWorldAndInDocument("iframe", srcAttr, |
| 143 oldValue, value); | 143 oldValue, value); |
| 144 HTMLFrameElementBase::parseAttribute(name, oldValue, value); | 144 HTMLFrameElementBase::parseAttribute(name, oldValue, value); |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 bool HTMLIFrameElement::layoutObjectIsNeeded(const ComputedStyle& style) { | 148 bool HTMLIFrameElement::layoutObjectIsNeeded(const ComputedStyle& style) { |
| 149 return isURLAllowed() && HTMLElement::layoutObjectIsNeeded(style); | 149 return contentFrame() && HTMLElement::layoutObjectIsNeeded(style); |
| 150 } | 150 } |
| 151 | 151 |
| 152 LayoutObject* HTMLIFrameElement::createLayoutObject(const ComputedStyle&) { | 152 LayoutObject* HTMLIFrameElement::createLayoutObject(const ComputedStyle&) { |
| 153 return new LayoutIFrame(this); | 153 return new LayoutIFrame(this); |
| 154 } | 154 } |
| 155 | 155 |
| 156 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto( | 156 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto( |
| 157 ContainerNode* insertionPoint) { | 157 ContainerNode* insertionPoint) { |
| 158 InsertionNotificationRequest result = | 158 InsertionNotificationRequest result = |
| 159 HTMLFrameElementBase::insertedInto(insertionPoint); | 159 HTMLFrameElementBase::insertedInto(insertionPoint); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 bool HTMLIFrameElement::initializePermissionsAttribute() { | 207 bool HTMLIFrameElement::initializePermissionsAttribute() { |
| 208 if (!RuntimeEnabledFeatures::permissionDelegationEnabled()) | 208 if (!RuntimeEnabledFeatures::permissionDelegationEnabled()) |
| 209 return false; | 209 return false; |
| 210 | 210 |
| 211 if (!m_permissions) | 211 if (!m_permissions) |
| 212 m_permissions = HTMLIFrameElementPermissions::create(this); | 212 m_permissions = HTMLIFrameElementPermissions::create(this); |
| 213 return true; | 213 return true; |
| 214 } | 214 } |
| 215 | 215 |
| 216 } // namespace blink | 216 } // namespace blink |
| OLD | NEW |