Remove the redundant layout update from WebSurroundingText::textContent

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 40 matching lines @@
     return;
 
   // VisiblePosition and SurroundingText must be created with clean layout.
   node->document().updateStyleAndLayoutIgnorePendingStylesheets();
   DocumentLifecycle::DisallowTransitionScope disallowTransition(
       node->document().lifecycle());
 
   if (!node->layoutObject())
     return;
 
+  // TODO(xiaochengh): The followinng SurroundingText can hold a null Range,
+  // in which case we should prevent it from being stored in |m_privated|.

[tkent, 2016/10/20 05:33:58]

m_privated -> m_private

[Xiaocheng, 2016/10/20 05:37:49]

Done.

   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();
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   webFrame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (Range* range = createRange(
-          webFrame->selection().selection().toNormalizedEphemeralRange()))
+          webFrame->selection().selection().toNormalizedEphemeralRange())) {
+    // TODO(xiaochengh): The followinng SurroundingText can hold a null Range,
+    // in which case we should prevent it from being stored in |m_privated|.

[tkent, 2016/10/20 05:33:58]

m_privated -> m_private

[Xiaocheng, 2016/10/20 05:37:49]

Done.

     m_private.reset(new SurroundingText(*range, maxLength));
+  }
 }
 
 WebString WebSurroundingText::textContent() const {
-  DCHECK(m_private->document());
-
-  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
-  // needs to be audited.  See http://crbug.com/590369 for more details.
-  m_private->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
   return m_private->content();
 }
 
 size_t WebSurroundingText::hitOffsetInTextContent() const {
   DCHECK_EQ(m_private->startOffsetInContent(), m_private->endOffsetInContent());
   return m_private->startOffsetInContent();
 }
 
 size_t WebSurroundingText::startOffsetInTextContent() const {
   return m_private->startOffsetInContent();
 }
 
 size_t WebSurroundingText::endOffsetInTextContent() const {
   return m_private->endOffsetInContent();
 }
 
 bool WebSurroundingText::isNull() const {
   return !m_private.get();
 }
 
 }  // namespace blink