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

Side by Side Diff: third_party/WebKit/WebCore/page/AccessibilityRenderObject.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
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 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 1265
1266 return text().length(); 1266 return text().length();
1267 } 1267 }
1268 1268
1269 PassRefPtr<Range> AccessibilityRenderObject::ariaSelectedTextDOMRange() const 1269 PassRefPtr<Range> AccessibilityRenderObject::ariaSelectedTextDOMRange() const
1270 { 1270 {
1271 Node* node = m_renderer->element(); 1271 Node* node = m_renderer->element();
1272 if (!node) 1272 if (!node)
1273 return 0; 1273 return 0;
1274 1274
1275 RefPtr<Range> currentSelectionRange = selection().toRange(); 1275 RefPtr<Range> currentSelectionRange = selection().toNormalizedRange();
1276 if (!currentSelectionRange) 1276 if (!currentSelectionRange)
1277 return 0; 1277 return 0;
1278 1278
1279 ExceptionCode ec = 0; 1279 ExceptionCode ec = 0;
1280 if (!currentSelectionRange->intersectsNode(node, ec)) 1280 if (!currentSelectionRange->intersectsNode(node, ec))
1281 return Range::create(currentSelectionRange->ownerDocument()); 1281 return Range::create(currentSelectionRange->ownerDocument());
1282 1282
1283 RefPtr<Range> ariaRange = rangeOfContents(node); 1283 RefPtr<Range> ariaRange = rangeOfContents(node);
1284 Position startPosition, endPosition; 1284 Position startPosition, endPosition;
1285 1285
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2458 } 2458 }
2459 2459
2460 void AccessibilityRenderObject::updateBackingStore() 2460 void AccessibilityRenderObject::updateBackingStore()
2461 { 2461 {
2462 if (!m_renderer) 2462 if (!m_renderer)
2463 return; 2463 return;
2464 m_renderer->view()->layoutIfNeeded(); 2464 m_renderer->view()->layoutIfNeeded();
2465 } 2465 }
2466 2466
2467 } // namespace WebCore 2467 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698