diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
| commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
| tree | ee905fa007e14522848f571215c1054734db9269 /WebCore/accessibility/AccessibilityImageMapLink.cpp | |
| parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
| download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 | |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/accessibility/AccessibilityImageMapLink.cpp')
| -rw-r--r-- | WebCore/accessibility/AccessibilityImageMapLink.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/accessibility/AccessibilityImageMapLink.cpp b/WebCore/accessibility/AccessibilityImageMapLink.cpp index 9b77400..870efe3 100644 --- a/WebCore/accessibility/AccessibilityImageMapLink.cpp +++ b/WebCore/accessibility/AccessibilityImageMapLink.cpp @@ -59,7 +59,7 @@ AccessibilityObject* AccessibilityImageMapLink::parentObject() const if (m_parent) return m_parent; - if (!m_mapElement || !m_mapElement->renderer()) + if (!m_mapElement.get() || !m_mapElement->renderer()) return 0; return m_mapElement->document()->axObjectCache()->getOrCreate(m_mapElement->renderer()); @@ -84,12 +84,12 @@ Element* AccessibilityImageMapLink::actionElement() const Element* AccessibilityImageMapLink::anchorElement() const { - return m_areaElement; + return m_areaElement.get(); } KURL AccessibilityImageMapLink::url() const { - if (!m_areaElement) + if (!m_areaElement.get()) return KURL(); return m_areaElement->href(); @@ -121,7 +121,7 @@ String AccessibilityImageMapLink::title() const IntRect AccessibilityImageMapLink::elementRect() const { - if (!m_mapElement || !m_areaElement) + if (!m_mapElement.get() || !m_areaElement.get()) return IntRect(); RenderObject* renderer; |