Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: WebCore/loader/SubframeLoader.h

Issue 3551010: Merge 66992 - 2010-09-08 Andy Estes <aestes@apple.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « WebCore/html/HTMLObjectElement.cpp ('k') | WebCore/loader/SubframeLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // FIXME: This should take Element* instead of Node*, or better yet the 68 // FIXME: This should take Element* instead of Node*, or better yet the
69 // specific type of Element which this code depends on. 69 // specific type of Element which this code depends on.
70 PassRefPtr<Widget> loadMediaPlayerProxyPlugin(Node*, const KURL&, const Vect or<String>& paramNames, const Vector<String>& paramValues); 70 PassRefPtr<Widget> loadMediaPlayerProxyPlugin(Node*, const KURL&, const Vect or<String>& paramNames, const Vector<String>& paramValues);
71 #endif 71 #endif
72 72
73 PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement* , const HashMap<String, String>& args); 73 PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement* , const HashMap<String, String>& args);
74 74
75 bool allowPlugins(ReasonForCallingAllowPlugins); 75 bool allowPlugins(ReasonForCallingAllowPlugins);
76 76
77 bool containsPlugins() const { return m_containsPlugins; } 77 bool containsPlugins() const { return m_containsPlugins; }
78
79 bool resourceWillUsePlugin(const String&, const String&);
78 80
79 private: 81 private:
80 Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Ato micString& frameName, bool lockHistory, bool lockBackForwardList); 82 Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Ato micString& frameName, bool lockHistory, bool lockBackForwardList);
81 Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer); 83 Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer);
82 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType , 84 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType ,
83 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback); 85 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback);
84 86
85 bool shouldUsePlugin(const KURL&, const String& mimeType, bool hasFallback, bool& useFallback); 87 bool shouldUsePlugin(const KURL&, const String& mimeType, bool hasFallback, bool& useFallback);
86 88
87 Document* document() const; 89 Document* document() const;
88 90
89 bool m_containsPlugins; 91 bool m_containsPlugins;
90 Frame* m_frame; 92 Frame* m_frame;
91 93
92 KURL completeURL(const String&) const; 94 KURL completeURL(const String&) const;
93 }; 95 };
94 96
95 } // namespace WebCore 97 } // namespace WebCore
96 98
97 #endif // SubframeLoader_h 99 #endif // SubframeLoader_h
OLDNEW
« no previous file with comments | « WebCore/html/HTMLObjectElement.cpp ('k') | WebCore/loader/SubframeLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698