Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: Source/WebCore/accessibility/AccessibilityRenderObject.cpp

Issue 9285027: Merge 103650 - Fix crash when adding paragraph in contenteditable with role=textbox. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/accessibility/textbox-role-on-contenteditable-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple 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 3400 matching lines...) Expand 10 before | Expand all | Expand 10 after
3411 parent->setNeedsToUpdateChildren(); 3411 parent->setNeedsToUpdateChildren();
3412 3412
3413 // These notifications always need to be sent because screenreaders are reliant on them to perform. 3413 // These notifications always need to be sent because screenreaders are reliant on them to perform.
3414 // In other words, they need to be sent even when the screen reader has not accessed this live region since the last update. 3414 // In other words, they need to be sent even when the screen reader has not accessed this live region since the last update.
3415 3415
3416 // If this element supports ARIA live regions, then notify the AT of cha nges. 3416 // If this element supports ARIA live regions, then notify the AT of cha nges.
3417 if (parent->supportsARIALiveRegion()) 3417 if (parent->supportsARIALiveRegion())
3418 axObjectCache()->postNotification(parent, parent->document(), AXObje ctCache::AXLiveRegionChanged, true); 3418 axObjectCache()->postNotification(parent, parent->document(), AXObje ctCache::AXLiveRegionChanged, true);
3419 3419
3420 // If this element is an ARIA text control, notify the AT of changes. 3420 // If this element is an ARIA text control, notify the AT of changes.
3421 if (parent->isARIATextControl() && !parent->isNativeTextControl() && !pa rent->node()->isContentEditable()) 3421 if (parent->isARIATextControl() && !parent->isNativeTextControl() && !pa rent->node()->rendererIsEditable())
3422 axObjectCache()->postNotification(parent, parent->document(), AXObje ctCache::AXValueChanged, true); 3422 axObjectCache()->postNotification(parent, parent->document(), AXObje ctCache::AXValueChanged, true);
3423 } 3423 }
3424 } 3424 }
3425 3425
3426 bool AccessibilityRenderObject::canHaveChildren() const 3426 bool AccessibilityRenderObject::canHaveChildren() const
3427 { 3427 {
3428 if (!m_renderer) 3428 if (!m_renderer)
3429 return false; 3429 return false;
3430 3430
3431 // Elements that should not have children 3431 // Elements that should not have children
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
3911 3911
3912 m_roleForMSAA = msaaRoleForRenderer(m_renderer); 3912 m_roleForMSAA = msaaRoleForRenderer(m_renderer);
3913 3913
3914 if (m_roleForMSAA == UnknownRole) 3914 if (m_roleForMSAA == UnknownRole)
3915 m_roleForMSAA = roleValue(); 3915 m_roleForMSAA = roleValue();
3916 3916
3917 return m_roleForMSAA; 3917 return m_roleForMSAA;
3918 } 3918 }
3919 3919
3920 } // namespace WebCore 3920 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/accessibility/textbox-role-on-contenteditable-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698