| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 120 |
| 121 return m_private->axObjectID(); | 121 return m_private->axObjectID(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 bool WebAXObject::updateLayoutAndCheckValidity() | 124 bool WebAXObject::updateLayoutAndCheckValidity() |
| 125 { | 125 { |
| 126 if (!isDetached()) { | 126 if (!isDetached()) { |
| 127 Document* document = m_private->getDocument(); | 127 Document* document = m_private->getDocument(); |
| 128 if (!document || !document->view()) | 128 if (!document || !document->view()) |
| 129 return false; | 129 return false; |
| 130 document->view()->updateAllLifecyclePhases(); | 130 document->view()->updateLifecycleToCompositingCleanPlusScrolling(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 // Doing a layout can cause this object to be invalid, so check again. | 133 // Doing a layout can cause this object to be invalid, so check again. |
| 134 return !isDetached(); | 134 return !isDetached(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 WebString WebAXObject::actionVerb() const | 137 WebString WebAXObject::actionVerb() const |
| 138 { | 138 { |
| 139 if (isDetached()) | 139 if (isDetached()) |
| 140 return WebString(); | 140 return WebString(); |
| (...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1527 m_private = object; | 1527 m_private = object; |
| 1528 return *this; | 1528 return *this; |
| 1529 } | 1529 } |
| 1530 | 1530 |
| 1531 WebAXObject::operator AXObject*() const | 1531 WebAXObject::operator AXObject*() const |
| 1532 { | 1532 { |
| 1533 return m_private.get(); | 1533 return m_private.get(); |
| 1534 } | 1534 } |
| 1535 | 1535 |
| 1536 } // namespace blink | 1536 } // namespace blink |
| OLD | NEW |