diff options
Diffstat (limited to 'WebCore/plugins')
-rw-r--r-- | WebCore/plugins/DOMMimeType.h | 2 | ||||
-rw-r--r-- | WebCore/plugins/DOMMimeTypeArray.h | 2 | ||||
-rw-r--r-- | WebCore/plugins/DOMPlugin.h | 3 | ||||
-rw-r--r-- | WebCore/plugins/DOMPluginArray.h | 2 | ||||
-rw-r--r-- | WebCore/plugins/PluginViewNone.cpp | 13 | ||||
-rw-r--r-- | WebCore/plugins/gtk/PluginViewGtk.cpp | 2 | ||||
-rw-r--r-- | WebCore/plugins/mac/PluginViewMac.mm | 5 | ||||
-rw-r--r-- | WebCore/plugins/win/PluginDataWin.cpp | 64 | ||||
-rw-r--r-- | WebCore/plugins/win/PluginMessageThrottlerWin.cpp | 2 |
9 files changed, 22 insertions, 73 deletions
diff --git a/WebCore/plugins/DOMMimeType.h b/WebCore/plugins/DOMMimeType.h index a010e33..cefdb48 100644 --- a/WebCore/plugins/DOMMimeType.h +++ b/WebCore/plugins/DOMMimeType.h @@ -20,6 +20,7 @@ #ifndef DOMMimeType_h #define DOMMimeType_h +#include <wtf/Forward.h> #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> #include <wtf/RefCounted.h> @@ -29,7 +30,6 @@ namespace WebCore { class DOMPlugin; -class String; class DOMMimeType : public RefCounted<DOMMimeType> { public: diff --git a/WebCore/plugins/DOMMimeTypeArray.h b/WebCore/plugins/DOMMimeTypeArray.h index 2ccbfa0..ed078bb 100644 --- a/WebCore/plugins/DOMMimeTypeArray.h +++ b/WebCore/plugins/DOMMimeTypeArray.h @@ -22,13 +22,13 @@ #define DOMMimeTypeArray_h #include "DOMMimeType.h" +#include <wtf/Forward.h> #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> #include <wtf/Vector.h> namespace WebCore { -class AtomicString; class Frame; class PluginData; diff --git a/WebCore/plugins/DOMPlugin.h b/WebCore/plugins/DOMPlugin.h index f86234a..9700ab5 100644 --- a/WebCore/plugins/DOMPlugin.h +++ b/WebCore/plugins/DOMPlugin.h @@ -21,15 +21,14 @@ #define DOMPlugin_h #include "DOMMimeType.h" +#include <wtf/Forward.h> #include <wtf/RefPtr.h> #include <wtf/RefCounted.h> namespace WebCore { -class AtomicString; class Plugin; class PluginData; -class String; class DOMPlugin : public RefCounted<DOMPlugin> { public: diff --git a/WebCore/plugins/DOMPluginArray.h b/WebCore/plugins/DOMPluginArray.h index 0adb70a..cc70572 100644 --- a/WebCore/plugins/DOMPluginArray.h +++ b/WebCore/plugins/DOMPluginArray.h @@ -22,13 +22,13 @@ #define DOMPluginArray_h #include "DOMPlugin.h" +#include <wtf/Forward.h> #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> #include <wtf/Vector.h> namespace WebCore { -class AtomicString; class Frame; class PluginData; diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp index a4cc358..eb32cd1 100644 --- a/WebCore/plugins/PluginViewNone.cpp +++ b/WebCore/plugins/PluginViewNone.cpp @@ -26,6 +26,10 @@ #include "config.h" #include "PluginView.h" +#if USE(JSC) +#include "Bridge.h" +#endif + using namespace WTF; namespace WebCore { @@ -135,13 +139,20 @@ void PluginView::handleFocusOutEvent() // ports using PluginView, but until then, if new functions like this are // added, please make sure they have the proper platform #ifs so that changes // do not break ports who compile both this file and PluginView.cpp. -#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) +#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || OS(WINCE) && !PLATFORM(QT) #if ENABLE(NETSCAPE_PLUGIN_API) void PluginView::keepAlive(NPP) { } #endif +#if USE(JSC) +PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance() +{ + return 0; +} +#endif + void PluginView::privateBrowsingStateChanged(bool) { } diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp index 78c6636..ab43bf4 100644 --- a/WebCore/plugins/gtk/PluginViewGtk.cpp +++ b/WebCore/plugins/gtk/PluginViewGtk.cpp @@ -556,7 +556,7 @@ void PluginView::setParentVisible(bool visible) NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32_t len, const char* buf) { - String filename(buf, len); + WTF::String filename(buf, len); if (filename.startsWith("file:///")) filename = filename.substring(8); diff --git a/WebCore/plugins/mac/PluginViewMac.mm b/WebCore/plugins/mac/PluginViewMac.mm index 8d64c24..e0ad135 100644 --- a/WebCore/plugins/mac/PluginViewMac.mm +++ b/WebCore/plugins/mac/PluginViewMac.mm @@ -227,7 +227,10 @@ bool PluginView::platformStart() #endif } - show(); + updatePluginWidget(); + + if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall)) + setNPWindowIfNeeded(); // TODO: Implement null timer throttling depending on plugin activation m_nullEventTimer.set(new Timer<PluginView>(this, &PluginView::nullEventTimerFired)); diff --git a/WebCore/plugins/win/PluginDataWin.cpp b/WebCore/plugins/win/PluginDataWin.cpp deleted file mode 100644 index 41fe073..0000000 --- a/WebCore/plugins/win/PluginDataWin.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) - Copyright (C) 2006, 2007 Apple Inc. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" -#include "PluginData.h" - -#include "PluginDatabase.h" -#include "PluginPackage.h" - -namespace WebCore { - -void PluginData::initPlugins() -{ - PluginDatabase *db = PluginDatabase::installedPlugins(); - const Vector<PluginPackage*> &plugins = db->plugins(); - - for (unsigned int i = 0; i < plugins.size(); ++i) { - PluginPackage* package = plugins[i]; - - PluginInfo info; - info.name = package->name(); - info.file = package->fileName(); - info.desc = package->description(); - - const MIMEToDescriptionsMap& mimeToDescriptions = package->mimeToDescriptions(); - MIMEToDescriptionsMap::const_iterator end = mimeToDescriptions.end(); - for (MIMEToDescriptionsMap::const_iterator it = mimeToDescriptions.begin(); it != end; ++it) { - MimeClassInfo mime; - - mime.type = it->first; - mime.desc = it->second; - mime.extensions = package->mimeToExtensions().get(mime.type); - - info.mimes.append(mime); - } - - m_plugins.append(info); - } -} - -void PluginData::refresh() -{ - PluginDatabase *db = PluginDatabase::installedPlugins(); - db->refresh(); -} - -}; diff --git a/WebCore/plugins/win/PluginMessageThrottlerWin.cpp b/WebCore/plugins/win/PluginMessageThrottlerWin.cpp index dd1f05b..c5f3081 100644 --- a/WebCore/plugins/win/PluginMessageThrottlerWin.cpp +++ b/WebCore/plugins/win/PluginMessageThrottlerWin.cpp @@ -48,8 +48,8 @@ PluginMessageThrottlerWin::PluginMessageThrottlerWin(PluginView* pluginView) : m_pluginView(pluginView) , m_back(0) , m_front(0) - , m_lastMessageTime(0) , m_messageThrottleTimer(this, &PluginMessageThrottlerWin::messageThrottleTimerFired) + , m_lastMessageTime(0) { // Initialize the free list with our inline messages for (unsigned i = 0; i < NumInlineMessages - 1; i++) |