Ensure clean layout before calling plainText() (flat tree version)

third_party/WebKit/Source/core/editing/FrameSelection.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1053 matching lines @@
 
 String FrameSelection::selectedHTMLForClipboard() const
 {
     const VisibleSelectionInFlatTree& visibleSelection = this->visibleSelection<EditingInFlatTreeStrategy>();
     const EphemeralRangeInFlatTree& range = visibleSelection.toNormalizedEphemeralRange();
     return createMarkup(range.startPosition(), range.endPosition(), AnnotateForInterchange, ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
 }
 
 String FrameSelection::selectedText(TextIteratorBehavior behavior) const
 {
+    if (!isAvailable())
+        return emptyString();
+
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    m_document->updateStyleAndLayoutIgnorePendingStylesheets();
+
     return extractSelectedText(*this, behavior);
 }
 
 String FrameSelection::selectedTextForClipboard() const

[yosin_UTC9, 2016/08/31 04:58:21]

There are only three call sites of selectedTextForClipboard(), we should call
updateLayout() in there.

[Xiaocheng, 2016/09/02 05:37:24]

I guess the layout is already clean when called from
DragController::populateDragDataTransfer() since it computes a HitTestResult
which can only be done with clean layout?

Done for the other two call sites.

 {
+    if (!isAvailable())
+        return emptyString();
+
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    m_document->updateStyleAndLayoutIgnorePendingStylesheets();
+
     if (m_frame->settings() && m_frame->settings()->selectionIncludesAltImageText())
         return extractSelectedText(*this, TextIteratorEmitsImageAltText);
     return selectedText();

[yosin_UTC9, 2016/08/31 04:58:21]

It seems we can replace |selectedText()| call to |extractSelectedText(*this,
TextIteratorDefaultBehavior);|.

[Xiaocheng, 2016/09/02 05:37:24]

Makes sense. Done.

 }
 
 LayoutRect FrameSelection::bounds() const
 {
     FrameView* view = m_frame->view();
     if (!view)
         return LayoutRect();
 
     return intersection(unclippedBounds(), LayoutRect(view->visibleContentRect()));
 }
@@ skipping 280 matching lines @@
 
 void showTree(const blink::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
     else
         fprintf(stderr, "Cannot showTree for (nil) FrameSelection.\n");
 }
 
 #endif