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..89229522fd05c9fed1f41fa98afaca9c638563fd 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.frame()->isMainFrame() ? SecurityOrigin::create(init.url()).get() : init.frame()->tree().top()->securityContext()->getSecurityOrigin()); |
|
esprehn
2016/08/29 20:54:56
why not always call tree().top() ?
Calling .get()
trizzofo
2016/08/29 21:32:32
When the document is being created for the main fr
|
| // 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. |