OLD | NEW |
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) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "HTMLNames.h" | 29 #include "HTMLNames.h" |
30 #include "bindings/v8/ScriptController.h" | 30 #include "bindings/v8/ScriptController.h" |
31 #include "bindings/v8/ScriptEventListener.h" | 31 #include "bindings/v8/ScriptEventListener.h" |
32 #include "core/dom/Attribute.h" | 32 #include "core/dom/Attribute.h" |
33 #include "core/dom/AutocompleteErrorEvent.h" | 33 #include "core/dom/AutocompleteErrorEvent.h" |
34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
35 #include "core/dom/ElementTraversal.h" | 35 #include "core/dom/ElementTraversal.h" |
36 #include "core/dom/Event.h" | 36 #include "core/dom/Event.h" |
37 #include "core/dom/EventNames.h" | 37 #include "core/dom/EventNames.h" |
38 #include "core/dom/NamedNodesCollection.h" | 38 #include "core/dom/NamedNodesCollection.h" |
39 #include "core/dom/NodeRenderingContext.h" | |
40 #include "core/html/FormController.h" | 39 #include "core/html/FormController.h" |
41 #include "core/html/HTMLCollection.h" | 40 #include "core/html/HTMLCollection.h" |
42 #include "core/html/HTMLImageElement.h" | 41 #include "core/html/HTMLImageElement.h" |
43 #include "core/html/HTMLInputElement.h" | 42 #include "core/html/HTMLInputElement.h" |
44 #include "core/html/HTMLObjectElement.h" | 43 #include "core/html/HTMLObjectElement.h" |
45 #include "core/html/HTMLTableElement.h" | 44 #include "core/html/HTMLTableElement.h" |
46 #include "core/loader/FormState.h" | 45 #include "core/loader/FormState.h" |
47 #include "core/loader/FrameLoader.h" | 46 #include "core/loader/FrameLoader.h" |
48 #include "core/loader/FrameLoaderClient.h" | 47 #include "core/loader/FrameLoaderClient.h" |
49 #include "core/page/ContentSecurityPolicy.h" | 48 #include "core/page/ContentSecurityPolicy.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 m_associatedElements[i]->formWillBeDestroyed(); | 91 m_associatedElements[i]->formWillBeDestroyed(); |
93 for (unsigned i = 0; i < m_imageElements.size(); ++i) | 92 for (unsigned i = 0; i < m_imageElements.size(); ++i) |
94 m_imageElements[i]->m_form = 0; | 93 m_imageElements[i]->m_form = 0; |
95 } | 94 } |
96 | 95 |
97 bool HTMLFormElement::formWouldHaveSecureSubmission(const String& url) | 96 bool HTMLFormElement::formWouldHaveSecureSubmission(const String& url) |
98 { | 97 { |
99 return document().completeURL(url).protocolIs("https"); | 98 return document().completeURL(url).protocolIs("https"); |
100 } | 99 } |
101 | 100 |
102 bool HTMLFormElement::rendererIsNeeded(const NodeRenderingContext& context) | 101 bool HTMLFormElement::rendererIsNeeded(const RenderStyle& style) |
103 { | 102 { |
104 if (!m_wasDemoted) | 103 if (!m_wasDemoted) |
105 return HTMLElement::rendererIsNeeded(context); | 104 return HTMLElement::rendererIsNeeded(style); |
106 | 105 |
107 ContainerNode* node = parentNode(); | 106 ContainerNode* node = parentNode(); |
108 RenderObject* parentRenderer = node->renderer(); | 107 RenderObject* parentRenderer = node->renderer(); |
109 // FIXME: Shouldn't we also check for table caption (see |formIsTablePart| b
elow). | 108 // FIXME: Shouldn't we also check for table caption (see |formIsTablePart| b
elow). |
| 109 // FIXME: This check is not correct for Shadow DOM. |
110 bool parentIsTableElementPart = (parentRenderer->isTable() && isHTMLTableEle
ment(node)) | 110 bool parentIsTableElementPart = (parentRenderer->isTable() && isHTMLTableEle
ment(node)) |
111 || (parentRenderer->isTableRow() && node->hasTagName(trTag)) | 111 || (parentRenderer->isTableRow() && node->hasTagName(trTag)) |
112 || (parentRenderer->isTableSection() && node->hasTagName(tbodyTag)) | 112 || (parentRenderer->isTableSection() && node->hasTagName(tbodyTag)) |
113 || (parentRenderer->isRenderTableCol() && node->hasTagName(colTag)) | 113 || (parentRenderer->isRenderTableCol() && node->hasTagName(colTag)) |
114 || (parentRenderer->isTableCell() && node->hasTagName(trTag)); | 114 || (parentRenderer->isTableCell() && node->hasTagName(trTag)); |
115 | 115 |
116 if (!parentIsTableElementPart) | 116 if (!parentIsTableElementPart) |
117 return true; | 117 return true; |
118 | 118 |
119 EDisplay display = context.style()->display(); | 119 EDisplay display = style.display(); |
120 bool formIsTablePart = display == TABLE || display == INLINE_TABLE || displa
y == TABLE_ROW_GROUP | 120 bool formIsTablePart = display == TABLE || display == INLINE_TABLE || displa
y == TABLE_ROW_GROUP |
121 || display == TABLE_HEADER_GROUP || display == TABLE_FOOTER_GROUP || dis
play == TABLE_ROW | 121 || display == TABLE_HEADER_GROUP || display == TABLE_FOOTER_GROUP || dis
play == TABLE_ROW |
122 || display == TABLE_COLUMN_GROUP || display == TABLE_COLUMN || display =
= TABLE_CELL | 122 || display == TABLE_COLUMN_GROUP || display == TABLE_COLUMN || display =
= TABLE_CELL |
123 || display == TABLE_CAPTION; | 123 || display == TABLE_CAPTION; |
124 | 124 |
125 return formIsTablePart; | 125 return formIsTablePart; |
126 } | 126 } |
127 | 127 |
128 Node::InsertionNotificationRequest HTMLFormElement::insertedInto(ContainerNode*
insertionPoint) | 128 Node::InsertionNotificationRequest HTMLFormElement::insertedInto(ContainerNode*
insertionPoint) |
129 { | 129 { |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 } | 786 } |
787 | 787 |
788 void HTMLFormElement::setDemoted(bool demoted) | 788 void HTMLFormElement::setDemoted(bool demoted) |
789 { | 789 { |
790 if (demoted) | 790 if (demoted) |
791 UseCounter::count(&document(), UseCounter::DemotedFormElement); | 791 UseCounter::count(&document(), UseCounter::DemotedFormElement); |
792 m_wasDemoted = demoted; | 792 m_wasDemoted = demoted; |
793 } | 793 } |
794 | 794 |
795 } // namespace | 795 } // namespace |
OLD | NEW |