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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLObjectElement.h

Issue 2933213002: Revert of Move ObjectContentType entirely to HTMLPlugInElement (Closed)
Patch Set: Created 3 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 LayoutEmbeddedContent* ExistingLayoutEmbeddedContent() const override; 103 LayoutEmbeddedContent* ExistingLayoutEmbeddedContent() const override;
104 104
105 void UpdatePluginInternal() override; 105 void UpdatePluginInternal() override;
106 void UpdateDocNamedItem(); 106 void UpdateDocNamedItem();
107 107
108 void ReattachFallbackContent(); 108 void ReattachFallbackContent();
109 109
110 // FIXME: This function should not deal with url or serviceType 110 // FIXME: This function should not deal with url or serviceType
111 // so that we can better share code between <object> and <embed>. 111 // so that we can better share code between <object> and <embed>.
112 void ParametersForPlugin(Vector<String>& param_names, 112 void ParametersForPlugin(Vector<String>& param_names,
113 Vector<String>& param_values); 113 Vector<String>& param_values,
114 String& url,
115 String& service_type);
114 116
115 bool HasValidClassId() const; 117 bool HasValidClassId() const;
116 118
117 void ReloadPluginOnAttributeChange(const QualifiedName&); 119 void ReloadPluginOnAttributeChange(const QualifiedName&);
118 120
119 bool ShouldRegisterAsNamedItem() const override { return true; } 121 bool ShouldRegisterAsNamedItem() const override { return true; }
120 bool ShouldRegisterAsExtraNamedItem() const override { return true; } 122 bool ShouldRegisterAsExtraNamedItem() const override { return true; }
121 123
122 String class_id_; 124 String class_id_;
123 bool use_fallback_content_ : 1; 125 bool use_fallback_content_ : 1;
(...skipping 29 matching lines...) Expand all
153 static_cast<const HTMLObjectElement&>(element); 155 static_cast<const HTMLObjectElement&>(element);
154 // We need to assert after the cast because ListedElement doesn't 156 // We need to assert after the cast because ListedElement doesn't
155 // have hasTagName. 157 // have hasTagName.
156 SECURITY_DCHECK(object_element.HasTagName(HTMLNames::objectTag)); 158 SECURITY_DCHECK(object_element.HasTagName(HTMLNames::objectTag));
157 return object_element; 159 return object_element;
158 } 160 }
159 161
160 } // namespace blink 162 } // namespace blink
161 163
162 #endif // HTMLObjectElement_h 164 #endif // HTMLObjectElement_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698