Ensure clean layout for a call site of FrameSelection::contains()

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 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:
@@ skipping 997 matching lines @@
     return selectClosestMisspellingFromMouseEvent(mev);
 
   if (!m_frame->editor().behavior().shouldSelectOnContextualMenuClick())
     return;
 
   selectClosestWordOrLinkFromMouseEvent(mev);
 }
 
 void SelectionController::passMousePressEventToSubframe(
     const MouseEventWithHitTestResults& mev) {
+  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
   // If we're clicking into a frame that is selected, the frame will appear
   // greyed out even though we're clicking on the selection.  This looks
   // really strange (having the whole frame be greyed out), so we deselect the
   // selection.
   IntPoint p = m_frame->view()->rootFrameToContents(
       flooredIntPoint(mev.event().positionInRootFrame()));
   if (!selection().contains(p))
     return;
 
-  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-  // needs to be audited.  See http://crbug.com/590369 for more details.
-  m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
   const VisiblePositionInFlatTree& visiblePos =
       visiblePositionOfHitTestResult(mev.hitTestResult());
   if (visiblePos.isNull()) {
     selection().setSelection(SelectionInFlatTree());
     return;
   }
   selection().setSelection(SelectionInFlatTree::Builder()
                                .collapse(visiblePos.toPositionWithAffinity())
                                .build());
 }
@@ skipping 47 matching lines @@
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return (event.event().modifiers() & WebInputEvent::Modifiers::ShiftKey) !=
              0 &&
          !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink