| 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 Apple Computer, Inc. | 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
| 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 } | 494 } |
| 495 | 495 |
| 496 bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType,
const Vector<String>& paramNames, const Vector<String>& paramValues) | 496 bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType,
const Vector<String>& paramNames, const Vector<String>& paramValues) |
| 497 { | 497 { |
| 498 if (url.isEmpty() && mimeType.isEmpty()) | 498 if (url.isEmpty() && mimeType.isEmpty()) |
| 499 return false; | 499 return false; |
| 500 | 500 |
| 501 if (protocolIsJavaScript(url)) | 501 if (protocolIsJavaScript(url)) |
| 502 return false; | 502 return false; |
| 503 | 503 |
| 504 // FIXME: None of this code should use renderers! | |
| 505 LayoutEmbeddedObject* renderer = layoutEmbeddedObject(); | |
| 506 ASSERT(renderer); | |
| 507 if (!renderer) | |
| 508 return false; | |
| 509 | |
| 510 KURL completedURL = document().completeURL(url); | 504 KURL completedURL = document().completeURL(url); |
| 511 if (!pluginIsLoadable(completedURL, mimeType)) | 505 if (!pluginIsLoadable(completedURL, mimeType)) |
| 512 return false; | 506 return false; |
| 513 | 507 |
| 514 bool useFallback; | 508 bool useFallback; |
| 515 bool requireRenderer = true; | |
| 516 if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent(), useFallbac
k)) | 509 if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent(), useFallbac
k)) |
| 517 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa
llback, requireRenderer); | 510 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa
llback, true); |
| 518 | 511 |
| 519 // If the plug-in element already contains a subframe, | 512 // If the plug-in element already contains a subframe, |
| 520 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new | 513 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new |
| 521 // frame and set it as the LayoutPart's widget, causing what was previously | 514 // frame and set it as the LayoutPart's widget, causing what was previously |
| 522 // in the widget to be torn down. | 515 // in the widget to be torn down. |
| 523 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true, CheckC
ontentSecurityPolicy); | 516 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true, CheckC
ontentSecurityPolicy); |
| 524 } | 517 } |
| 525 | 518 |
| 526 bool HTMLPlugInElement::loadPlugin(const KURL& url, const String& mimeType, cons
t Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallbac
k, bool requireRenderer) | 519 bool HTMLPlugInElement::loadPlugin(const KURL& url, const String& mimeType, cons
t Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallbac
k, bool requireRenderer) |
| 527 { | 520 { |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 return hasOpenShadowRoot(); | 665 return hasOpenShadowRoot(); |
| 673 } | 666 } |
| 674 | 667 |
| 675 void HTMLPlugInElement::lazyReattachIfNeeded() | 668 void HTMLPlugInElement::lazyReattachIfNeeded() |
| 676 { | 669 { |
| 677 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate()
&& renderer() && !isImageType()) | 670 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate()
&& renderer() && !isImageType()) |
| 678 lazyReattachIfAttached(); | 671 lazyReattachIfAttached(); |
| 679 } | 672 } |
| 680 | 673 |
| 681 } | 674 } |
| OLD | NEW |