Merge 66992 - 2010-09-08 Andy Estes <aestes@apple.com>...

WebCore/loader/SubframeLoader.cpp

Index: WebCore/loader/SubframeLoader.cpp
===================================================================
--- WebCore/loader/SubframeLoader.cpp	(revision 68934)
+++ WebCore/loader/SubframeLoader.cpp	(working copy)
@@ -87,6 +87,15 @@
 
     return true;
 }
+    
+bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType)
+{
+    KURL completedURL;
+    if (!url.isEmpty())
+        completedURL = completeURL(url);
+    bool useFallback;
+    return shouldUsePlugin(completedURL, mimeType, false, useFallback);
+}
 
 bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const String& url, const AtomicString& frameName,
     const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)