OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 return parent_view->GetVisibleViewportSize(); | 202 return parent_view->GetVisibleViewportSize(); |
203 } | 203 } |
204 return GetViewBounds().size(); | 204 return GetViewBounds().size(); |
205 } | 205 } |
206 | 206 |
207 gfx::Vector2dF RenderWidgetHostViewChildFrame::GetLastScrollOffset() const { | 207 gfx::Vector2dF RenderWidgetHostViewChildFrame::GetLastScrollOffset() const { |
208 return last_scroll_offset_; | 208 return last_scroll_offset_; |
209 } | 209 } |
210 | 210 |
211 gfx::NativeView RenderWidgetHostViewChildFrame::GetNativeView() const { | 211 gfx::NativeView RenderWidgetHostViewChildFrame::GetNativeView() const { |
212 NOTREACHED(); | 212 // TODO(ekarmaad): To accomodate MimeHandlerViewGuest while embedded inside |
213 // OOPIF-webview, we need to return the native view to be used by | |
214 // RenderWidgetHostViewGuest. Remove this once https://crbug.com/563285 is | |
215 // fixed. | |
216 if (frame_connector_) | |
217 return frame_connector_->GetRootRenderWidgetHostView()->GetNativeView(); | |
lfg
2016/07/28 18:29:31
I think this should be using GetParentRenderWidget
EhsanK
2016/07/29 20:23:17
Acknowledged.
| |
213 return nullptr; | 218 return nullptr; |
214 } | 219 } |
215 | 220 |
216 gfx::NativeViewAccessible | 221 gfx::NativeViewAccessible |
217 RenderWidgetHostViewChildFrame::GetNativeViewAccessible() { | 222 RenderWidgetHostViewChildFrame::GetNativeViewAccessible() { |
218 NOTREACHED(); | 223 NOTREACHED(); |
219 return nullptr; | 224 return nullptr; |
220 } | 225 } |
221 | 226 |
222 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) { | 227 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) { |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
700 | 705 |
701 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { | 706 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { |
702 return true; | 707 return true; |
703 } | 708 } |
704 | 709 |
705 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 710 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
706 return surface_id_; | 711 return surface_id_; |
707 }; | 712 }; |
708 | 713 |
709 } // namespace content | 714 } // namespace content |
OLD | NEW |