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

Side by Side Diff: Source/core/loader/SubframeLoader.h

Issue 20858002: Merge SubframeLoader::createJavaAppletWidget into HTMLAppletElement::udpateWidget (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 WTF_MAKE_NONCOPYABLE(SubframeLoader); 54 WTF_MAKE_NONCOPYABLE(SubframeLoader);
55 public: 55 public:
56 explicit SubframeLoader(Frame*); 56 explicit SubframeLoader(Frame*);
57 57
58 void clear(); 58 void clear();
59 59
60 bool requestFrame(HTMLFrameOwnerElement*, const String& url, const AtomicStr ing& frameName, bool lockBackForwardList = true); 60 bool requestFrame(HTMLFrameOwnerElement*, const String& url, const AtomicStr ing& frameName, bool lockBackForwardList = true);
61 bool requestObject(HTMLPlugInImageElement*, const String& url, const AtomicS tring& frameName, 61 bool requestObject(HTMLPlugInImageElement*, const String& url, const AtomicS tring& frameName,
62 const String& serviceType, const Vector<String>& paramNames, const Vecto r<String>& paramValues); 62 const String& serviceType, const Vector<String>& paramNames, const Vecto r<String>& paramValues);
63 63
64 PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement* , const Vector<String>& paramNames, const Vector<String>& paramValues);
65
66 bool allowPlugins(ReasonForCallingAllowPlugins); 64 bool allowPlugins(ReasonForCallingAllowPlugins);
67 65
68 bool containsPlugins() const { return m_containsPlugins; } 66 bool containsPlugins() const { return m_containsPlugins; }
67 void setContainsPlugins() { m_containsPlugins = true; }
69 68
70 bool resourceWillUsePlugin(const String& url, const String& mimeType, bool s houldPreferPlugInsForImages); 69 bool resourceWillUsePlugin(const String& url, const String& mimeType, bool s houldPreferPlugInsForImages);
71 70
72 private: 71 private:
73 bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& servi ceType, const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback); 72 bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& servi ceType, const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback);
74 bool loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Atomi cString& frameName, bool lockBackForwardList); 73 bool loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Atomi cString& frameName, bool lockBackForwardList);
75 bool loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, c onst String& referrer); 74 bool loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, c onst String& referrer);
76 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType , 75 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType ,
77 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback); 76 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback);
78 77
79 bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferP lugInsForImages, bool hasFallback, bool& useFallback); 78 bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferP lugInsForImages, bool hasFallback, bool& useFallback);
80 bool pluginIsLoadable(HTMLPlugInImageElement*, const KURL&, const String& mi meType); 79 bool pluginIsLoadable(HTMLPlugInImageElement*, const KURL&, const String& mi meType);
81 80
82 Document* document() const; 81 Document* document() const;
83 82
84 bool m_containsPlugins; 83 bool m_containsPlugins;
85 Frame* m_frame; 84 Frame* m_frame;
86 85
87 KURL completeURL(const String&) const; 86 KURL completeURL(const String&) const;
88 }; 87 };
89 88
90 } // namespace WebCore 89 } // namespace WebCore
91 90
92 #endif // SubframeLoader_h 91 #endif // SubframeLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698