Use the PluginData object instead of the PluginInfoStore interface to test for

plugin supported mime types.

R=jam

Review URL: http://codereview.chromium.org/18141

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8219 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 14 insertions, 51 deletions

diff --git a/DEPS b/DEPS
index 265a5a4..c294603 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@8213",
+    "/trunk/deps/third_party/WebKit@8214",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 25071e4..5fff436 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -569,7 +569,6 @@ input_files = [
     '$WEBCORE_DIR/plugins/PluginData.cpp',
 
     '$WEBCORE_DIR/plugins/chromium/PluginDataChromium.cpp',
-    '$WEBCORE_DIR/plugins/chromium/PluginsChromium.cpp',
 
     '$WEBCORE_DIR/rendering/AutoTableLayout.cpp',
     '$WEBCORE_DIR/rendering/bidi.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 1519990..f855e5e 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -7289,49 +7289,17 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginData.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginDatabase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginDebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginInfoStore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginMainThreadScheduler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginPackage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginQuirkSet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginStream.h"
-				>
-			</File>
 			<Filter
-				Name="plugins"
+				Name="chromium"
 				>
-				<Filter
-					Name="chromium"
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginDataChromium.cpp"
 					>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginDataChromium.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginsChromium.cpp"
-						>
-					</File>
-				</Filter>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\chromium\PluginsChromium.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index a402c8f..7d45a6d 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -27,7 +27,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformString.h"
-#include "PluginInfoStore.h"
+#include "PluginData.h"
 #include "RefPtr.h"
 #include "WindowFeatures.h"
 MSVC_POP_WARNING();
@@ -1176,7 +1176,7 @@ bool WebFrameLoaderClient::canShowMIMEType(const String& mime_type) const {
   // See if the type is handled by an installed plugin, if so, we can show it.
   // TODO(beng): (http://b/1085524) This is the place to stick a preference to
   //             disable full page plugins (optionally for certain types!)
-  return PluginInfoStore::supportsMIMEType(mime_type);
+  return webframe_->frame()->page()->pluginData()->supportsMimeType(mime_type);
 }
 
 bool WebFrameLoaderClient::representationExistsForURLScheme(const String& URLScheme) const {
@@ -1450,8 +1450,8 @@ Widget* WebFrameLoaderClient::createJavaAppletWidget(
 }
 
 ObjectContentType WebFrameLoaderClient::objectContentType(
-                                       const KURL& url,
-                                       const String& explicit_mime_type) {
+    const KURL& url,
+    const String& explicit_mime_type) {
   // This code is based on Apple's implementation from
   // WebCoreSupport/WebFrameBridge.mm.
 
@@ -1470,7 +1470,7 @@ ObjectContentType WebFrameLoaderClient::objectContentType(
   if (MIMETypeRegistry::isSupportedImageMIMEType(mime_type))
     return ObjectContentImage;
 
-  if (PluginInfoStore::supportsMIMEType(mime_type))
+  if (webframe_->frame()->page()->pluginData()->supportsMimeType(mime_type))
     return ObjectContentNetscapePlugin;
 
   if (MIMETypeRegistry::isSupportedNonImageMIMEType(mime_type))
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index c792e87..9ae8c03 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -515,7 +515,6 @@
 		938445B90F16B0570075F4C5 /* PluginData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 938181460EF6D29000993F02 /* PluginData.cpp */; };
 		938445BA0F16B0570075F4C5 /* PluginDataChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A361D80F001E3800778012 /* PluginDataChromium.cpp */; };
 		938445BB0F16B0570075F4C5 /* PluginDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8DD10D7F3C01001ECF42 /* PluginDocument.cpp */; };
-		938445BC0F16B0570075F4C5 /* PluginsChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A362D60F01695600778012 /* PluginsChromium.cpp */; };
 		938445BD0F16B0570075F4C5 /* PointerEventsHitRules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E95350D7F3E94001ECF42 /* PointerEventsHitRules.cpp */; };
 		938445BE0F16B0570075F4C5 /* PopupMenuChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF527E0F002F680073C62D /* PopupMenuChromium.cpp */; };
 		938445BF0F16B0570075F4C5 /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A3B0D7F3A7C001ECF42 /* Position.cpp */; };
@@ -1515,7 +1514,6 @@
 		41A3624C0F003B3000778012 /* EventHandlerChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EventHandlerChromium.cpp; path = chromium/EventHandlerChromium.cpp; sourceTree = "<group>"; };
 		41A3624D0F003B3000778012 /* FrameChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FrameChromium.cpp; path = chromium/FrameChromium.cpp; sourceTree = "<group>"; };
 		41A3624E0F003B3000778012 /* FrameChromium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FrameChromium.h; path = chromium/FrameChromium.h; sourceTree = "<group>"; };
-		41A362D60F01695600778012 /* PluginsChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginsChromium.cpp; path = ../third_party/WebKit/WebCore/plugins/chromium/PluginsChromium.cpp; sourceTree = SOURCE_ROOT; };
 		41A365580F01AB1700778012 /* InspectorController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorController.cpp; sourceTree = "<group>"; };
 		41A3655F0F01AB3800778012 /* InspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorClient.h; sourceTree = "<group>"; };
 		41A365600F01AB3800778012 /* InspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorController.h; sourceTree = "<group>"; };
@@ -7719,7 +7717,6 @@
 		938181420EF6D26400993F02 /* chromium */ = {
 			isa = PBXGroup;
 			children = (
-				41A362D60F01695600778012 /* PluginsChromium.cpp */,
 				41A361D80F001E3800778012 /* PluginDataChromium.cpp */,
 			);
 			name = chromium;
@@ -8983,7 +8980,6 @@
 				938445B90F16B0570075F4C5 /* PluginData.cpp in Sources */,
 				938445BA0F16B0570075F4C5 /* PluginDataChromium.cpp in Sources */,
 				938445BB0F16B0570075F4C5 /* PluginDocument.cpp in Sources */,
-				938445BC0F16B0570075F4C5 /* PluginsChromium.cpp in Sources */,
 				938445BD0F16B0570075F4C5 /* PointerEventsHitRules.cpp in Sources */,
 				938445BE0F16B0570075F4C5 /* PopupMenuChromium.cpp in Sources */,
 				938445BF0F16B0570075F4C5 /* Position.cpp in Sources */,