| 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 Document* document = private_->GetDocument(); | 161 Document* document = private_->GetDocument(); |
| 162 if (!document || !document->View()) | 162 if (!document || !document->View()) |
| 163 return false; | 163 return false; |
| 164 document->View()->UpdateLifecycleToCompositingCleanPlusScrolling(); | 164 document->View()->UpdateLifecycleToCompositingCleanPlusScrolling(); |
| 165 } | 165 } |
| 166 | 166 |
| 167 // Doing a layout can cause this object to be invalid, so check again. | 167 // Doing a layout can cause this object to be invalid, so check again. |
| 168 return !IsDetached(); | 168 return !IsDetached(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 WebAXSupportedAction WebAXObject::Action() const { | 171 WebAXDefaultActionVerb WebAXObject::Action() const { |
| 172 if (IsDetached()) | 172 if (IsDetached()) |
| 173 return WebAXSupportedAction::kNone; | 173 return WebAXDefaultActionVerb::kNone; |
| 174 | 174 |
| 175 return static_cast<WebAXSupportedAction>(private_->Action()); | 175 return static_cast<WebAXDefaultActionVerb>(private_->Action()); |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool WebAXObject::CanDecrement() const { | 178 bool WebAXObject::CanDecrement() const { |
| 179 if (IsDetached()) | 179 if (IsDetached()) |
| 180 return false; | 180 return false; |
| 181 | 181 |
| 182 return private_->IsSlider(); | 182 return private_->IsSlider(); |
| 183 } | 183 } |
| 184 | 184 |
| 185 bool WebAXObject::CanIncrement() const { | 185 bool WebAXObject::CanIncrement() const { |
| (...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1553 WebAXObject& WebAXObject::operator=(AXObject* object) { | 1553 WebAXObject& WebAXObject::operator=(AXObject* object) { |
| 1554 private_ = object; | 1554 private_ = object; |
| 1555 return *this; | 1555 return *this; |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 WebAXObject::operator AXObject*() const { | 1558 WebAXObject::operator AXObject*() const { |
| 1559 return private_.Get(); | 1559 return private_.Get(); |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 } // namespace blink | 1562 } // namespace blink |
| OLD | NEW |