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

WebCore/loader/SubframeLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 69 matching lines @@
 
     Frame* frame = loadOrRedirectSubframe(ownerElement, url, frameName, lockHistory, lockBackForwardList);
     if (!frame)
         return false;
 
     if (!scriptURL.isEmpty())
         frame->script()->executeIfJavaScriptURL(scriptURL);
 
     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)
 {
     if (url.isEmpty() && mimeType.isEmpty())
         return false;
     
     if (!m_frame->script()->xssAuditor()->canLoadObject(url)) {
         // It is unsafe to honor the request for this object.
         return false;
@@ skipping 263 matching lines @@
     return true;
 }
 
 KURL SubframeLoader::completeURL(const String& url) const
 {
     ASSERT(m_frame->document());
     return m_frame->document()->completeURL(url);
 }
 
 } // namespace WebCore