Commit 836c945e authored by Lucas Furukawa Gadani's avatar Lucas Furukawa Gadani Committed by Commit Bot

Remove usages of WebContents::GetRenderViewHost().

This CL was uploaded by git cl split.

R=hanxi@chromium.org

Bug: 1142671
Change-Id: I527f1a4dda878d289ac3542336b87737bd377f8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500590
Auto-Submit: Lucas Gadani <lfg@chromium.org>
Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Commit-Queue: Xi Han <hanxi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821422}
parent 293c504e
...@@ -73,10 +73,11 @@ void ExtensionsGuestViewManagerDelegate::DispatchEvent( ...@@ -73,10 +73,11 @@ void ExtensionsGuestViewManagerDelegate::DispatchEvent(
return; // Could happen at tab shutdown. return; // Could happen at tab shutdown.
EventRouter::DispatchEventToSender( EventRouter::DispatchEventToSender(
owner->GetRenderViewHost(), guest->browser_context(), guest->owner_host(), owner->GetMainFrame()->GetRenderViewHost(), guest->browser_context(),
histogram_value, event_name, content::ChildProcessHost::kInvalidUniqueID, guest->owner_host(), histogram_value, event_name,
extensions::kMainThreadId, blink::mojom::kInvalidServiceWorkerVersionId, content::ChildProcessHost::kInvalidUniqueID, extensions::kMainThreadId,
std::move(event_args), info); blink::mojom::kInvalidServiceWorkerVersionId, std::move(event_args),
info);
} }
bool ExtensionsGuestViewManagerDelegate::IsGuestAvailableToContext( bool ExtensionsGuestViewManagerDelegate::IsGuestAvailableToContext(
......
...@@ -583,8 +583,12 @@ int WebViewGuest::GetTaskPrefix() const { ...@@ -583,8 +583,12 @@ int WebViewGuest::GetTaskPrefix() const {
void WebViewGuest::GuestDestroyed() { void WebViewGuest::GuestDestroyed() {
WebViewRendererState::GetInstance()->RemoveGuest( WebViewRendererState::GetInstance()->RemoveGuest(
web_contents()->GetRenderViewHost()->GetProcess()->GetID(), web_contents()
web_contents()->GetRenderViewHost()->GetRoutingID()); ->GetMainFrame()
->GetRenderViewHost()
->GetProcess()
->GetID(),
web_contents()->GetMainFrame()->GetRenderViewHost()->GetRoutingID());
} }
void WebViewGuest::GuestReady() { void WebViewGuest::GuestReady() {
...@@ -1090,8 +1094,13 @@ void WebViewGuest::PushWebViewStateToIOThread() { ...@@ -1090,8 +1094,13 @@ void WebViewGuest::PushWebViewStateToIOThread() {
web_view_info.embedder_process_id, web_view_info.instance_id); web_view_info.embedder_process_id, web_view_info.instance_id);
WebViewRendererState::GetInstance()->AddGuest( WebViewRendererState::GetInstance()->AddGuest(
web_contents()->GetRenderViewHost()->GetProcess()->GetID(), web_contents()
web_contents()->GetRenderViewHost()->GetRoutingID(), web_view_info); ->GetMainFrame()
->GetRenderViewHost()
->GetProcess()
->GetID(),
web_contents()->GetMainFrame()->GetRenderViewHost()->GetRoutingID(),
web_view_info);
} }
void WebViewGuest::RequestMediaAccessPermission( void WebViewGuest::RequestMediaAccessPermission(
...@@ -1315,14 +1324,22 @@ void WebViewGuest::SetAllowTransparency(bool allow) { ...@@ -1315,14 +1324,22 @@ void WebViewGuest::SetAllowTransparency(bool allow) {
return; return;
allow_transparency_ = allow; allow_transparency_ = allow;
if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) if (!web_contents()
->GetMainFrame()
->GetRenderViewHost()
->GetWidget()
->GetView())
return; return;
SetTransparency(); SetTransparency();
} }
void WebViewGuest::SetTransparency() { void WebViewGuest::SetTransparency() {
auto* view = web_contents()->GetRenderViewHost()->GetWidget()->GetView(); auto* view = web_contents()
->GetMainFrame()
->GetRenderViewHost()
->GetWidget()
->GetView();
if (allow_transparency_) if (allow_transparency_)
view->SetBackgroundColor(SK_ColorTRANSPARENT); view->SetBackgroundColor(SK_ColorTRANSPARENT);
else else
...@@ -1650,6 +1667,7 @@ void WebViewGuest::SetFullscreenState(bool is_fullscreen) { ...@@ -1650,6 +1667,7 @@ void WebViewGuest::SetFullscreenState(bool is_fullscreen) {
// Since we changed fullscreen state, sending a SynchronizeVisualProperties // Since we changed fullscreen state, sending a SynchronizeVisualProperties
// message ensures that renderer/ sees the change. // message ensures that renderer/ sees the change.
web_contents() web_contents()
->GetMainFrame()
->GetRenderViewHost() ->GetRenderViewHost()
->GetWidget() ->GetWidget()
->SynchronizeVisualProperties(); ->SynchronizeVisualProperties();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment