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

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: const KURL& - > KURL Created 7 years, 4 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
« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/core/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, 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 loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Atomi cString& frameName, bool lockBackForwardList); 60 bool loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const Atomi cString& frameName, bool lockBackForwardList);
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 resourceWillUsePlugin(const String& url, const String& mimeType, bool s houldPreferPlugInsForImages); 64 bool resourceWillUsePlugin(const String& url, const String& mimeType, bool s houldPreferPlugInsForImages);
67 65
68 private: 66 private:
69 bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& servi ceType, const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback); 67 bool requestPlugin(HTMLPlugInImageElement*, const KURL&, const String& servi ceType, const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback);
70 bool loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, c onst String& referrer); 68 bool loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, c onst String& referrer);
71 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType , 69 bool loadPlugin(HTMLPlugInImageElement*, const KURL&, const String& mimeType ,
72 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback); 70 const Vector<String>& paramNames, const Vector<String>& paramValues, boo l useFallback);
73 71
74 bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferP lugInsForImages, bool hasFallback, bool& useFallback); 72 bool shouldUsePlugin(const KURL&, const String& mimeType, bool shouldPreferP lugInsForImages, bool hasFallback, bool& useFallback);
75 bool pluginIsLoadable(HTMLPlugInImageElement*, const KURL&, const String& mi meType); 73 bool pluginIsLoadable(HTMLPlugInImageElement*, const KURL&, const String& mi meType);
76 74
77 Document* document() const; 75 Document* document() const;
78 76
79 bool m_containsPlugins; 77 bool m_containsPlugins;
80 Frame* m_frame; 78 Frame* m_frame;
81 79
82 KURL completeURL(const String&) const; 80 KURL completeURL(const String&) const;
83 }; 81 };
84 82
85 } // namespace WebCore 83 } // namespace WebCore
86 84
87 #endif // SubframeLoader_h 85 #endif // SubframeLoader_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/core/loader/SubframeLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698