| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 return m_private->ariaAutoComplete(); | 274 return m_private->ariaAutoComplete(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 WebAXAriaCurrentState WebAXObject::ariaCurrentState() const { | 277 WebAXAriaCurrentState WebAXObject::ariaCurrentState() const { |
| 278 if (isDetached()) | 278 if (isDetached()) |
| 279 return WebAXAriaCurrentStateUndefined; | 279 return WebAXAriaCurrentStateUndefined; |
| 280 | 280 |
| 281 return static_cast<WebAXAriaCurrentState>(m_private->ariaCurrentState()); | 281 return static_cast<WebAXAriaCurrentState>(m_private->ariaCurrentState()); |
| 282 } | 282 } |
| 283 | 283 |
| 284 bool WebAXObject::isButtonStateMixed() const { | 284 bool WebAXObject::isCheckable() const { |
| 285 if (isDetached()) | 285 return !isDetached() && m_private->isCheckable(); |
| 286 return false; | |
| 287 | |
| 288 return m_private->checkboxOrRadioValue() == ButtonStateMixed; | |
| 289 } | 286 } |
| 290 | 287 |
| 291 bool WebAXObject::isChecked() const { | 288 WebAXCheckedState WebAXObject::checkedState() const { |
| 292 if (isDetached()) | 289 if (isDetached()) |
| 293 return false; | 290 return WebAXCheckedFalse; |
| 294 | 291 |
| 295 return m_private->isChecked(); | 292 return static_cast<WebAXCheckedState>(m_private->checkedState()); |
| 296 } | 293 } |
| 297 | 294 |
| 298 bool WebAXObject::isClickable() const { | 295 bool WebAXObject::isClickable() const { |
| 299 if (isDetached()) | 296 if (isDetached()) |
| 300 return false; | 297 return false; |
| 301 | 298 |
| 302 return m_private->isClickable(); | 299 return m_private->isClickable(); |
| 303 } | 300 } |
| 304 | 301 |
| 305 bool WebAXObject::isCollapsed() const { | 302 bool WebAXObject::isCollapsed() const { |
| (...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1532 WebAXObject& WebAXObject::operator=(AXObject* object) { | 1529 WebAXObject& WebAXObject::operator=(AXObject* object) { |
| 1533 m_private = object; | 1530 m_private = object; |
| 1534 return *this; | 1531 return *this; |
| 1535 } | 1532 } |
| 1536 | 1533 |
| 1537 WebAXObject::operator AXObject*() const { | 1534 WebAXObject::operator AXObject*() const { |
| 1538 return m_private.get(); | 1535 return m_private.get(); |
| 1539 } | 1536 } |
| 1540 | 1537 |
| 1541 } // namespace blink | 1538 } // namespace blink |
| OLD | NEW |