Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: Source/core/html/HTMLAppletElement.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Handle shared-renderer case. Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/RemoteFrame.cpp ('k') | Source/core/html/HTMLEmbedElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 RefPtr<Widget> widget; 183 RefPtr<Widget> widget;
184 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) 184 if (frame->loader().allowPlugins(AboutToInstantiatePlugin))
185 widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues); 185 widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues);
186 186
187 if (!widget) { 187 if (!widget) {
188 if (!renderer->showsUnavailablePluginIndicator()) 188 if (!renderer->showsUnavailablePluginIndicator())
189 renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::Plugin Missing); 189 renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::Plugin Missing);
190 return; 190 return;
191 } 191 }
192 document().setContainsPlugins(); 192 document().setContainsPlugins();
193 renderer->setWidget(widget); 193 setWidget(widget);
194 } 194 }
195 195
196 bool HTMLAppletElement::canEmbedJava() const 196 bool HTMLAppletElement::canEmbedJava() const
197 { 197 {
198 if (document().isSandboxed(SandboxPlugins)) 198 if (document().isSandboxed(SandboxPlugins))
199 return false; 199 return false;
200 200
201 Settings* settings = document().settings(); 201 Settings* settings = document().settings();
202 if (!settings) 202 if (!settings)
203 return false; 203 return false;
(...skipping 15 matching lines...) Expand all
219 219
220 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 220 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
221 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) { 221 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
222 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 222 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
223 return false; 223 return false;
224 } 224 }
225 return true; 225 return true;
226 } 226 }
227 227
228 } 228 }
OLDNEW
« no previous file with comments | « Source/core/frame/RemoteFrame.cpp ('k') | Source/core/html/HTMLEmbedElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698