content/browser/media/cdm/browser_cdm_manager.cc - Issue 733533002: Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid

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/media/cdm/browser_cdm_manager.cc

Issue 733533002: Do not start RunLoop of MessagePumpForUI in NestedMessagePumpAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Skip quit request when loop isn't running Created 6 years, 1 month 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

« no previous file with comments | « content/browser/browser_main_runner.cc ('k') | content/public/test/nested_message_pump_android.cc » ('j') | content/test/content_browser_test_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index d3d4630cb08b54547ac2494d541e47b9589d7875..25569521556dd50106380ae464b87daf188dbbf5 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -81,7 +81,11 @@ BrowserCdmManager::~BrowserCdmManager() {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

DCHECK(g_browser_cdm_manager_map.Get().count(render_process_id_));

- g_browser_cdm_manager_map.Get().erase(render_process_id_);

+ // If an entry of |render_process_id| was overwritten, we shouldn't remove

+ // the entry. For example, see FrameTreeBrowserTest.FrameTreeAfterCrash test,

+ // and http://crbug.com/430251.

+ if (g_browser_cdm_manager_map.Get()[render_process_id_] == this)

Sami 2014/11/18 12:02:25 Should this change be in a different patch? It see

ncarter (slow) 2014/11/18 18:02:53 I believe the fix (which runs some DeleteSoons tha

Jaekyun Seok (inactive) 2014/11/18 22:38:22 Right, this fix exposes the same issue to bug 4302

+ g_browser_cdm_manager_map.Get().erase(render_process_id_);

}

// Makes sure BrowserCdmManager is always deleted on the Browser UI thread.

« no previous file with comments | « content/browser/browser_main_runner.cc ('k') | content/public/test/nested_message_pump_android.cc » ('j') | content/test/content_browser_test_test.cc » ('J')