| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 return m_private->axObjectID(); | 117 return m_private->axObjectID(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 bool WebAXObject::updateLayoutAndCheckValidity() | 120 bool WebAXObject::updateLayoutAndCheckValidity() |
| 121 { | 121 { |
| 122 if (!isDetached()) { | 122 if (!isDetached()) { |
| 123 Document* document = m_private->document(); | 123 Document* document = m_private->document(); |
| 124 if (!document || !document->topDocument().view()) | 124 if (!document || !document->topDocument().view()) |
| 125 return false; | 125 return false; |
| 126 document->topDocument().view()->updateLayoutAndStyleIfNeededRecursive(); | 126 document->view()->updateLayoutAndStyleForPainting(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 // Doing a layout can cause this object to be invalid, so check again. | 129 // Doing a layout can cause this object to be invalid, so check again. |
| 130 return !isDetached(); | 130 return !isDetached(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 WebString WebAXObject::actionVerb() const | 133 WebString WebAXObject::actionVerb() const |
| 134 { | 134 { |
| 135 if (isDetached()) | 135 if (isDetached()) |
| 136 return WebString(); | 136 return WebString(); |
| (...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1467 m_private = object; | 1467 m_private = object; |
| 1468 return *this; | 1468 return *this; |
| 1469 } | 1469 } |
| 1470 | 1470 |
| 1471 WebAXObject::operator WTF::PassRefPtr<AXObject>() const | 1471 WebAXObject::operator WTF::PassRefPtr<AXObject>() const |
| 1472 { | 1472 { |
| 1473 return m_private.get(); | 1473 return m_private.get(); |
| 1474 } | 1474 } |
| 1475 | 1475 |
| 1476 } // namespace blink | 1476 } // namespace blink |
| OLD | NEW |