Index: content/browser/frame_host/render_widget_host_view_child_frame.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc |
index ed316e45611a80bd7fdb1c84c13a64e86d009e9d..7e5222d6eff4d121245773184e752b658b3d74ce 100644 |
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc |
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc |
@@ -199,7 +199,12 @@ gfx::Vector2dF RenderWidgetHostViewChildFrame::GetLastScrollOffset() const { |
} |
gfx::NativeView RenderWidgetHostViewChildFrame::GetNativeView() const { |
- NOTREACHED(); |
+ // TODO(ekaramad): To accomodate MimeHandlerViewGuest while embedded inside |
Charlie Reis
2016/09/07 00:22:29
I don't understand-- can you elaborate why this ca
EhsanK
2016/09/08 18:14:57
The issue leading to this change is loading a pdf
|
+ // OOPIF-webview, we need to return the native view to be used by |
+ // RenderWidgetHostViewGuest. Remove this once https://crbug.com/563285 is |
Charlie Reis
2016/09/07 00:22:29
I thought this CL was going to fix https://crbug.c
wjmaclean
2016/09/07 13:32:33
Do we really want to remove this afterwards? It se
EhsanK
2016/09/08 18:14:58
Yes. Initially I did not have a tracking bug for P
|
+ // fixed. |
+ if (frame_connector_) |
+ return frame_connector_->GetParentRenderWidgetHostView()->GetNativeView(); |
wjmaclean
2016/09/07 13:32:33
GetRootRenderWidgetHostView() instead of GetParent
lfg
2016/09/07 14:55:18
I think parent is better than root in this case. I
EhsanK
2016/09/08 18:14:57
Also, but returning the parent, we always end up w
|
return nullptr; |
wjmaclean
2016/09/07 13:32:33
At some point it would be nice to always return a
lfg
2016/09/07 14:55:18
That will happen during construction/destruction,
|
} |