OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 | 128 |
129 return m_private->axObjectCache().platformGenerateAXID(); | 129 return m_private->axObjectCache().platformGenerateAXID(); |
130 } | 130 } |
131 | 131 |
132 bool WebAXObject::updateLayoutAndCheckValidity() | 132 bool WebAXObject::updateLayoutAndCheckValidity() |
133 { | 133 { |
134 if (!isDetached()) { | 134 if (!isDetached()) { |
135 Document* document = m_private->getDocument(); | 135 Document* document = m_private->getDocument(); |
136 if (!document || !document->view()) | 136 if (!document || !document->view()) |
137 return false; | 137 return false; |
138 document->view()->updateLifecycleToCompositingCleanPlusScrolling(); | 138 document->view()->updateAllLifecyclePhasesExceptPaint(); |
139 } | 139 } |
140 | 140 |
141 // Doing a layout can cause this object to be invalid, so check again. | 141 // Doing a layout can cause this object to be invalid, so check again. |
142 return !isDetached(); | 142 return !isDetached(); |
143 } | 143 } |
144 | 144 |
145 WebString WebAXObject::actionVerb() const | 145 WebString WebAXObject::actionVerb() const |
146 { | 146 { |
147 if (isDetached()) | 147 if (isDetached()) |
148 return WebString(); | 148 return WebString(); |
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 m_private = object; | 1578 m_private = object; |
1579 return *this; | 1579 return *this; |
1580 } | 1580 } |
1581 | 1581 |
1582 WebAXObject::operator AXObject*() const | 1582 WebAXObject::operator AXObject*() const |
1583 { | 1583 { |
1584 return m_private.get(); | 1584 return m_private.get(); |
1585 } | 1585 } |
1586 | 1586 |
1587 } // namespace blink | 1587 } // namespace blink |
OLD | NEW |