Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget()

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

Index: third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h
diff --git a/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h b/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h
index eecd3144c82ad584c71e0691039856a3df9cc180..3e4ebe8af955937bd9360c01d435ea9104edebaf 100644
--- a/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h
+++ b/third_party/WebKit/Source/core/frame/WebFrameWidgetBase.h
@@ -105,6 +105,13 @@ class CORE_EXPORT WebFrameWidgetBase
   // 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_;
 
@@ -121,9 +128,13 @@ class CORE_EXPORT WebFrameWidgetBase
   // 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_;