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

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

Issue 2561043002: Clean-up after Form Association Refactoring (Closed)
Patch Set: Removed constructorNeedsFormElement from scripts and HTMLTagNames Created 4 years 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 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/loader/FrameLoaderClient.h" 43 #include "core/loader/FrameLoaderClient.h"
44 #include "core/plugins/PluginView.h" 44 #include "core/plugins/PluginView.h"
45 #include "platform/Widget.h" 45 #include "platform/Widget.h"
46 #include "platform/network/mime/MIMETypeRegistry.h" 46 #include "platform/network/mime/MIMETypeRegistry.h"
47 47
48 namespace blink { 48 namespace blink {
49 49
50 using namespace HTMLNames; 50 using namespace HTMLNames;
51 51
52 inline HTMLObjectElement::HTMLObjectElement(Document& document, 52 inline HTMLObjectElement::HTMLObjectElement(Document& document,
53 HTMLFormElement* form,
54 bool createdByParser) 53 bool createdByParser)
55 : HTMLPlugInElement(objectTag, 54 : HTMLPlugInElement(objectTag,
56 document, 55 document,
57 createdByParser, 56 createdByParser,
58 ShouldNotPreferPlugInsForImages), 57 ShouldNotPreferPlugInsForImages),
59 m_useFallbackContent(false) { 58 m_useFallbackContent(false) {
60 } 59 }
61 60
62 inline HTMLObjectElement::~HTMLObjectElement() {} 61 inline HTMLObjectElement::~HTMLObjectElement() {}
63 62
64 HTMLObjectElement* HTMLObjectElement::create(Document& document, 63 HTMLObjectElement* HTMLObjectElement::create(Document& document,
65 HTMLFormElement* form,
66 bool createdByParser) { 64 bool createdByParser) {
67 HTMLObjectElement* element = 65 HTMLObjectElement* element = new HTMLObjectElement(document, createdByParser);
68 new HTMLObjectElement(document, form, createdByParser);
69 element->ensureUserAgentShadowRoot(); 66 element->ensureUserAgentShadowRoot();
70 return element; 67 return element;
71 } 68 }
72 69
73 DEFINE_TRACE(HTMLObjectElement) { 70 DEFINE_TRACE(HTMLObjectElement) {
74 ListedElement::trace(visitor); 71 ListedElement::trace(visitor);
75 HTMLPlugInElement::trace(visitor); 72 HTMLPlugInElement::trace(visitor);
76 } 73 }
77 74
78 LayoutPart* HTMLObjectElement::existingLayoutPart() const { 75 LayoutPart* HTMLObjectElement::existingLayoutPart() const {
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 459
463 bool HTMLObjectElement::willUseFallbackContentAtLayout() const { 460 bool HTMLObjectElement::willUseFallbackContentAtLayout() const {
464 return !hasValidClassId() && hasFallbackContent(); 461 return !hasValidClassId() && hasFallbackContent();
465 } 462 }
466 463
467 void HTMLObjectElement::associateWith(HTMLFormElement* form) { 464 void HTMLObjectElement::associateWith(HTMLFormElement* form) {
468 associateByParser(form); 465 associateByParser(form);
469 }; 466 };
470 467
471 } // namespace blink 468 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLObjectElement.h ('k') | third_party/WebKit/Source/core/html/HTMLOutputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698