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

Side by Side Diff: Source/modules/accessibility/AXSVGRoot.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « Source/modules/accessibility/AXSVGRoot.h ('k') | Source/modules/accessibility/AXSlider.h » ('j') | 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 15 matching lines...) Expand all
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "modules/accessibility/AXSVGRoot.h" 30 #include "modules/accessibility/AXSVGRoot.h"
31 31
32 #include "modules/accessibility/AXObjectCacheImpl.h" 32 #include "modules/accessibility/AXObjectCacheImpl.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 AXSVGRoot::AXSVGRoot(RenderObject* renderer, AXObjectCacheImpl* axObjectCache) 36 AXSVGRoot::AXSVGRoot(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
37 : AXRenderObject(renderer, axObjectCache) 37 : AXRenderObject(renderer, axObjectCache)
38 { 38 {
39 } 39 }
40 40
41 AXSVGRoot::~AXSVGRoot() 41 AXSVGRoot::~AXSVGRoot()
42 { 42 {
43 } 43 }
44 44
45 PassRefPtr<AXSVGRoot> AXSVGRoot::create(RenderObject* renderer, AXObjectCacheImp l* axObjectCache) 45 PassRefPtr<AXSVGRoot> AXSVGRoot::create(LayoutObject* renderer, AXObjectCacheImp l* axObjectCache)
46 { 46 {
47 return adoptRef(new AXSVGRoot(renderer, axObjectCache)); 47 return adoptRef(new AXSVGRoot(renderer, axObjectCache));
48 } 48 }
49 49
50 void AXSVGRoot::setParent(AXObject* parent) 50 void AXSVGRoot::setParent(AXObject* parent)
51 { 51 {
52 // Only update the parent to another objcet if it wasn't already set to 52 // Only update the parent to another objcet if it wasn't already set to
53 // something. Multiple elements in an HTML document can reference 53 // something. Multiple elements in an HTML document can reference
54 // the same remote SVG document, and in that case the parent should just 54 // the same remote SVG document, and in that case the parent should just
55 // stay with the first one. 55 // stay with the first one.
56 if (!m_parent || !parent) 56 if (!m_parent || !parent)
57 m_parent = parent; 57 m_parent = parent;
58 } 58 }
59 59
60 AXObject* AXSVGRoot::computeParent() const 60 AXObject* AXSVGRoot::computeParent() const
61 { 61 {
62 // If a parent was set because this is a remote SVG resource, use that 62 // If a parent was set because this is a remote SVG resource, use that
63 // but otherwise, we should rely on the standard render tree for the parent. 63 // but otherwise, we should rely on the standard render tree for the parent.
64 if (m_parent) 64 if (m_parent)
65 return m_parent; 65 return m_parent;
66 66
67 return AXRenderObject::computeParent(); 67 return AXRenderObject::computeParent();
68 } 68 }
69 69
70 70
71 } // namespace blink 71 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXSVGRoot.h ('k') | Source/modules/accessibility/AXSlider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698