Adding |Node::layoutObject()| null check to |setCaretAtHitTestResult()|

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 634 matching lines @@
 
   const FrameSelection::SetSelectionOptions options =
       FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle;
   selection().setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
                            granularity);
 }
 
 void SelectionController::setCaretAtHitTestResult(
     const HitTestResult& hitTestResult) {
   Node* innerNode = hitTestResult.innerNode();
-  if (!innerNode)
-    return;
-
   const VisiblePositionInFlatTree& visibleHitPos =
       visiblePositionOfHitTestResult(hitTestResult);
   const VisiblePositionInFlatTree& visiblePos =
       visibleHitPos.isNull()
           ? createVisiblePosition(
                 PositionInFlatTree::firstPositionInOrBeforeNode(innerNode))
           : visibleHitPos;
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode,
@@ skipping 217 matching lines @@
 
 bool SelectionController::handleGestureLongPress(
     const PlatformGestureEvent& gestureEvent,
     const HitTestResult& hitTestResult) {
   if (!selection().isAvailable())
     return false;
   if (hitTestResult.isLiveLink())
     return false;
 
   Node* innerNode = hitTestResult.innerNode();
-  if (!innerNode)
+  if (!innerNode || !innerNode->layoutObject())

[yosin_UTC9, 2016/12/01 01:51:09]

Could you hoist call site of this function or father?

Member functions of SelectionController should take sane HitTestResult, e.g.
innerNode() != nullptr && innerNode()->layoutObject() != nullptr

     return false;
   innerNode->document().updateStyleAndLayoutTree();
   bool innerNodeIsSelectable = hasEditableStyle(*innerNode) ||
                                innerNode->isTextNode() ||
                                innerNode->canStartSelection();
   if (!innerNodeIsSelectable)
     return false;
 
   if (selectClosestWordFromHitTestResult(hitTestResult,
                                          AppendTrailingWhitespace::DontAppend,
                                          SelectInputEventType::Touch))
     return selection().isAvailable();
 
   setCaretAtHitTestResult(hitTestResult);
   return false;
 }
 
 void SelectionController::handleGestureTwoFingerTap(
     const GestureEventWithHitTestResults& targetedEvent) {
-  setCaretAtHitTestResult(targetedEvent.hitTestResult());
+  Node* innerNode = targetedEvent.hitTestResult().innerNode();
+  if (innerNode && innerNode->layoutObject())
+    setCaretAtHitTestResult(targetedEvent.hitTestResult());
 }
 
 void SelectionController::handleGestureLongTap(
     const GestureEventWithHitTestResults& targetedEvent) {
-  setCaretAtHitTestResult(targetedEvent.hitTestResult());
+  Node* innerNode = targetedEvent.hitTestResult().innerNode();
+  if (innerNode && innerNode->layoutObject())
+    setCaretAtHitTestResult(targetedEvent.hitTestResult());
 }
 
 static bool hitTestResultIsMisspelled(const HitTestResult& result) {
   Node* innerNode = result.innerNode();
   if (!innerNode || !innerNode->layoutObject())
     return false;
   VisiblePosition pos = createVisiblePosition(
       innerNode->layoutObject()->positionForPoint(result.localPoint()));
   if (pos.isNull())
     return false;
@@ skipping 92 matching lines @@
   return event.event().altKey() && event.isOverLink();
 }
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink