Prune CreateVisiblePositionDeprecated from SurroundingText-related callers

third_party/WebKit/Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 2413 matching lines @@
     ContextLifecycleObserver::trace(visitor);
 }
 
 void Internals::setValueForUser(Element* element, const String& value)
 {
     toHTMLInputElement(element)->setValueForUser(value);
 }
 
 String Internals::textSurroundingNode(Node* node, int x, int y, unsigned long maxLength)
 {
-    if (!node || !node->layoutObject())
+    if (!node)
+        return String();
+
+    // VisiblePosition and SurroundingText must be created with clean layout.
+    node->document().updateStyleAndLayoutIgnorePendingStylesheets();
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(node->document().lifecycle());
+
+    if (!node->layoutObject())
         return String();
     blink::WebPoint point(x, y);
-    SurroundingText surroundingText(createVisiblePositionDeprecated(node->layoutObject()->positionForPoint(static_cast<IntPoint>(point))).deepEquivalent().parentAnchoredEquivalent(), maxLength);
+    SurroundingText surroundingText(createVisiblePosition(node->layoutObject()->positionForPoint(static_cast<IntPoint>(point))).deepEquivalent().parentAnchoredEquivalent(), maxLength);
     return surroundingText.content();
 }
 
 void Internals::setFocused(bool focused)
 {
     if (!frame())
         return;
 
     frame()->page()->focusController().setFocused(focused);
 }
@@ skipping 237 matching lines @@
 
     return ClientRect::create(FloatRect(node->layoutObject()->visualRect()));
 }
 
 void Internals::crash()
 {
     CHECK(false) << "Intentional crash";
 }
 
 } // namespace blink