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

Unified Diff: Source/core/html/HTMLObjectElement.h

Issue 61213008: Revert "Finding an <object> element by name only works it has no children other than <param> elemen… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLNameCollection.cpp ('k') | Source/core/html/HTMLObjectElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLObjectElement.h
diff --git a/Source/core/html/HTMLObjectElement.h b/Source/core/html/HTMLObjectElement.h
index 36832f96615494eeadcb30cafbace0b51670a394..049cdfe5c8286b724609ea52cad8b4c1acb6452a 100644
--- a/Source/core/html/HTMLObjectElement.h
+++ b/Source/core/html/HTMLObjectElement.h
@@ -35,6 +35,8 @@ public:
static PassRefPtr<HTMLObjectElement> create(Document&, HTMLFormElement*, bool createdByParser);
virtual ~HTMLObjectElement();
+ bool isDocNamedItem() const { return m_docNamedItem; }
+
const String& classId() const { return m_classId; }
bool containsJavaApplet() const;
@@ -87,6 +89,7 @@ private:
virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
virtual void updateWidget(PluginCreationOption);
+ void updateDocNamedItem();
void reattachFallbackContent();
@@ -103,10 +106,11 @@ private:
virtual void derefFormAssociatedElement() { deref(); }
virtual HTMLFormElement* virtualForm() const;
- virtual bool shouldRegisterAsNamedItem() const OVERRIDE { return true; }
- virtual bool shouldRegisterAsExtraNamedItem() const OVERRIDE { return true; }
+ virtual bool shouldRegisterAsNamedItem() const OVERRIDE { return isDocNamedItem(); }
+ virtual bool shouldRegisterAsExtraNamedItem() const OVERRIDE { return isDocNamedItem(); }
String m_classId;
+ bool m_docNamedItem : 1;
bool m_useFallbackContent : 1;
};
« no previous file with comments | « Source/core/html/HTMLNameCollection.cpp ('k') | Source/core/html/HTMLObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698