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

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

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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) 2013, Google Inc. All rights reserved. 2 * Copyright (C) 2013, Google 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 27 matching lines...) Expand all
38 namespace blink { 38 namespace blink {
39 39
40 using namespace HTMLNames; 40 using namespace HTMLNames;
41 41
42 AXInlineTextBox::AXInlineTextBox(PassRefPtr<AbstractInlineTextBox> inlineTextBox , AXObjectCacheImpl& axObjectCache) 42 AXInlineTextBox::AXInlineTextBox(PassRefPtr<AbstractInlineTextBox> inlineTextBox , AXObjectCacheImpl& axObjectCache)
43 : AXObject(axObjectCache) 43 : AXObject(axObjectCache)
44 , m_inlineTextBox(inlineTextBox) 44 , m_inlineTextBox(inlineTextBox)
45 { 45 {
46 } 46 }
47 47
48 AXInlineTextBox::~AXInlineTextBox() 48 PassRefPtrWillBeRawPtr<AXInlineTextBox> AXInlineTextBox::create(PassRefPtr<Abstr actInlineTextBox> inlineTextBox, AXObjectCacheImpl& axObjectCache)
49 { 49 {
50 if (m_axObjectCache && m_inlineTextBox) 50 return adoptRefWillBeNoop(new AXInlineTextBox(inlineTextBox, axObjectCache)) ;
51 m_axObjectCache->remove(m_inlineTextBox.get());
52 }
53
54 PassRefPtr<AXInlineTextBox> AXInlineTextBox::create(PassRefPtr<AbstractInlineTex tBox> inlineTextBox, AXObjectCacheImpl& axObjectCache)
55 {
56 return adoptRef(new AXInlineTextBox(inlineTextBox, axObjectCache));
57 } 51 }
58 52
59 void AXInlineTextBox::init() 53 void AXInlineTextBox::init()
60 { 54 {
61 } 55 }
62 56
63 void AXInlineTextBox::detach() 57 void AXInlineTextBox::detach()
64 { 58 {
59 AXObject::detach();
65 m_inlineTextBox = nullptr; 60 m_inlineTextBox = nullptr;
66 m_axObjectCache = 0;
67 AXObject::detach();
68 } 61 }
69 62
70 LayoutRect AXInlineTextBox::elementRect() const 63 LayoutRect AXInlineTextBox::elementRect() const
71 { 64 {
72 if (!m_inlineTextBox) 65 if (!m_inlineTextBox)
73 return LayoutRect(); 66 return LayoutRect();
74 67
75 return m_inlineTextBox->bounds(); 68 return m_inlineTextBox->bounds();
76 } 69 }
77 70
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 if (previousOnLine) 169 if (previousOnLine)
177 return m_axObjectCache->getOrCreate(previousOnLine.get()); 170 return m_axObjectCache->getOrCreate(previousOnLine.get());
178 171
179 if (!m_inlineTextBox->isFirst()) 172 if (!m_inlineTextBox->isFirst())
180 return 0; 173 return 0;
181 174
182 return parentObject()->previousOnLine(); 175 return parentObject()->previousOnLine();
183 } 176 }
184 177
185 } // namespace blink 178 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXInlineTextBox.h ('k') | Source/modules/accessibility/AXLayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698