Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget()

third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebFrameWidgetBase_h
 #define WebFrameWidgetBase_h
 
 #include "core/CoreExport.h"
 #include "core/clipboard/DataObject.h"
 #include "core/dom/UserGestureIndicator.h"
@@ skipping 87 matching lines @@
 
   // Helper function to call VisualViewport::viewportToRootFrame().
   WebPoint ViewportToRootFrame(const WebPoint& point_in_viewport) const;
 
   WebViewBase* View() const;
 
   // Returns the page object associated with this widget. This may be null when
   // the page is shutting down, but will be valid at all other times.
   Page* GetPage() const;
 
+  // This method returns the focused frame belonging to this WebWidget, that

[dcheng, 2017/06/01 04:20:49]

NIt: colon instead of , before 'that'

[EhsanK, 2017/06/01 13:47:45]

Done.

+  // is, a focused frame with the same local root as the one corresponding
+  // to this widget. It will return nullptr if no frame is focused or, the

[dcheng, 2017/06/01 04:20:49]

Nit: no comma after or

[EhsanK, 2017/06/01 13:47:45]

Done.

+  // focused frame has a different local root.
+  LocalFrame* FocusedLocalFrameInWidget() const;

[dcheng, 2017/06/01 04:20:49]

Let's remove the "InWidget" part since this is a method on WebFrameWidget?

[EhsanK, 2017/06/01 13:47:45]

Acknowledged.

+  LocalFrame* FocusedLocalFrameAvailableForIme() const;

[dcheng, 2017/06/01 04:20:49]

Also, let's add some comments that document the behavior differences between
these two.

(It might be slightly preferred to encode what this method does, rather than how
it's used)

[EhsanK, 2017/06/01 13:47:45]

Agreed. However, I took a second look at usage of this method and apparently
there was only one. I think after I moved IME logic to
WebInputMethodControllerImpl this method became kind of stale. I have removed it
now and explicitly check for |ime_accept_events_| where it used to be called.
Thanks!

+
   // A copy of the web drop data object we received from the browser.
   Persistent<DataObject> current_drag_data_;
 
   bool doing_drag_and_drop_ = false;
 
   // The available drag operations (copy, move link...) allowed by the source.
   WebDragOperation operations_allowed_ = kWebDragOperationNone;
 
   // The current drag operation as negotiated by the source and destination.
   // When not equal to DragOperationNone, the drag data can be dropped onto the
   // current drop target in this WebView (the drop target can accept the drop).
   WebDragOperation drag_operation_ = kWebDragOperationNone;
 
   // Helper function to process events while pointer locked.
   void PointerLockMouseEvent(const WebCoalescedInputEvent&);
 
+  // TODO(ekaramad): Can we remove this and make sure IME events are not called
+  // when there is no page focus?
+  // Represents whether or not this object should process incoming IME events.
+  bool ime_accept_events_ = true;
+
  private:
   void CancelDrag();
-  LocalFrame* FocusedLocalFrameInWidget() const;
 
   static bool ignore_input_events_;
   RefPtr<UserGestureToken> pointer_lock_gesture_token_;
 
   friend class WebViewImpl;
 };
 
 DEFINE_TYPE_CASTS(WebFrameWidgetBase, WebFrameWidget, widget, true, true);
 
 }  // namespace blink
 
 #endif