Chromium Code Reviews| Index: third_party/WebKit/Source/core/dom/DOMImplementation.cpp |
| diff --git a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp |
| index 5c7975e2c94c5fb777ecb1d96de93c7e7abc6cf0..1d086d986a2b7664bc0c3a378baecd394a3ea6fb 100644 |
| --- a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp |
| +++ b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp |
| @@ -225,9 +225,9 @@ Document* DOMImplementation::createDocument(const String& type, const DocumentIn |
| if (type == "application/xhtml+xml") |
| return XMLDocument::createXHTML(init); |
| - PluginData* pluginData = 0; |
| + PluginData* pluginData = nullptr; |
| if (init.frame() && init.frame()->page() && init.frame()->loader().allowPlugins(NotAboutToInstantiatePlugin)) |
| - pluginData = init.frame()->pluginData(); |
| + pluginData = init.frame()->page()->pluginData(init.owner() ? init.owner()->getSecurityOrigin() : SecurityOrigin::create(init.url()).get()); |
|
dcheng
2016/08/19 04:30:03
This is called when we create a new Document in Lo
trizzofo
2016/08/19 21:15:30
No, that's not desired. I changed it to get the ma
|
| // PDF is one image type for which a plugin can override built-in support. |
| // We do not want QuickTime to take over all image types, obviously. |