Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget()

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 100 matching lines @@
       layer_tree_view_(nullptr),
       root_layer_(nullptr),
       root_graphics_layer_(nullptr),
       is_accelerated_compositing_active_(false),
       layer_tree_view_closed_(false),
       suppress_next_keypress_event_(false),
       background_color_override_enabled_(false),
       background_color_override_(Color::kTransparent),
       base_background_color_override_enabled_(false),
       base_background_color_override_(Color::kTransparent),
-      ime_accept_events_(true),
       self_keep_alive_(this) {
   DCHECK(local_root_->GetFrame()->IsLocalRoot());
   InitializeLayerTreeView();
   local_root_->SetFrameWidget(this);
 
   if (local_root->Parent())
     SetBackgroundColorOverride(Color::kTransparent);
 }
 
 WebFrameWidgetImpl::~WebFrameWidgetImpl() {}
@@ skipping 322 matching lines @@
   UpdateBaseBackgroundColor();
 }
 
 void WebFrameWidgetImpl::UpdateBaseBackgroundColor() {
   local_root_->GetFrameView()->SetBaseBackgroundColor(BaseBackgroundColor());
 }
 
 WebInputMethodController*
 WebFrameWidgetImpl::GetActiveWebInputMethodController() const {
   WebLocalFrameBase* local_frame =
-      WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget());
+      WebLocalFrameBase::FromFrame(FocusedLocalFrame());
   return local_frame ? local_frame->GetInputMethodController() : nullptr;
 }
 
 void WebFrameWidgetImpl::ScheduleAnimation() {
   if (layer_tree_view_) {
     layer_tree_view_->SetNeedsBeginFrame();
     return;
   }
   DCHECK(client_);
   client_->ScheduleAnimation();
@@ skipping 56 matching lines @@
           // instead. Note that this has the side effect of moving the
           // caret back to the beginning of the text.
           Position position(element, 0);
           focused_frame->Selection().SetSelection(
               SelectionInDOMTree::Builder().Collapse(position).Build());
         }
       }
     }
     ime_accept_events_ = true;
   } else {
-    LocalFrame* focused_frame = FocusedLocalFrameInWidget();
+    LocalFrame* focused_frame = FocusedLocalFrame();
     if (focused_frame) {
       // Finish an ongoing composition to delete the composition node.
       if (focused_frame->GetInputMethodController().HasComposition()) {
         // TODO(editing-dev): The use of
         // updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
         // See http://crbug.com/590369 for more details.
         focused_frame->GetDocument()
             ->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
         focused_frame->GetInputMethodController().FinishComposingText(
             InputMethodController::kKeepSelection);
       }
       ime_accept_events_ = false;
     }
   }
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 WebRange WebFrameWidgetImpl::CompositionRange() {
-  LocalFrame* focused = FocusedLocalFrameAvailableForIme();
+  if (!ime_accept_events_)
+    return WebRange();
+
+  LocalFrame* focused = FocusedLocalFrame();
   if (!focused)
     return WebRange();
 
   const EphemeralRange range =
       focused->GetInputMethodController().CompositionEphemeralRange();
   if (range.IsNull())
     return WebRange();
 
   Element* editable =
       focused->Selection().RootEditableElementOrDocumentElement();
@@ skipping 12 matching lines @@
   if (!local_root_->GetFrameView())
     return base_background_color_;
   LocalFrameView* view = local_root_->GetFrameView();
   return view->DocumentBackgroundColor().Rgb();
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::SelectionBounds(WebRect& anchor,
                                          WebRect& focus) const {
-  const LocalFrame* local_frame = FocusedLocalFrameInWidget();
+  const LocalFrame* local_frame = FocusedLocalFrame();
   if (!local_frame)
     return false;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   local_frame->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   DocumentLifecycle::DisallowTransitionScope disallow_transition(
       local_frame->GetDocument()->Lifecycle());
 
@@ skipping 25 matching lines @@
 
   if (!selection.ComputeVisibleSelectionInDOMTree().IsBaseFirst())
     std::swap(anchor, focus);
   return true;
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::SelectionTextDirection(WebTextDirection& start,
                                                 WebTextDirection& end) const {
-  const LocalFrame* frame = FocusedLocalFrameInWidget();
+  const LocalFrame* frame = FocusedLocalFrame();
   if (!frame)
     return false;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   frame->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   FrameSelection& selection = frame->Selection();
   if (selection.ComputeVisibleSelectionInDOMTree()
           .ToNormalizedEphemeralRange()
           .IsNull())
     return false;
   start = ToWebTextDirection(PrimaryDirectionOf(
       *selection.ComputeVisibleSelectionInDOMTree().Start().AnchorNode()));
   end = ToWebTextDirection(PrimaryDirectionOf(
       *selection.ComputeVisibleSelectionInDOMTree().end().AnchorNode()));
   return true;
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::IsSelectionAnchorFirst() const {
-  if (const LocalFrame* frame = FocusedLocalFrameInWidget()) {
+  if (const LocalFrame* frame = FocusedLocalFrame()) {
     return frame->Selection()
         .ComputeVisibleSelectionInDOMTreeDeprecated()
         .IsBaseFirst();
   }
   return false;
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 WebRange WebFrameWidgetImpl::CaretOrSelectionRange() {
-  LocalFrame* focused = FocusedLocalFrameInWidget();
+  LocalFrame* focused = FocusedLocalFrame();
   if (!focused)
     return WebRange();
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   focused->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return focused->GetInputMethodController().GetSelectionOffsets();
 }
 
 void WebFrameWidgetImpl::SetTextDirection(WebTextDirection direction) {
   // The Editor::setBaseWritingDirection() function checks if we can change
   // the text direction of the selected node and updates its DOM "dir"
   // attribute and its CSS "direction" property.
   // So, we just call the function as Safari does.
-  const LocalFrame* focused = FocusedLocalFrameInWidget();
+  const LocalFrame* focused = FocusedLocalFrame();
   if (!focused)
     return;
 
   Editor& editor = focused->GetEditor();
   if (!editor.CanEdit())
     return;
 
   switch (direction) {
     case kWebTextDirectionDefault:
       editor.SetBaseWritingDirection(NaturalWritingDirection);
@@ skipping 31 matching lines @@
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
 // code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::GetCompositionCharacterBounds(
     WebVector<WebRect>& bounds) {
   WebRange range = CompositionRange();
   if (range.IsEmpty())
     return false;
 
-  LocalFrame* frame = FocusedLocalFrameInWidget();
+  LocalFrame* frame = FocusedLocalFrame();
   if (!frame)
     return false;
 
   WebLocalFrameBase* web_local_frame = WebLocalFrameBase::FromFrame(frame);
   size_t character_count = range.length();
   size_t offset = range.StartOffset();
   WebVector<WebRect> result(character_count);
   WebRect webrect;
   for (size_t i = 0; i < character_count; ++i) {
     if (!web_local_frame->FirstRectForCharacterRange(offset + i, 1, webrect)) {
@@ skipping 427 matching lines @@
     const IntPoint& pos_in_root_frame) {
   IntPoint doc_point(
       local_root_->GetFrame()->View()->RootFrameToContents(pos_in_root_frame));
   HitTestResult result =
       local_root_->GetFrame()->GetEventHandler().HitTestResultAtPoint(
           doc_point, HitTestRequest::kReadOnly | HitTestRequest::kActive);
   result.SetToShadowHostIfInRestrictedShadowRoot();
   return result;
 }
 
-LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameInWidget() const {
-  LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
-  return (frame && frame->LocalFrameRoot() == local_root_->GetFrame())
-             ? frame
-             : nullptr;
-}
-
-LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
-  if (!ime_accept_events_)
-    return nullptr;
-  return FocusedLocalFrameInWidget();
-}
-
 }  // namespace blink