OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@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 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 // for the MIME type we came up with, ignore the MIME type we came up with a
nd just use | 125 // for the MIME type we came up with, ignore the MIME type we came up with a
nd just use |
126 // the ActiveX type. | 126 // the ActiveX type. |
127 if (havePlugin(pluginData, activeXType()) && !havePlugin(pluginData, type)) | 127 if (havePlugin(pluginData, activeXType()) && !havePlugin(pluginData, type)) |
128 return activeXType(); | 128 return activeXType(); |
129 | 129 |
130 return type; | 130 return type; |
131 } | 131 } |
132 | 132 |
133 static inline bool shouldUseEmbedDescendant(HTMLObjectElement* objectElement, co
nst PluginData* pluginData) | 133 static inline bool shouldUseEmbedDescendant(HTMLObjectElement* objectElement, co
nst PluginData* pluginData) |
134 { | 134 { |
| 135 #if PLATFORM(MAC) |
| 136 UNUSED_PARAM(objectElement); |
| 137 UNUSED_PARAM(pluginData); |
| 138 // On Mac, we always want to use the embed descendant. |
| 139 return true; |
| 140 #else |
135 // If we have both an <object> and <embed>, we always want to use the <embed
> except when we have | 141 // If we have both an <object> and <embed>, we always want to use the <embed
> except when we have |
136 // an ActiveX plug-in and plan to use it. | 142 // an ActiveX plug-in and plan to use it. |
137 return !(havePlugin(pluginData, activeXType()) | 143 return !(havePlugin(pluginData, activeXType()) |
138 && serviceTypeForClassId(objectElement->classId(), pluginData) == active
XType()); | 144 && serviceTypeForClassId(objectElement->classId(), pluginData) == active
XType()); |
| 145 #endif |
139 } | 146 } |
140 | 147 |
141 void RenderPartObject::updateWidget(bool onlyCreateNonNetscapePlugins) | 148 void RenderPartObject::updateWidget(bool onlyCreateNonNetscapePlugins) |
142 { | 149 { |
143 String url; | 150 String url; |
144 String serviceType; | 151 String serviceType; |
145 Vector<String> paramNames; | 152 Vector<String> paramNames; |
146 Vector<String> paramValues; | 153 Vector<String> paramValues; |
147 Frame* frame = m_view->frame(); | 154 Frame* frame = m_view->frame(); |
148 | 155 |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 marginh = frame->getMarginHeight(); | 355 marginh = frame->getMarginHeight(); |
349 } | 356 } |
350 if (marginw != -1) | 357 if (marginw != -1) |
351 view->setMarginWidth(marginw); | 358 view->setMarginWidth(marginw); |
352 if (marginh != -1) | 359 if (marginh != -1) |
353 view->setMarginHeight(marginh); | 360 view->setMarginHeight(marginh); |
354 } | 361 } |
355 } | 362 } |
356 | 363 |
357 } | 364 } |
OLD | NEW |