Diff
Modified: trunk/Source/WebCore/ChangeLog (147759 => 147760)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 17:36:12 UTC (rev 147759)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 17:44:22 UTC (rev 147760)
@@ -1,3 +1,18 @@
+2013-04-05 Ryosuke Niwa <[email protected]>
+
+ Remove Chromium code from WebCore/plugins
+ https://bugs.webkit.org/show_bug.cgi?id=114015
+
+ Reviewed by Andreas Kling.
+
+ Removed.
+
+ * plugins/chromium: Removed.
+ * plugins/chromium/PluginDataChromium.cpp: Removed.
+ * plugins/chromium/PluginDataChromium.h: Removed.
+ * plugins/chromium/PluginListBuilder.cpp: Removed.
+ * plugins/chromium/PluginListBuilder.h: Removed.
+
2013-04-05 Simon Fraser <[email protected]>
ASSERTION FAILED: m_repaintRect == renderer()->clippedOverflowRectForRepaint(renderer()->containerForRepaint()) after r135816
Deleted: trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp (147759 => 147760)
--- trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp 2013-04-05 17:36:12 UTC (rev 147759)
+++ trunk/Source/WebCore/plugins/chromium/PluginDataChromium.cpp 2013-04-05 17:44:22 UTC (rev 147760)
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2008, 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 "PluginDataChromium.h"
-
-#include "PluginListBuilder.h"
-#include <public/Platform.h>
-
-namespace WebCore {
-
-class PluginCache {
-public:
- PluginCache() : m_loaded(false), m_refresh(false) {}
- ~PluginCache() { reset(false); }
-
- void reset(bool refresh)
- {
- m_plugins.clear();
- m_loaded = false;
- m_refresh = refresh;
- }
-
- const Vector<PluginInfo>& plugins()
- {
- if (!m_loaded) {
- PluginListBuilder builder(&m_plugins);
- WebKit::Platform::current()->getPluginList(m_refresh, &builder);
- m_loaded = true;
- m_refresh = false;
- }
- return m_plugins;
- }
-
-private:
- Vector<PluginInfo> m_plugins;
- bool m_loaded;
- bool m_refresh;
-};
-
-static PluginCache& pluginCache()
-{
- DEFINE_STATIC_LOCAL(PluginCache, cache, ());
- return cache;
-}
-
-void PluginData::initPlugins(const Page*)
-{
- const Vector<PluginInfo>& plugins = pluginCache().plugins();
- for (size_t i = 0; i < plugins.size(); ++i)
- m_plugins.append(plugins[i]);
-}
-
-void PluginData::refresh()
-{
- pluginCache().reset(true);
- pluginCache().plugins(); // Force the plugins to be reloaded now.
-}
-
-String getPluginMimeTypeFromExtension(const String& extension)
-{
- const Vector<PluginInfo>& plugins = pluginCache().plugins();
- for (size_t i = 0; i < plugins.size(); ++i) {
- for (size_t j = 0; j < plugins[i].mimes.size(); ++j) {
- const MimeClassInfo& mime = plugins[i].mimes[j];
- const Vector<String>& extensions = mime.extensions;
- for (size_t k = 0; k < extensions.size(); ++k) {
- if (extension == extensions[k])
- return mime.type;
- }
- }
- }
- return String();
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/plugins/chromium/PluginDataChromium.h (147759 => 147760)
--- trunk/Source/WebCore/plugins/chromium/PluginDataChromium.h 2013-04-05 17:36:12 UTC (rev 147759)
+++ trunk/Source/WebCore/plugins/chromium/PluginDataChromium.h 2013-04-05 17:44:22 UTC (rev 147760)
@@ -1,39 +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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 PluginDataChromium_h
-#define PluginDataChromium_h
-
-#include "PluginData.h"
-
-namespace WebCore {
-
-// Checks if any of the plugins handle this extension, and if so returns the
-// plugin's mime type for this extension. Otherwise returns an empty string.
-String getPluginMimeTypeFromExtension(const String& extension);
-
-} // namespace WebCore
-
-#endif // PluginDataChromium_h
Deleted: trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp (147759 => 147760)
--- trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp 2013-04-05 17:36:12 UTC (rev 147759)
+++ trunk/Source/WebCore/plugins/chromium/PluginListBuilder.cpp 2013-04-05 17:44:22 UTC (rev 147760)
@@ -1,63 +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 "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
Deleted: trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h (147759 => 147760)
--- trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h 2013-04-05 17:36:12 UTC (rev 147759)
+++ trunk/Source/WebCore/plugins/chromium/PluginListBuilder.h 2013-04-05 17:44:22 UTC (rev 147760)
@@ -1,55 +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 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
