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

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: Add tests, make plugin creation synchronous. Created 7 years 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
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 RefPtr<Widget> widget; 179 RefPtr<Widget> widget;
180 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) 180 if (frame->loader().allowPlugins(AboutToInstantiatePlugin))
181 widget = frame->loader().client()->createJavaAppletWidget(roundedIntSize (LayoutSize(contentWidth, contentHeight)), this, baseURL, paramNames, paramValue s); 181 widget = frame->loader().client()->createJavaAppletWidget(roundedIntSize (LayoutSize(contentWidth, contentHeight)), this, baseURL, paramNames, paramValue s);
182 182
183 if (!widget) { 183 if (!widget) {
184 if (!renderer->showsUnavailablePluginIndicator()) 184 if (!renderer->showsUnavailablePluginIndicator())
185 renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::Plugin Missing); 185 renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::Plugin Missing);
186 return; 186 return;
187 } 187 }
188 document().setContainsPlugins(); 188 document().setContainsPlugins();
189 renderer->setWidget(widget); 189 setWidget(widget);
190 } 190 }
191 191
192 bool HTMLAppletElement::canEmbedJava() const 192 bool HTMLAppletElement::canEmbedJava() const
193 { 193 {
194 if (document().isSandboxed(SandboxPlugins)) 194 if (document().isSandboxed(SandboxPlugins))
195 return false; 195 return false;
196 196
197 Settings* settings = document().settings(); 197 Settings* settings = document().settings();
198 if (!settings) 198 if (!settings)
199 return false; 199 return false;
200 200
201 if (!settings->isJavaEnabled()) 201 if (!settings->isJavaEnabled())
202 return false; 202 return false;
203 203
204 return true; 204 return true;
205 } 205 }
206 206
207 } 207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698