Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 100 insertions, 0 deletions

diff --git a/Source/WebCore/plugins/DOMPluginArray.cpp b/Source/WebCore/plugins/DOMPluginArray.cpp
new file mode 100644
index 0000000..766c3eb
--- /dev/null
+++ b/Source/WebCore/plugins/DOMPluginArray.cpp
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+ *  Copyright (C) 2008 Apple Inc. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+#include "DOMPluginArray.h"
+
+#include "DOMPlugin.h"
+#include "Frame.h"
+#include "Page.h"
+#include "PluginData.h"
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+
+DOMPluginArray::DOMPluginArray(Frame* frame)
+    : m_frame(frame)
+{
+}
+
+DOMPluginArray::~DOMPluginArray()
+{
+}
+
+unsigned DOMPluginArray::length() const
+{
+    PluginData* data = pluginData();
+    if (!data)
+        return 0;
+    return data->plugins().size();
+}
+
+PassRefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
+{
+    PluginData* data = pluginData();
+    if (!data)
+        return 0;
+    const Vector<PluginInfo>& plugins = data->plugins();
+    if (index >= plugins.size())
+        return 0;
+    return DOMPlugin::create(data, m_frame, index).get();
+}
+
+bool DOMPluginArray::canGetItemsForName(const AtomicString& propertyName)
+{
+    PluginData* data = pluginData();
+    if (!data)
+        return 0;
+    const Vector<PluginInfo>& plugins = data->plugins();
+    for (unsigned i = 0; i < plugins.size(); ++i) {
+        if (plugins[i].name == propertyName)
+            return true;
+    }
+    return false;
+}
+
+PassRefPtr<DOMPlugin> DOMPluginArray::namedItem(const AtomicString& propertyName)
+{
+    PluginData* data = pluginData();
+    if (!data)
+        return 0;
+    const Vector<PluginInfo>& plugins = data->plugins();
+    for (unsigned i = 0; i < plugins.size(); ++i) {
+        if (plugins[i].name == propertyName)
+            return DOMPlugin::create(data, m_frame, i).get();
+    }
+    return 0;
+}
+
+void DOMPluginArray::refresh(bool reload)
+{
+    Page::refreshPlugins(reload);
+}
+
+PluginData* DOMPluginArray::pluginData() const
+{
+    if (!m_frame)
+        return 0;
+    Page* page = m_frame->page();
+    if (!page)
+        return 0;
+    return page->pluginData();
+}
+
+} // namespace WebCore