Diff
Modified: trunk/Source/Platform/ChangeLog (137176 => 137177)
--- trunk/Source/Platform/ChangeLog 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/Platform/ChangeLog 2012-12-10 18:22:28 UTC (rev 137177)
@@ -1,3 +1,21 @@
+2012-12-10 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move getPluginsList out of PlatformSupport
+ https://bugs.webkit.org/show_bug.cgi?id=96507
+
+ Reviewed by Darin Fisher.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * Platform.gypi:
+ * chromium/public/Platform.h:
+ (WebKit):
+ (Platform):
+ (WebKit::Platform::getPluginList):
+ * chromium/public/WebPluginListBuilder.h: Added.
+ (WebKit):
+ (WebPluginListBuilder):
+
2012-12-08 Gavin Peters <[email protected]>
Add status events on <link rel=prerender> elements.
Modified: trunk/Source/Platform/Platform.gypi (137176 => 137177)
--- trunk/Source/Platform/Platform.gypi 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/Platform/Platform.gypi 2012-12-10 18:22:28 UTC (rev 137177)
@@ -95,6 +95,7 @@
'chromium/public/WebMessagePortChannelClient.h',
'chromium/public/WebMimeRegistry.h',
'chromium/public/WebNonCopyable.h',
+ 'chromium/public/WebPluginListBuilder.h',
'chromium/public/WebPoint.h',
'chromium/public/WebPrerender.h',
'chromium/public/WebPrerenderingSupport.h',
Modified: trunk/Source/Platform/chromium/public/Platform.h (137176 => 137177)
--- trunk/Source/Platform/chromium/public/Platform.h 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/Platform/chromium/public/Platform.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -60,6 +60,7 @@
class WebMediaStreamCenterClient;
class WebMessagePortChannel;
class WebMimeRegistry;
+class WebPluginListBuilder;
class WebRTCPeerConnectionHandler;
class WebRTCPeerConnectionHandlerClient;
class WebSandboxSupport;
@@ -237,6 +238,13 @@
virtual void cacheMetadata(const WebURL&, double responseTime, const char* data, size_t dataSize) { }
+ // Plugins -------------------------------------------------------------
+
+ // If refresh is true, then cached information should not be used to
+ // satisfy this call.
+ virtual void getPluginList(bool refresh, WebPluginListBuilder*) { }
+
+
// Resources -----------------------------------------------------------
// Returns a localized string resource (with substitution parameters).
Copied: trunk/Source/Platform/chromium/public/WebPluginListBuilder.h (from rev 137175, trunk/Source/WebKit/chromium/public/WebPluginListBuilder.h) (0 => 137177)
--- trunk/Source/Platform/chromium/public/WebPluginListBuilder.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebPluginListBuilder.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPluginListBuilder_h
+#define WebPluginListBuilder_h
+
+namespace WebKit {
+
+class WebString;
+
+// An interface for building a list of known plugins.
+class WebPluginListBuilder {
+public:
+ virtual void addPlugin(
+ const WebString& name, const WebString& description,
+ const WebString& fileName) = 0;
+
+ virtual void addMediaTypeToLastPlugin(
+ const WebString& name, const WebString& description) = 0;
+
+ virtual void addFileExtensionToLastMediaType(
+ const WebString& fileExtension) = 0;
+};
+
+} // namespace WebKit
+
+#endif
Modified: trunk/Source/WebCore/ChangeLog (137176 => 137177)
--- trunk/Source/WebCore/ChangeLog 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebCore/ChangeLog 2012-12-10 18:22:28 UTC (rev 137177)
@@ -1,3 +1,27 @@
+2012-12-10 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move getPluginsList out of PlatformSupport
+ https://bugs.webkit.org/show_bug.cgi?id=96507
+
+ Reviewed by Darin Fisher.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * WebCore.gypi:
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+ * plugins/chromium/PluginDataChromium.cpp:
+ (WebCore::PluginCache::plugins):
+ * plugins/chromium/PluginListBuilder.cpp: Added.
+ (WebKit):
+ (WebKit::PluginListBuilder::addPlugin):
+ (WebKit::PluginListBuilder::addMediaTypeToLastPlugin):
+ (WebKit::PluginListBuilder::addFileExtensionToLastMediaType):
+ * plugins/chromium/PluginListBuilder.h: Added.
+ (WebKit):
+ (PluginListBuilder):
+ (WebKit::PluginListBuilder::PluginListBuilder):
+
2012-12-10 Carlos Garcia Campos <[email protected]>
[GTK] Build GObject DOM bindings as a separate library
Modified: trunk/Source/WebCore/WebCore.gypi (137176 => 137177)
--- trunk/Source/WebCore/WebCore.gypi 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebCore/WebCore.gypi 2012-12-10 18:22:28 UTC (rev 137177)
@@ -2209,6 +2209,8 @@
'plugins/PluginViewNone.cpp',
'plugins/chromium/PluginDataChromium.cpp',
'plugins/chromium/PluginDataChromium.h',
+ 'plugins/chromium/PluginListBuilder.cpp',
+ 'plugins/chromium/PluginListBuilder.h',
'plugins/gtk/PluginPackageGtk.cpp',
'plugins/gtk/PluginViewGtk.cpp',
'plugins/gtk/gtk2xtbin.h',
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (137176 => 137177)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -76,9 +76,6 @@
// IndexedDB ----------------------------------------------------------
static PassRefPtr<IDBFactoryBackendInterface> idbFactory();
- // Plugin -------------------------------------------------------------
- static bool plugins(bool refresh, Vector<PluginInfo>*);
-
// Theming ------------------------------------------------------------
#if OS(WINDOWS) && !ENABLE(DEFAULT_RENDER_THEME)
static void paintButton(
Modified: trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp (137176 => 137177)
--- trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp 2012-12-10 18:22:28 UTC (rev 137177)
@@ -31,7 +31,8 @@
#include "config.h"
#include "PluginDataChromium.h"
-#include "PlatformSupport.h"
+#include "PluginListBuilder.h"
+#include <public/Platform.h>
namespace WebCore {
@@ -50,7 +51,8 @@
const Vector<PluginInfo>& plugins()
{
if (!m_loaded) {
- PlatformSupport::plugins(m_refresh, &m_plugins);
+ PluginListBuilder builder(&m_plugins);
+ WebKit::Platform::current()->getPluginList(m_refresh, &builder);
m_loaded = true;
m_refresh = false;
}
Copied: trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp (from rev 137175, trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.cpp) (0 => 137177)
--- trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp (rev 0)
+++ trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp 2012-12-10 18:22:28 UTC (rev 137177)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PluginListBuilder.h"
+
+#include "PluginData.h"
+#include <public/WebString.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+void PluginListBuilder::addPlugin(const WebKit::WebString& name, const WebKit::WebString& description, const WebKit::WebString& fileName)
+{
+ PluginInfo info;
+ info.name = name;
+ info.desc = description;
+ info.file = fileName;
+ m_results->append(info);
+}
+
+void PluginListBuilder::addMediaTypeToLastPlugin(const WebKit::WebString& name, const WebKit::WebString& description)
+{
+ MimeClassInfo info;
+ info.type = name;
+ info.desc = description;
+ m_results->last().mimes.append(info);
+}
+
+void PluginListBuilder::addFileExtensionToLastMediaType(const WebKit::WebString& extension)
+{
+ MimeClassInfo& info = m_results->last().mimes.last();
+ info.extensions.append(extension);
+}
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h (from rev 137175, trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.h) (0 => 137177)
--- trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h (rev 0)
+++ trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PluginListBuilder_h
+#define PluginListBuilder_h
+
+#include "PluginData.h"
+#include <public/WebPluginListBuilder.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class PluginListBuilder : public WebKit::WebPluginListBuilder {
+public:
+ PluginListBuilder(Vector<WebCore::PluginInfo>* results) : m_results(results) { }
+
+ // WebPluginListBuilder methods:
+ virtual void addPlugin(const WebKit::WebString& name, const WebKit::WebString& description, const WebKit::WebString& fileName);
+ virtual void addMediaTypeToLastPlugin(const WebKit::WebString& name, const WebKit::WebString& description);
+ virtual void addFileExtensionToLastMediaType(const WebKit::WebString& extension);
+
+private:
+ Vector<PluginInfo>* m_results;
+};
+
+} // namespace WebCore
+
+#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (137176 => 137177)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-10 18:22:28 UTC (rev 137177)
@@ -1,3 +1,22 @@
+2012-12-10 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move getPluginsList out of PlatformSupport
+ https://bugs.webkit.org/show_bug.cgi?id=96507
+
+ Reviewed by Darin Fisher.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * WebKit.gyp:
+ * public/WebPluginListBuilder.h:
+ * public/platform/WebKitPlatformSupport.h:
+ (WebKit):
+ (WebKit::WebKitPlatformSupport::idbFactory):
+ * src/PlatformSupport.cpp:
+ (WebCore::PlatformSupport::idbFactory):
+ * src/WebPluginListBuilderImpl.cpp: Removed.
+ * src/WebPluginListBuilderImpl.h: Removed.
+
2012-12-10 Alexis Menard <[email protected]>
[CSS3 Backgrounds and Borders] Remove CSS3_BACKGROUND feature flag.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (137176 => 137177)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-12-10 18:22:28 UTC (rev 137177)
@@ -602,8 +602,6 @@
'src/WebPluginContainerImpl.cpp',
'src/WebPluginContainerImpl.h',
'src/WebPluginDocument.cpp',
- 'src/WebPluginListBuilderImpl.cpp',
- 'src/WebPluginListBuilderImpl.h',
'src/WebPluginLoadObserver.cpp',
'src/WebPluginLoadObserver.h',
'src/WebPluginScrollbarImpl.cpp',
Modified: trunk/Source/WebKit/chromium/public/WebPluginListBuilder.h (137176 => 137177)
--- trunk/Source/WebKit/chromium/public/WebPluginListBuilder.h 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/public/WebPluginListBuilder.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -28,27 +28,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebPluginListBuilder_h
-#define WebPluginListBuilder_h
-
-namespace WebKit {
-
-class WebString;
-
-// An interface for building a list of known plugins.
-class WebPluginListBuilder {
-public:
- virtual void addPlugin(
- const WebString& name, const WebString& description,
- const WebString& fileName) = 0;
-
- virtual void addMediaTypeToLastPlugin(
- const WebString& name, const WebString& description) = 0;
-
- virtual void addFileExtensionToLastMediaType(
- const WebString& fileExtension) = 0;
-};
-
-} // namespace WebKit
-
-#endif
+#include "../../../Platform/chromium/public/WebPluginListBuilder.h"
Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (137176 => 137177)
--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -46,10 +46,7 @@
namespace WebKit {
-class WebApplicationCacheHost; // FIXME: Does this belong in platform?
-class WebApplicationCacheHostClient; // FIXME: Does this belong in platform?
class WebIDBFactory; // FIXME: Does this belong in platform?
-class WebPluginListBuilder; // FIXME: Does this belong in platform?
class WebSharedWorkerRepository; // FIXME: Does this belong in platform?
// FIXME: Eventually all these API will need to move to WebKit::Platform.
@@ -60,13 +57,6 @@
virtual WebIDBFactory* idbFactory() { return 0; }
- // Plugins -------------------------------------------------------------
-
- // If refresh is true, then cached information should not be used to
- // satisfy this call.
- virtual void getPluginList(bool refresh, WebPluginListBuilder*) { }
-
-
// Shared Workers ------------------------------------------------------
virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (137176 => 137177)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-12-10 18:22:28 UTC (rev 137177)
@@ -41,7 +41,6 @@
#include "WebFrameImpl.h"
#include "WebKit.h"
#include "WebPluginContainerImpl.h"
-#include "WebPluginListBuilderImpl.h"
#include "WebSandboxSupport.h"
#include "WebScreenInfo.h"
#include "WebViewClient.h"
@@ -112,15 +111,6 @@
return IDBFactoryBackendProxy::create();
}
-// Plugin ---------------------------------------------------------------------
-
-bool PlatformSupport::plugins(bool refresh, Vector<PluginInfo>* results)
-{
- WebPluginListBuilderImpl builder(results);
- webKitPlatformSupport()->getPluginList(refresh, &builder);
- return true; // FIXME: There is no need for this function to return a value.
-}
-
// Theming --------------------------------------------------------------------
#if OS(WINDOWS) && !ENABLE(DEFAULT_RENDER_THEME)
Deleted: trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.cpp (137176 => 137177)
--- trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.cpp 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.cpp 2012-12-10 18:22:28 UTC (rev 137177)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebPluginListBuilderImpl.h"
-
-#include "PluginData.h"
-#include <public/WebString.h>
-#include <wtf/Vector.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebPluginListBuilderImpl::addPlugin(const WebString& name, const WebString& description, const WebString& fileName)
-{
- PluginInfo info;
- info.name = name;
- info.desc = description;
- info.file = fileName;
- m_results->append(info);
-}
-
-void WebPluginListBuilderImpl::addMediaTypeToLastPlugin(const WebString& name, const WebString& description)
-{
- MimeClassInfo info;
- info.type = name;
- info.desc = description;
- m_results->last().mimes.append(info);
-}
-
-void WebPluginListBuilderImpl::addFileExtensionToLastMediaType(const WebString& extension)
-{
- MimeClassInfo& info = m_results->last().mimes.last();
- info.extensions.append(extension);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.h (137176 => 137177)
--- trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.h 2012-12-10 18:21:31 UTC (rev 137176)
+++ trunk/Source/WebKit/chromium/src/WebPluginListBuilderImpl.h 2012-12-10 18:22:28 UTC (rev 137177)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebPluginListBuilderImpl_h
-#define WebPluginListBuilderImpl_h
-
-#include "WebPluginListBuilder.h"
-
-#include "PluginData.h"
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-class WebPluginListBuilderImpl : public WebPluginListBuilder {
-public:
- WebPluginListBuilderImpl(Vector<WebCore::PluginInfo>* results) : m_results(results) { }
-
- // WebPluginListBuilder methods:
- virtual void addPlugin(const WebString& name, const WebString& description, const WebString& fileName);
- virtual void addMediaTypeToLastPlugin(const WebString& name, const WebString& description);
- virtual void addFileExtensionToLastMediaType(const WebString& extension);
-
-private:
- Vector<WebCore::PluginInfo>* m_results;
-};
-
-} // namespace WebKit
-
-#endif
