Chromium Code Reviews| 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 return parent_view->GetVisibleViewportSize(); | 192 return parent_view->GetVisibleViewportSize(); |
| 193 } | 193 } |
| 194 return GetViewBounds().size(); | 194 return GetViewBounds().size(); |
| 195 } | 195 } |
| 196 | 196 |
| 197 gfx::Vector2dF RenderWidgetHostViewChildFrame::GetLastScrollOffset() const { | 197 gfx::Vector2dF RenderWidgetHostViewChildFrame::GetLastScrollOffset() const { |
| 198 return last_scroll_offset_; | 198 return last_scroll_offset_; |
| 199 } | 199 } |
| 200 | 200 |
| 201 gfx::NativeView RenderWidgetHostViewChildFrame::GetNativeView() const { | 201 gfx::NativeView RenderWidgetHostViewChildFrame::GetNativeView() const { |
| 202 NOTREACHED(); | 202 // 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
| |
| 203 // OOPIF-webview, we need to return the native view to be used by | |
| 204 // 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
| |
| 205 // fixed. | |
| 206 if (frame_connector_) | |
| 207 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
| |
| 203 return nullptr; | 208 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,
| |
| 204 } | 209 } |
| 205 | 210 |
| 206 gfx::NativeViewAccessible | 211 gfx::NativeViewAccessible |
| 207 RenderWidgetHostViewChildFrame::GetNativeViewAccessible() { | 212 RenderWidgetHostViewChildFrame::GetNativeViewAccessible() { |
| 208 NOTREACHED(); | 213 NOTREACHED(); |
| 209 return nullptr; | 214 return nullptr; |
| 210 } | 215 } |
| 211 | 216 |
| 212 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) { | 217 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) { |
| 213 RenderWidgetHostViewBase::SetBackgroundColor(color); | 218 RenderWidgetHostViewBase::SetBackgroundColor(color); |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 709 | 714 |
| 710 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { | 715 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { |
| 711 return true; | 716 return true; |
| 712 } | 717 } |
| 713 | 718 |
| 714 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 719 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
| 715 return surface_id_; | 720 return surface_id_; |
| 716 }; | 721 }; |
| 717 | 722 |
| 718 } // namespace content | 723 } // namespace content |
| OLD | NEW |