Skip to content

Commit

Permalink
fix: crash when unloading some WebViews (#40443)
Browse files Browse the repository at this point in the history
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
  • Loading branch information
trop[bot] and codebytere committed Nov 6, 2023
1 parent 66bb063 commit ce7d224
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions shell/browser/web_view_guest_delegate.cc
Expand Up @@ -40,10 +40,6 @@ void WebViewGuestDelegate::AttachToIframe(

content::WebContents* guest_web_contents = api_web_contents_->web_contents();

// Force a refresh of the webPreferences so that OverrideWebkitPrefs runs on
// the new web contents before the renderer process initializes.
// guest_web_contents->NotifyPreferencesChanged();

// Attach this inner WebContents |guest_web_contents| to the outer
// WebContents |embedder_web_contents|. The outer WebContents's
// frame |embedder_frame| hosts the inner WebContents.
Expand Down Expand Up @@ -76,15 +72,18 @@ content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() {
void WebViewGuestDelegate::OnZoomChanged(
const WebContentsZoomController::ZoomChangedEventData& data) {
if (data.web_contents == GetOwnerWebContents()) {
auto* zoom_controller = api_web_contents_->GetZoomController();
if (data.temporary) {
api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(
data.new_zoom_level);
zoom_controller->SetTemporaryZoomLevel(data.new_zoom_level);
} else {
api_web_contents_->GetZoomController()->SetZoomLevel(data.new_zoom_level);
if (blink::PageZoomValuesEqual(data.new_zoom_level,
zoom_controller->GetZoomLevel()))
return;
zoom_controller->SetZoomLevel(data.new_zoom_level);
}
// Change the default zoom factor to match the embedders' new zoom level.
double zoom_factor = blink::PageZoomLevelToZoomFactor(data.new_zoom_level);
api_web_contents_->GetZoomController()->SetDefaultZoomFactor(zoom_factor);
zoom_controller->SetDefaultZoomFactor(zoom_factor);
}
}

Expand Down

0 comments on commit ce7d224

Please sign in to comment.