diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/plugins/PluginArray.cpp | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/plugins/PluginArray.cpp')
| -rw-r--r-- | WebCore/plugins/PluginArray.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/WebCore/plugins/PluginArray.cpp b/WebCore/plugins/PluginArray.cpp index b37d3c0..038e4ad 100644 --- a/WebCore/plugins/PluginArray.cpp +++ b/WebCore/plugins/PluginArray.cpp @@ -39,7 +39,7 @@ PluginArray::~PluginArray() unsigned PluginArray::length() const { - PluginData* data = getPluginData(); + PluginData* data = pluginData(); if (!data) return 0; return data->plugins().size(); @@ -47,10 +47,10 @@ unsigned PluginArray::length() const PassRefPtr<Plugin> PluginArray::item(unsigned index) { - PluginData* data = getPluginData(); + PluginData* data = pluginData(); if (!data) return 0; - const Vector<PluginInfo*>& plugins = data->plugins(); + const Vector<PluginInfo>& plugins = data->plugins(); if (index >= plugins.size()) return 0; return Plugin::create(data, index).get(); @@ -58,12 +58,12 @@ PassRefPtr<Plugin> PluginArray::item(unsigned index) bool PluginArray::canGetItemsForName(const AtomicString& propertyName) { - PluginData* data = getPluginData(); + PluginData* data = pluginData(); if (!data) return 0; - const Vector<PluginInfo*>& plugins = data->plugins(); + const Vector<PluginInfo>& plugins = data->plugins(); for (unsigned i = 0; i < plugins.size(); ++i) { - if (plugins[i]->name == propertyName) + if (plugins[i].name == propertyName) return true; } return false; @@ -71,12 +71,12 @@ bool PluginArray::canGetItemsForName(const AtomicString& propertyName) PassRefPtr<Plugin> PluginArray::namedItem(const AtomicString& propertyName) { - PluginData* data = getPluginData(); + PluginData* data = pluginData(); if (!data) return 0; - const Vector<PluginInfo*>& plugins = data->plugins(); + const Vector<PluginInfo>& plugins = data->plugins(); for (unsigned i = 0; i < plugins.size(); ++i) { - if (plugins[i]->name == propertyName) + if (plugins[i].name == propertyName) return Plugin::create(data, i).get(); } return 0; @@ -87,14 +87,14 @@ void PluginArray::refresh(bool reload) Page::refreshPlugins(reload); } -PluginData* PluginArray::getPluginData() const +PluginData* PluginArray::pluginData() const { if (!m_frame) return 0; - Page* p = m_frame->page(); - if (!p) + Page* page = m_frame->page(); + if (!page) return 0; - return p->pluginData(); + return page->pluginData(); } } // namespace WebCore |