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

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

Issue 7058064: Merge 87856 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 return plainTextRangeForVisiblePositionRange(range); 710 return plainTextRangeForVisiblePositionRange(range);
711 } 711 }
712 712
713 // Given an indexed character, the line number of the text associated with this accessibility 713 // Given an indexed character, the line number of the text associated with this accessibility
714 // object that contains the character. 714 // object that contains the character.
715 unsigned AccessibilityObject::doAXLineForIndex(unsigned index) 715 unsigned AccessibilityObject::doAXLineForIndex(unsigned index)
716 { 716 {
717 return lineForPosition(visiblePositionForIndex(index, false)); 717 return lineForPosition(visiblePositionForIndex(index, false));
718 } 718 }
719 719
720 void AccessibilityObject::updateBackingStore()
721 {
722 // Updating the layout may delete this object.
723 if (Document* document = this->document())
724 document->updateLayoutIgnorePendingStylesheets();
725 }
726
720 Document* AccessibilityObject::document() const 727 Document* AccessibilityObject::document() const
721 { 728 {
722 FrameView* frameView = documentFrameView(); 729 FrameView* frameView = documentFrameView();
723 if (!frameView) 730 if (!frameView)
724 return 0; 731 return 0;
725 732
726 return frameView->frame()->document(); 733 return frameView->frame()->document();
727 } 734 }
728 735
729 FrameView* AccessibilityObject::documentFrameView() const 736 FrameView* AccessibilityObject::documentFrameView() const
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 const AtomicString& result = getAttribute(aria_checkedAttr); 1101 const AtomicString& result = getAttribute(aria_checkedAttr);
1095 if (equalIgnoringCase(result, "true")) 1102 if (equalIgnoringCase(result, "true"))
1096 return ButtonStateOn; 1103 return ButtonStateOn;
1097 if (equalIgnoringCase(result, "mixed")) 1104 if (equalIgnoringCase(result, "mixed"))
1098 return ButtonStateMixed; 1105 return ButtonStateMixed;
1099 1106
1100 return ButtonStateOff; 1107 return ButtonStateOff;
1101 } 1108 }
1102 1109
1103 } // namespace WebCore 1110 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/accessibility/AccessibilityObject.h ('k') | Source/WebCore/accessibility/AccessibilityRenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698