third_party/WebKit/Source/core/page/Page.cpp - Issue 2156803002: [HBD] Remove PluginCache and reload plugin list when origin changes

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: third_party/WebKit/Source/core/page/Page.cpp

Issue 2156803002: [HBD] Remove PluginCache and reload plugin list when origin changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per dcheng@'s comment Created 4 years, 4 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

« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | third_party/WebKit/Source/platform/plugins/PluginData.h » ('j') | third_party/WebKit/public/platform/Platform.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/Page.cpp

diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp

index 887326eada4986fe5c4b1e09664b26df0716726a..d2d838be55e8764f247c119ea6cd510bb82bed39 100644

--- a/third_party/WebKit/Source/core/page/Page.cpp

+++ b/third_party/WebKit/Source/core/page/Page.cpp

@@ -241,10 +241,10 @@ void Page::refreshPlugins()

}

-PluginData* Page::pluginData() const

+PluginData* Page::pluginData(SecurityOrigin* mainFrameOrigin) const

{

- if (!m_pluginData)

- m_pluginData = PluginData::create(this);

+ if (!m_pluginData || !mainFrameOrigin->isSameSchemeHostPort(m_pluginData->origin()))

+ m_pluginData = PluginData::create(mainFrameOrigin);

return m_pluginData.get();

}