commit 9a91c9796a72865c705b190c27adc388acddff62
author dpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Sep 10 07:48:20 2010 +0000
committer dpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Sep 10 07:48:20 2010 +0000
tree ab9d336c5a5198b239d04ac3ad0ba8e32b3671a0
parent 6e28f04bcf88a7f8b2bed9cd578b19bcddae8e00

2010-09-10  Dirk Pranke  <dpranke@chromium.org>

        Unreviewed, rolling out r67178.
        http://trac.webkit.org/changeset/67178
        https://bugs.webkit.org/show_bug.cgi?id=45524

        re-roll-out patch to put original changes back in

        * fast/replaced/object-param-url-control-char.html:
        * fast/replaced/object-with-embed-url-param-expected.txt:
        * fast/replaced/object-with-embed-url-param.html:
2010-09-10  Dirk Pranke  <dpranke@chromium.org>

        Unreviewed, rolling out r67178.
        http://trac.webkit.org/changeset/67178
        https://bugs.webkit.org/show_bug.cgi?id=45524

        re-roll-out patch to put original changes back in

        * html/HTMLObjectElement.cpp:
        (WebCore::HTMLObjectElement::parametersForPlugin):
        (WebCore::HTMLObjectElement::updateWidget):
        * loader/SubframeLoader.cpp:
        (WebCore::SubframeLoader::resourceWillUsePlugin):
        * loader/SubframeLoader.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/loader/SubframeLoader.h

diff --git a/WebCore/loader/SubframeLoader.h b/WebCore/loader/SubframeLoader.h
index 6c3baf8..a573045 100644
--- a/WebCore/loader/SubframeLoader.h
+++ b/WebCore/loader/SubframeLoader.h
@@ -75,6 +75,8 @@
     bool allowPlugins(ReasonForCallingAllowPlugins);
 
     bool containsPlugins() const { return m_containsPlugins; }
+    
+    bool resourceWillUsePlugin(const String& url, const String& mimeType);
 
 private:
     Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const AtomicString& frameName, bool lockHistory, bool lockBackForwardList);