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

Side by Side Diff: Source/modules/accessibility/AXTableColumn.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/modules/accessibility/AXTableCell.cpp ('k') | Source/modules/accessibility/AXTableRow.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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 { 64 {
65 // this will be filled in when addChildren is called 65 // this will be filled in when addChildren is called
66 return m_columnRect; 66 return m_columnRect;
67 } 67 }
68 68
69 void AXTableColumn::headerObjectsForColumn(AccessibilityChildrenVector& headers) 69 void AXTableColumn::headerObjectsForColumn(AccessibilityChildrenVector& headers)
70 { 70 {
71 if (!m_parent) 71 if (!m_parent)
72 return; 72 return;
73 73
74 RenderObject* renderer = m_parent->renderer(); 74 LayoutObject* renderer = m_parent->renderer();
75 if (!renderer) 75 if (!renderer)
76 return; 76 return;
77 77
78 if (!m_parent->isAXTable()) 78 if (!m_parent->isAXTable())
79 return; 79 return;
80 80
81 if (toAXTable(m_parent)->isAriaTable()) { 81 if (toAXTable(m_parent)->isAriaTable()) {
82 AccessibilityChildrenVector columnChildren = children(); 82 AccessibilityChildrenVector columnChildren = children();
83 unsigned childrenCount = columnChildren.size(); 83 unsigned childrenCount = columnChildren.size();
84 for (unsigned i = 0; i < childrenCount; i++) { 84 for (unsigned i = 0; i < childrenCount; i++) {
(...skipping 29 matching lines...) Expand all
114 headers.append(cell); 114 headers.append(cell);
115 } 115 }
116 } 116 }
117 } 117 }
118 118
119 AXObject* AXTableColumn::headerObject() 119 AXObject* AXTableColumn::headerObject()
120 { 120 {
121 if (!m_parent) 121 if (!m_parent)
122 return 0; 122 return 0;
123 123
124 RenderObject* renderer = m_parent->renderer(); 124 LayoutObject* renderer = m_parent->renderer();
125 if (!renderer) 125 if (!renderer)
126 return 0; 126 return 0;
127 127
128 if (!m_parent->isAXTable()) 128 if (!m_parent->isAXTable())
129 return 0; 129 return 0;
130 130
131 AXTable* parentTable = toAXTable(m_parent); 131 AXTable* parentTable = toAXTable(m_parent);
132 if (parentTable->isAriaTable()) { 132 if (parentTable->isAriaTable()) {
133 AccessibilityChildrenVector rowChildren = children(); 133 AccessibilityChildrenVector rowChildren = children();
134 unsigned childrenCount = rowChildren.size(); 134 unsigned childrenCount = rowChildren.size();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // make sure the last one isn't the same as this one (rowspan cells) 227 // make sure the last one isn't the same as this one (rowspan cells)
228 if (m_children.size() > 0 && m_children.last() == cell) 228 if (m_children.size() > 0 && m_children.last() == cell)
229 continue; 229 continue;
230 230
231 m_children.append(cell); 231 m_children.append(cell);
232 m_columnRect.unite(cell->elementRect()); 232 m_columnRect.unite(cell->elementRect());
233 } 233 }
234 } 234 }
235 235
236 } // namespace blink 236 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXTableCell.cpp ('k') | Source/modules/accessibility/AXTableRow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698