webkit/tools/test_shell/test_shell.cc - Issue 7497030: PluginList cleanup

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: webkit/tools/test_shell/test_shell.cc

Issue 7497030: PluginList cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix crash Created 9 years, 5 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:

Index: webkit/tools/test_shell/test_shell.cc

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc

index 651635c8d06d8703cb26af1128f7536c669ffa6e..46d9184169e72ec740ac8001be01bc697eb1c3ed 100644

--- a/webkit/tools/test_shell/test_shell.cc

+++ b/webkit/tools/test_shell/test_shell.cc

@@ -685,7 +685,9 @@ bool GetFontTable(int fd, uint32_t table, uint8_t* output,

void GetPlugins(bool refresh,

std::vector<webkit::npapi::WebPluginInfo>* plugins) {

- webkit::npapi::PluginList::Singleton()->GetPlugins(refresh, plugins);

+ if (refresh)

+ webkit::npapi::PluginList::Singleton()->RefreshPlugins();

+ webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);

// Don't load the forked TestNetscapePlugIn in the chromium code, use

// the copy in webkit.org's repository instead.

const FilePath::StringType kPluginBlackList[] = {

« no previous file with comments | « webkit/support/webkit_support_glue.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »