Title: [88129] branches/chromium/782/Source/WebCore/accessibility
- Revision
- 88129
- Author
- cev...@google.com
- Date
- 2011-06-04 21:33:34 -0700 (Sat, 04 Jun 2011)
Log Message
Merge 87856
BUG=84950
Review URL: http://codereview.chromium.org/7058064
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.cpp (88128 => 88129)
--- branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.cpp 2011-06-05 03:21:09 UTC (rev 88128)
+++ branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.cpp 2011-06-05 04:33:34 UTC (rev 88129)
@@ -717,6 +717,13 @@
return lineForPosition(visiblePositionForIndex(index, false));
}
+void AccessibilityObject::updateBackingStore()
+{
+ // Updating the layout may delete this object.
+ if (Document* document = this->document())
+ document->updateLayoutIgnorePendingStylesheets();
+}
+
Document* AccessibilityObject::document() const
{
FrameView* frameView = documentFrameView();
Modified: branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.h (88128 => 88129)
--- branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.h 2011-06-05 03:21:09 UTC (rev 88128)
+++ branches/chromium/782/Source/WebCore/accessibility/AccessibilityObject.h 2011-06-05 04:33:34 UTC (rev 88129)
@@ -583,7 +583,7 @@
// allows for an AccessibilityObject to update its render tree or perform
// other operations update type operations
- virtual void updateBackingStore() { }
+ void updateBackingStore();
protected:
AXID m_id;
Modified: branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (88128 => 88129)
--- branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-06-05 03:21:09 UTC (rev 88128)
+++ branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-06-05 04:33:34 UTC (rev 88129)
@@ -3630,15 +3630,6 @@
static_cast<Element*>(domNode)->setAttribute(aria_labelAttr, name);
}
-void AccessibilityRenderObject::updateBackingStore()
-{
- if (!m_renderer)
- return;
-
- // Updating layout may delete m_renderer and this object.
- m_renderer->document()->updateLayoutIgnorePendingStylesheets();
-}
-
static bool isLinkable(const AccessibilityRenderObject& object)
{
if (!object.renderer())
Modified: branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.h (88128 => 88129)
--- branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-06-05 03:21:09 UTC (rev 88128)
+++ branches/chromium/782/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-06-05 04:33:34 UTC (rev 88129)
@@ -245,8 +245,6 @@
virtual String doAXStringForRange(const PlainTextRange&) const;
virtual IntRect doAXBoundsForRange(const PlainTextRange&) const;
- virtual void updateBackingStore();
-
virtual String stringValueForMSAA() const;
virtual String stringRoleForMSAA() const;
virtual String nameForMSAA() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
