| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014, Google Inc. All rights reserved. | 2 * Copyright (C) 2014, 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "modules/accessibility/AXObjectCacheImpl.h" | 29 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 30 | 30 |
| 31 #include "core/HTMLNames.h" | 31 #include "core/HTMLNames.h" |
| 32 #include "core/InputTypeNames.h" | 32 #include "core/InputTypeNames.h" |
| 33 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 34 #include "core/editing/EditingUtilities.h" | 34 #include "core/editing/EditingUtilities.h" |
| 35 #include "core/frame/FrameView.h" | 35 #include "core/frame/FrameView.h" |
| 36 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
| 37 #include "core/frame/Settings.h" | 37 #include "core/frame/Settings.h" |
| 38 #include "core/html/HTMLAreaElement.h" | 38 #include "core/html/HTMLAreaElement.h" |
| 39 #include "core/html/HTMLCanvasElement.h" |
| 39 #include "core/html/HTMLImageElement.h" | 40 #include "core/html/HTMLImageElement.h" |
| 40 #include "core/html/HTMLInputElement.h" | 41 #include "core/html/HTMLInputElement.h" |
| 41 #include "core/html/HTMLLabelElement.h" | 42 #include "core/html/HTMLLabelElement.h" |
| 42 #include "core/html/HTMLOptionElement.h" | 43 #include "core/html/HTMLOptionElement.h" |
| 43 #include "core/html/HTMLSelectElement.h" | 44 #include "core/html/HTMLSelectElement.h" |
| 44 #include "core/layout/LayoutListBox.h" | 45 #include "core/layout/LayoutListBox.h" |
| 45 #include "core/layout/LayoutMenuList.h" | 46 #include "core/layout/LayoutMenuList.h" |
| 46 #include "core/layout/LayoutProgress.h" | 47 #include "core/layout/LayoutProgress.h" |
| 47 #include "core/layout/LayoutSlider.h" | 48 #include "core/layout/LayoutSlider.h" |
| 48 #include "core/layout/LayoutTable.h" | 49 #include "core/layout/LayoutTable.h" |
| (...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1258 // Ignore events on a frame or plug-in, because the touch events | 1259 // Ignore events on a frame or plug-in, because the touch events |
| 1259 // will be re-targeted there and we don't want to fire duplicate | 1260 // will be re-targeted there and we don't want to fire duplicate |
| 1260 // accessibility events. | 1261 // accessibility events. |
| 1261 if (hit->getLayoutObject() && hit->getLayoutObject()->isLayoutPart()) | 1262 if (hit->getLayoutObject() && hit->getLayoutObject()->isLayoutPart()) |
| 1262 return; | 1263 return; |
| 1263 | 1264 |
| 1264 postPlatformNotification(hit, AXHover); | 1265 postPlatformNotification(hit, AXHover); |
| 1265 } | 1266 } |
| 1266 } | 1267 } |
| 1267 | 1268 |
| 1268 void AXObjectCacheImpl::setCanvasObjectBounds(Element* element, const LayoutRect
& rect) | 1269 void AXObjectCacheImpl::setCanvasObjectBounds(HTMLCanvasElement* canvas, Element
* element, const LayoutRect& rect) |
| 1269 { | 1270 { |
| 1270 AXObject* obj = getOrCreate(element); | 1271 AXObject* obj = getOrCreate(element); |
| 1271 if (!obj) | 1272 if (!obj) |
| 1272 return; | 1273 return; |
| 1273 | 1274 |
| 1274 obj->setElementRect(rect); | 1275 AXObject* axCanvas = getOrCreate(canvas); |
| 1276 if (!axCanvas) |
| 1277 return; |
| 1278 |
| 1279 obj->setElementRect(rect, axCanvas); |
| 1275 } | 1280 } |
| 1276 | 1281 |
| 1277 DEFINE_TRACE(AXObjectCacheImpl) | 1282 DEFINE_TRACE(AXObjectCacheImpl) |
| 1278 { | 1283 { |
| 1279 visitor->trace(m_document); | 1284 visitor->trace(m_document); |
| 1280 visitor->trace(m_nodeObjectMapping); | 1285 visitor->trace(m_nodeObjectMapping); |
| 1281 | 1286 |
| 1282 visitor->trace(m_objects); | 1287 visitor->trace(m_objects); |
| 1283 visitor->trace(m_notificationsToPost); | 1288 visitor->trace(m_notificationsToPost); |
| 1284 | 1289 |
| 1285 AXObjectCache::trace(visitor); | 1290 AXObjectCache::trace(visitor); |
| 1286 } | 1291 } |
| 1287 | 1292 |
| 1288 } // namespace blink | 1293 } // namespace blink |
| OLD | NEW |