Prune CreateVisiblePositionDeprecated from SurroundingText-related callers

third_party/WebKit/Source/web/WebSurroundingText.cpp

 /*
  * Copyright (C) 2012 Google 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
 {
 }
 
 WebSurroundingText::~WebSurroundingText()
 {
 }
 
 void WebSurroundingText::initialize(const WebNode& webNode, const WebPoint& nodePoint, size_t maxLength)
 {
     const Node* node = webNode.constUnwrap<Node>();
-    if (!node || !node->layoutObject())
+    if (!node)
         return;
 
-    m_private.reset(new SurroundingText(createVisiblePositionDeprecated(node->layoutObject()->positionForPoint(static_cast<IntPoint>(nodePoint))).deepEquivalent().parentAnchoredEquivalent(), maxLength));
+    // VisiblePosition and SurroundingText must be created with clean layout.
+    node->document().updateStyleAndLayoutIgnorePendingStylesheets();
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(node->document().lifecycle());
+
+    if (!node->layoutObject())
+        return;
+
+    m_private.reset(new SurroundingText(createVisiblePosition(node->layoutObject()->positionForPoint(static_cast<IntPoint>(nodePoint))).deepEquivalent().parentAnchoredEquivalent(), maxLength));
 }
 
 void WebSurroundingText::initializeFromCurrentSelection(WebLocalFrame* frame, size_t maxLength)
 {
     LocalFrame* webFrame = toWebLocalFrameImpl(frame)->frame();
     if (Range* range = createRange(webFrame->selection().selection().toNormalizedEphemeralRange()))
         m_private.reset(new SurroundingText(*range, maxLength));
 }
 
 WebString WebSurroundingText::textContent() const
@@ skipping 16 matching lines @@
 {
     return m_private->endOffsetInContent();
 }
 
 bool WebSurroundingText::isNull() const
 {
     return !m_private.get();
 }
 
 } // namespace blink