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

Side by Side Diff: Source/core/accessibility/AXRenderObject.cpp

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix unit test failures Created 6 years, 2 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "core/page/Page.h" 56 #include "core/page/Page.h"
57 #include "core/rendering/HitTestResult.h" 57 #include "core/rendering/HitTestResult.h"
58 #include "core/rendering/RenderFieldset.h" 58 #include "core/rendering/RenderFieldset.h"
59 #include "core/rendering/RenderFileUploadControl.h" 59 #include "core/rendering/RenderFileUploadControl.h"
60 #include "core/rendering/RenderHTMLCanvas.h" 60 #include "core/rendering/RenderHTMLCanvas.h"
61 #include "core/rendering/RenderImage.h" 61 #include "core/rendering/RenderImage.h"
62 #include "core/rendering/RenderInline.h" 62 #include "core/rendering/RenderInline.h"
63 #include "core/rendering/RenderLayer.h" 63 #include "core/rendering/RenderLayer.h"
64 #include "core/rendering/RenderListMarker.h" 64 #include "core/rendering/RenderListMarker.h"
65 #include "core/rendering/RenderMenuList.h" 65 #include "core/rendering/RenderMenuList.h"
66 #include "core/rendering/RenderPart.h"
66 #include "core/rendering/RenderTextControlSingleLine.h" 67 #include "core/rendering/RenderTextControlSingleLine.h"
67 #include "core/rendering/RenderTextFragment.h" 68 #include "core/rendering/RenderTextFragment.h"
68 #include "core/rendering/RenderView.h" 69 #include "core/rendering/RenderView.h"
69 #include "core/rendering/RenderWidget.h"
70 #include "core/svg/SVGDocumentExtensions.h" 70 #include "core/svg/SVGDocumentExtensions.h"
71 #include "core/svg/SVGSVGElement.h" 71 #include "core/svg/SVGSVGElement.h"
72 #include "core/svg/graphics/SVGImage.h" 72 #include "core/svg/graphics/SVGImage.h"
73 #include "platform/text/PlatformLocale.h" 73 #include "platform/text/PlatformLocale.h"
74 #include "wtf/StdLibExtras.h" 74 #include "wtf/StdLibExtras.h"
75 75
76 using blink::WebLocalizedString; 76 using blink::WebLocalizedString;
77 77
78 namespace blink { 78 namespace blink {
79 79
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 return toElement(node); 1581 return toElement(node);
1582 } 1582 }
1583 1583
1584 return 0; 1584 return 0;
1585 } 1585 }
1586 1586
1587 Widget* AXRenderObject::widgetForAttachmentView() const 1587 Widget* AXRenderObject::widgetForAttachmentView() const
1588 { 1588 {
1589 if (!isAttachment()) 1589 if (!isAttachment())
1590 return 0; 1590 return 0;
1591 return toRenderWidget(m_renderer)->widget(); 1591 return toRenderPart(m_renderer)->widget();
1592 } 1592 }
1593 1593
1594 // 1594 //
1595 // Selected text. 1595 // Selected text.
1596 // 1596 //
1597 1597
1598 AXObject::PlainTextRange AXRenderObject::selectedTextRange() const 1598 AXObject::PlainTextRange AXRenderObject::selectedTextRange() const
1599 { 1599 {
1600 if (!isTextControl()) 1600 if (!isTextControl())
1601 return PlainTextRange(); 1601 return PlainTextRange();
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
2374 if (label && label->renderer()) { 2374 if (label && label->renderer()) {
2375 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect(); 2375 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect();
2376 result.unite(labelRect); 2376 result.unite(labelRect);
2377 } 2377 }
2378 } 2378 }
2379 2379
2380 return result; 2380 return result;
2381 } 2381 }
2382 2382
2383 } // namespace blink 2383 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698