Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
index ba03ef4..10b5094 100644
--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -222,9 +222,9 @@ static VisiblePosition updateAXLineStartForVisiblePosition(const VisiblePosition
         if (tempPosition.isNull())
             break;
         p = tempPosition.deepEquivalent();
-        if (!p.node())
+        if (!p.deprecatedNode())
             break;
-        renderer = p.node()->renderer();
+        renderer = p.deprecatedNode()->renderer();
         if (!renderer || (renderer->isRenderBlock() && !p.deprecatedEditingOffset()))
             break;
         InlineBox* box;
@@ -318,7 +318,7 @@ VisiblePositionRange AccessibilityObject::paragraphForPosition(const VisiblePosi
 
 static VisiblePosition startOfStyleRange(const VisiblePosition visiblePos)
 {
-    RenderObject* renderer = visiblePos.deepEquivalent().node()->renderer();
+    RenderObject* renderer = visiblePos.deepEquivalent().deprecatedNode()->renderer();
     RenderObject* startRenderer = renderer;
     RenderStyle* style = renderer->style();
 
@@ -336,12 +336,12 @@ static VisiblePosition startOfStyleRange(const VisiblePosition visiblePos)
         startRenderer = r;
     }
 
-    return VisiblePosition(startRenderer->node(), 0, VP_DEFAULT_AFFINITY);
+    return firstPositionInOrBeforeNode(startRenderer->node());
 }
 
 static VisiblePosition endOfStyleRange(const VisiblePosition& visiblePos)
 {
-    RenderObject* renderer = visiblePos.deepEquivalent().node()->renderer();
+    RenderObject* renderer = visiblePos.deepEquivalent().deprecatedNode()->renderer();
     RenderObject* endRenderer = renderer;
     RenderStyle* style = renderer->style();
 
@@ -359,7 +359,7 @@ static VisiblePosition endOfStyleRange(const VisiblePosition& visiblePos)
         endRenderer = r;
     }
 
-    return lastDeepEditingPositionForNode(endRenderer->node());
+    return lastPositionInOrAfterNode(endRenderer->node());
 }
 
 VisiblePositionRange AccessibilityObject::styleRangeForPosition(const VisiblePosition& visiblePos) const
@@ -649,7 +649,7 @@ AccessibilityObject* AccessibilityObject::accessibilityObjectForPosition(const V
     if (visiblePos.isNull())
         return 0;
 
-    RenderObject* obj = visiblePos.deepEquivalent().node()->renderer();
+    RenderObject* obj = visiblePos.deepEquivalent().deprecatedNode()->renderer();
     if (!obj)
         return 0;