| 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 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
| 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights |
| 6 * reserved. |
| 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 7 * | 8 * |
| 8 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 11 * License as published by the Free Software Foundation; either |
| 11 * version 2 of the License, or (at your option) any later version. | 12 * version 2 of the License, or (at your option) any later version. |
| 12 * | 13 * |
| 13 * This library is distributed in the hope that it will be useful, | 14 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 size_t pos = m_serviceType.find(";"); | 100 size_t pos = m_serviceType.find(";"); |
| 100 if (pos != kNotFound) | 101 if (pos != kNotFound) |
| 101 m_serviceType = m_serviceType.left(pos); | 102 m_serviceType = m_serviceType.left(pos); |
| 102 if (layoutObject()) { | 103 if (layoutObject()) { |
| 103 setNeedsWidgetUpdate(true); | 104 setNeedsWidgetUpdate(true); |
| 104 layoutObject()->setNeedsLayoutAndFullPaintInvalidation( | 105 layoutObject()->setNeedsLayoutAndFullPaintInvalidation( |
| 105 "Embed type changed"); | 106 "Embed type changed"); |
| 106 } else { | 107 } else { |
| 107 requestPluginCreationWithoutLayoutObjectIfPossible(); | 108 requestPluginCreationWithoutLayoutObjectIfPossible(); |
| 108 } | 109 } |
| 109 } else if ( | 110 } else if (name == codeAttr) { |
| 110 name == | 111 // TODO(schenney): Remove this branch? It's not in the spec and we're not in
the |
| 111 codeAttr) { // TODO(schenney): Remove this? It's not in the spec and we'r
e not in the HTMLAppletElement hierarchy | 112 // HTMLAppletElement hierarchy. |
| 112 m_url = stripLeadingAndTrailingHTMLSpaces(value); | 113 m_url = stripLeadingAndTrailingHTMLSpaces(value); |
| 113 } else if (name == srcAttr) { | 114 } else if (name == srcAttr) { |
| 114 m_url = stripLeadingAndTrailingHTMLSpaces(value); | 115 m_url = stripLeadingAndTrailingHTMLSpaces(value); |
| 115 if (layoutObject() && isImageType()) { | 116 if (layoutObject() && isImageType()) { |
| 116 if (!m_imageLoader) | 117 if (!m_imageLoader) |
| 117 m_imageLoader = HTMLImageLoader::create(this); | 118 m_imageLoader = HTMLImageLoader::create(this); |
| 118 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousError); | 119 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousError); |
| 119 } | 120 } |
| 120 } else { | 121 } else { |
| 121 HTMLPlugInElement::parseAttribute(name, oldValue, value); | 122 HTMLPlugInElement::parseAttribute(name, oldValue, value); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 144 // Note these pass m_url and m_serviceType to allow better code sharing with | 145 // Note these pass m_url and m_serviceType to allow better code sharing with |
| 145 // <object> which modifies url and serviceType before calling these. | 146 // <object> which modifies url and serviceType before calling these. |
| 146 if (!allowedToLoadFrameURL(m_url)) | 147 if (!allowedToLoadFrameURL(m_url)) |
| 147 return; | 148 return; |
| 148 | 149 |
| 149 // FIXME: These should be joined into a PluginParameters class. | 150 // FIXME: These should be joined into a PluginParameters class. |
| 150 Vector<String> paramNames; | 151 Vector<String> paramNames; |
| 151 Vector<String> paramValues; | 152 Vector<String> paramValues; |
| 152 parametersForPlugin(paramNames, paramValues); | 153 parametersForPlugin(paramNames, paramValues); |
| 153 | 154 |
| 154 // FIXME: Can we not have layoutObject here now that beforeload events are gon
e? | 155 // FIXME: Can we not have layoutObject here now that beforeload events are |
| 156 // gone? |
| 155 if (!layoutObject()) | 157 if (!layoutObject()) |
| 156 return; | 158 return; |
| 157 | 159 |
| 158 // Overwrites the URL and MIME type of a Flash embed to use an HTML5 embed. | 160 // Overwrites the URL and MIME type of a Flash embed to use an HTML5 embed. |
| 159 KURL overridenUrl = | 161 KURL overridenUrl = |
| 160 document().frame()->loader().client()->overrideFlashEmbedWithHTML( | 162 document().frame()->loader().client()->overrideFlashEmbedWithHTML( |
| 161 document().completeURL(m_url)); | 163 document().completeURL(m_url)); |
| 162 if (!overridenUrl.isEmpty()) { | 164 if (!overridenUrl.isEmpty()) { |
| 163 m_url = overridenUrl.getString(); | 165 m_url = overridenUrl.getString(); |
| 164 m_serviceType = "text/html"; | 166 m_serviceType = "text/html"; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 for (HTMLObjectElement* object = | 216 for (HTMLObjectElement* object = |
| 215 Traversal<HTMLObjectElement>::firstAncestor(*this); | 217 Traversal<HTMLObjectElement>::firstAncestor(*this); |
| 216 object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) { | 218 object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) { |
| 217 if (object->isExposed()) | 219 if (object->isExposed()) |
| 218 return false; | 220 return false; |
| 219 } | 221 } |
| 220 return true; | 222 return true; |
| 221 } | 223 } |
| 222 | 224 |
| 223 } // namespace blink | 225 } // namespace blink |
| OLD | NEW |