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

Side by Side Diff: Source/core/html/HTMLFormElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/HTMLFormControlElementTest.cpp ('k') | Source/core/html/HTMLFrameElement.h » ('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) 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 123
124 bool HTMLFormElement::rendererIsNeeded(const RenderStyle& style) 124 bool HTMLFormElement::rendererIsNeeded(const RenderStyle& style)
125 { 125 {
126 if (!m_wasDemoted) 126 if (!m_wasDemoted)
127 return HTMLElement::rendererIsNeeded(style); 127 return HTMLElement::rendererIsNeeded(style);
128 128
129 ContainerNode* node = parentNode(); 129 ContainerNode* node = parentNode();
130 if (!node || !node->renderer()) 130 if (!node || !node->renderer())
131 return HTMLElement::rendererIsNeeded(style); 131 return HTMLElement::rendererIsNeeded(style);
132 RenderObject* parentRenderer = node->renderer(); 132 LayoutObject* parentRenderer = node->renderer();
133 // FIXME: Shouldn't we also check for table caption (see |formIsTablePart| b elow). 133 // FIXME: Shouldn't we also check for table caption (see |formIsTablePart| b elow).
134 // FIXME: This check is not correct for Shadow DOM. 134 // FIXME: This check is not correct for Shadow DOM.
135 bool parentIsTableElementPart = (parentRenderer->isTable() && isHTMLTableEle ment(*node)) 135 bool parentIsTableElementPart = (parentRenderer->isTable() && isHTMLTableEle ment(*node))
136 || (parentRenderer->isTableRow() && isHTMLTableRowElement(*node)) 136 || (parentRenderer->isTableRow() && isHTMLTableRowElement(*node))
137 || (parentRenderer->isTableSection() && node->hasTagName(tbodyTag)) 137 || (parentRenderer->isTableSection() && node->hasTagName(tbodyTag))
138 || (parentRenderer->isLayoutTableCol() && node->hasTagName(colTag)) 138 || (parentRenderer->isLayoutTableCol() && node->hasTagName(colTag))
139 || (parentRenderer->isTableCell() && isHTMLTableRowElement(*node)); 139 || (parentRenderer->isTableCell() && isHTMLTableRowElement(*node));
140 140
141 if (!parentIsTableElementPart) 141 if (!parentIsTableElementPart)
142 return true; 142 return true;
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 } 876 }
877 877
878 void HTMLFormElement::setDemoted(bool demoted) 878 void HTMLFormElement::setDemoted(bool demoted)
879 { 879 {
880 if (demoted) 880 if (demoted)
881 UseCounter::count(document(), UseCounter::DemotedFormElement); 881 UseCounter::count(document(), UseCounter::DemotedFormElement);
882 m_wasDemoted = demoted; 882 m_wasDemoted = demoted;
883 } 883 }
884 884
885 } // namespace 885 } // namespace
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormControlElementTest.cpp ('k') | Source/core/html/HTMLFrameElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698