| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 Document* document = m_private->getDocument(); | 126 Document* document = m_private->getDocument(); |
| 127 if (!document || !document->view()) | 127 if (!document || !document->view()) |
| 128 return false; | 128 return false; |
| 129 document->view()->updateLifecycleToCompositingCleanPlusScrolling(); | 129 document->view()->updateLifecycleToCompositingCleanPlusScrolling(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 // Doing a layout can cause this object to be invalid, so check again. | 132 // Doing a layout can cause this object to be invalid, so check again. |
| 133 return !isDetached(); | 133 return !isDetached(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 WebString WebAXObject::actionVerb() const { | 136 WebAXSupportedAction WebAXObject::action() const { |
| 137 if (isDetached()) | 137 if (isDetached()) |
| 138 return WebString(); | 138 return WebAXSupportedAction::NONE; |
| 139 | 139 |
| 140 return m_private->actionVerb(); | 140 return static_cast<WebAXSupportedAction>(m_private->action()); |
| 141 } | 141 } |
| 142 | 142 |
| 143 bool WebAXObject::canDecrement() const { | 143 bool WebAXObject::canDecrement() const { |
| 144 if (isDetached()) | 144 if (isDetached()) |
| 145 return false; | 145 return false; |
| 146 | 146 |
| 147 return m_private->isSlider(); | 147 return m_private->isSlider(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 bool WebAXObject::canIncrement() const { | 150 bool WebAXObject::canIncrement() const { |
| (...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1463 WebAXObject& WebAXObject::operator=(AXObject* object) { | 1463 WebAXObject& WebAXObject::operator=(AXObject* object) { |
| 1464 m_private = object; | 1464 m_private = object; |
| 1465 return *this; | 1465 return *this; |
| 1466 } | 1466 } |
| 1467 | 1467 |
| 1468 WebAXObject::operator AXObject*() const { | 1468 WebAXObject::operator AXObject*() const { |
| 1469 return m_private.get(); | 1469 return m_private.get(); |
| 1470 } | 1470 } |
| 1471 | 1471 |
| 1472 } // namespace blink | 1472 } // namespace blink |
| OLD | NEW |