| 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 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 outDescriptionFrom = static_cast<WebAXDescriptionFrom>(descriptionFrom); | 971 outDescriptionFrom = static_cast<WebAXDescriptionFrom>(descriptionFrom); |
| 972 | 972 |
| 973 WebVector<WebAXObject> webDescriptionObjects(descriptionObjects.size()); | 973 WebVector<WebAXObject> webDescriptionObjects(descriptionObjects.size()); |
| 974 for (size_t i = 0; i < descriptionObjects.size(); i++) | 974 for (size_t i = 0; i < descriptionObjects.size(); i++) |
| 975 webDescriptionObjects[i] = WebAXObject(descriptionObjects[i]); | 975 webDescriptionObjects[i] = WebAXObject(descriptionObjects[i]); |
| 976 outDescriptionObjects.swap(webDescriptionObjects); | 976 outDescriptionObjects.swap(webDescriptionObjects); |
| 977 | 977 |
| 978 return result; | 978 return result; |
| 979 } | 979 } |
| 980 | 980 |
| 981 WebString WebAXObject::placeholder(WebAXNameFrom nameFrom, | 981 WebString WebAXObject::placeholder(WebAXNameFrom nameFrom) const { |
| 982 WebAXDescriptionFrom descriptionFrom) const { | |
| 983 if (isDetached()) | 982 if (isDetached()) |
| 984 return WebString(); | 983 return WebString(); |
| 985 | 984 |
| 986 return m_private->placeholder( | 985 return m_private->placeholder(static_cast<AXNameFrom>(nameFrom)); |
| 987 static_cast<AXNameFrom>(nameFrom), | |
| 988 static_cast<AXDescriptionFrom>(descriptionFrom)); | |
| 989 } | 986 } |
| 990 | 987 |
| 991 bool WebAXObject::supportsRangeValue() const { | 988 bool WebAXObject::supportsRangeValue() const { |
| 992 if (isDetached()) | 989 if (isDetached()) |
| 993 return false; | 990 return false; |
| 994 | 991 |
| 995 return m_private->supportsRangeValue(); | 992 return m_private->supportsRangeValue(); |
| 996 } | 993 } |
| 997 | 994 |
| 998 WebString WebAXObject::valueDescription() const { | 995 WebString WebAXObject::valueDescription() const { |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1463 WebAXObject& WebAXObject::operator=(AXObject* object) { | 1460 WebAXObject& WebAXObject::operator=(AXObject* object) { |
| 1464 m_private = object; | 1461 m_private = object; |
| 1465 return *this; | 1462 return *this; |
| 1466 } | 1463 } |
| 1467 | 1464 |
| 1468 WebAXObject::operator AXObject*() const { | 1465 WebAXObject::operator AXObject*() const { |
| 1469 return m_private.get(); | 1466 return m_private.get(); |
| 1470 } | 1467 } |
| 1471 | 1468 |
| 1472 } // namespace blink | 1469 } // namespace blink |
| OLD | NEW |