content/browser/frame_host/navigation_entry_screenshot_manager.cc - Issue 213413005: Ensure RenderViewHost is not shut down until a screenshot of the page is taken.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigation_entry_screenshot_manager.cc

Issue 213413005: Ensure RenderViewHost is not shut down until a screenshot of the page is taken. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing some unit tests. Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc ('K') | « chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | content/browser/frame_host/render_frame_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_entry_screenshot_manager.cc

diff --git a/content/browser/frame_host/navigation_entry_screenshot_manager.cc b/content/browser/frame_host/navigation_entry_screenshot_manager.cc

index 1e066323ea29f8bc3489be9fb0b9554d73b36987..abe720df462a376901c71d3b4b0d30d86fcb4e4f 100644

--- a/content/browser/frame_host/navigation_entry_screenshot_manager.cc

+++ b/content/browser/frame_host/navigation_entry_screenshot_manager.cc

@@ -169,8 +169,7 @@ void NavigationEntryScreenshotManager::OnScreenshotTaken(int unique_id,

}

if (!success || bitmap.empty() || bitmap.isNull()) {

- if (!ClearScreenshot(entry))

- OnScreenshotSet(entry);

+ ClearScreenshot(entry);

return;

}

@@ -215,8 +214,8 @@ void NavigationEntryScreenshotManager::OnScreenshotEncodeComplete(

void NavigationEntryScreenshotManager::OnScreenshotSet(

NavigationEntryImpl* entry) {

- if (entry->screenshot().get())

- PurgeScreenshotsIfNecessary();

+ CHECK(entry->screenshot().get());

+ PurgeScreenshotsIfNecessary();

}

bool NavigationEntryScreenshotManager::ClearScreenshot(