webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 13 insertions, 38 deletions

diff --git a/Source/WebCore/plugins/DOMPluginArray.cpp b/Source/WebCore/plugins/DOMPluginArray.cpp
index 9478b7d4b..cca94b281 100644
--- a/Source/WebCore/plugins/DOMPluginArray.cpp
+++ b/Source/WebCore/plugins/DOMPluginArray.cpp
@@ -26,12 +26,6 @@
 #include "PluginData.h"
 #include <wtf/text/AtomicString.h>
 
-#if ENABLE(WEB_REPLAY)
-#include "Document.h"
-#include "WebReplayInputs.h"
-#include <replay/InputCursor.h>
-#endif
-
 namespace WebCore {
 
 DOMPluginArray::DOMPluginArray(Frame* frame)
@@ -48,8 +42,7 @@ unsigned DOMPluginArray::length() const
     PluginData* data = pluginData();
     if (!data)
         return 0;
-
-    return data->webVisiblePlugins().size();
+    return data->plugins().size();
 }
 
 PassRefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
@@ -57,11 +50,10 @@ PassRefPtr<DOMPlugin> DOMPluginArray::item(unsigned index)
     PluginData* data = pluginData();
     if (!data)
         return 0;
-
-    const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
+    const Vector<PluginInfo>& plugins = data->plugins();
     if (index >= plugins.size())
         return 0;
-    return DOMPlugin::create(data, m_frame, plugins[index]);
+    return DOMPlugin::create(data, m_frame, index).get();
 }
 
 bool DOMPluginArray::canGetItemsForName(const AtomicString& propertyName)
@@ -69,9 +61,9 @@ bool DOMPluginArray::canGetItemsForName(const AtomicString& propertyName)
     PluginData* data = pluginData();
     if (!data)
         return 0;
-
-    for (auto& plugin : data->webVisiblePlugins()) {
-        if (plugin.name == propertyName)
+    const Vector<PluginInfo>& plugins = data->plugins();
+    for (unsigned i = 0; i < plugins.size(); ++i) {
+        if (plugins[i].name == propertyName)
             return true;
     }
     return false;
@@ -82,10 +74,10 @@ PassRefPtr<DOMPlugin> DOMPluginArray::namedItem(const AtomicString& propertyName
     PluginData* data = pluginData();
     if (!data)
         return 0;
-
-    for (auto& plugin : data->webVisiblePlugins()) {
-        if (plugin.name == propertyName)
-            return DOMPlugin::create(data, m_frame, plugin);
+    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;
 }
@@ -98,28 +90,11 @@ void DOMPluginArray::refresh(bool reload)
 PluginData* DOMPluginArray::pluginData() const
 {
     if (!m_frame)
-        return nullptr;
-
+        return 0;
     Page* page = m_frame->page();
     if (!page)
-        return nullptr;
-
-    PluginData* pluginData = &page->pluginData();
-
-#if ENABLE(WEB_REPLAY)
-    if (!m_frame->document())
-        return pluginData;
-
-    InputCursor& cursor = m_frame->document()->inputCursor();
-    if (cursor.isCapturing())
-        cursor.appendInput<FetchPluginData>(pluginData);
-    else if (cursor.isReplaying()) {
-        if (FetchPluginData* input = cursor.fetchInput<FetchPluginData>())
-            pluginData = input->pluginData().get();
-    }
-#endif
-
-    return pluginData;
+        return 0;
+    return &page->pluginData();
 }
 
 } // namespace WebCore